Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
PLUM
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Land Use Lab
PLUM
Commits
9cdf2905
Commit
9cdf2905
authored
7 years ago
by
R0slyn
Browse files
Options
Downloads
Patches
Plain Diff
removing reading in bluewater file
parent
7f273dd3
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/ac/ed/lurg/ModelMain.java
+2
-2
2 additions, 2 deletions
src/ac/ed/lurg/ModelMain.java
with
2 additions
and
2 deletions
src/ac/ed/lurg/ModelMain.java
+
2
−
2
View file @
9cdf2905
...
...
@@ -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
(){
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment