From 9cdf290577b145afd1063b077b2d921eddf12f5a Mon Sep 17 00:00:00 2001
From: R0slyn <roslyn.henry.08@aberdeen.ac.uk>
Date: Mon, 14 Aug 2017 15:35:01 +0100
Subject: [PATCH] removing reading in bluewater file
---
src/ac/ed/lurg/ModelMain.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/ac/ed/lurg/ModelMain.java b/src/ac/ed/lurg/ModelMain.java
index 13a9de4b..124f774f 100644
--- a/src/ac/ed/lurg/ModelMain.java
+++ b/src/ac/ed/lurg/ModelMain.java
@@ -561,7 +561,7 @@ public class ModelMain {
};
new IrrigiationCostReader(irigData).getRasterDataFromFile(ModelConfig.IRRIGATION_COST_FILE);
- new IrrigationConstraintReader(irigData).getRasterDataFromFile(ModelConfig.IRRIGATION_CONSTRAINT_FILE);
+ // new IrrigationConstraintReader(irigData).getRasterDataFromFile(ModelConfig.IRRIGATION_CONSTRAINT_FILE);
return irigData;
}
@@ -570,7 +570,7 @@ public class ModelMain {
String rootDir = timestep.getYearSubDir(ModelConfig.YIELD_DIR);
new IrrigationMaxAmountReader(currentIrrigationData, yieldSurfaces).getRasterDataFromFile(rootDir + File.separator + ModelConfig.IRRIG_MAX_WATER_FILENAME);
new RunOffReader(currentIrrigationData).getRasterDataFromFile(rootDir + File.separator + ModelConfig.IRRIG_RUNOFF_FILE);
- fpuManager.handleFPU(currentIrrigationData, timestep);
+ fpuManager.handleFPU(currentIrrigationData, timestep); //this is altering currentIrrigationData irrigConstraint(s) based on runoff and industrial use through time
return currentIrrigationData;
}
private Map<CropType,Double> getInitialStockLevels(){
--
GitLab