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
54728f4f
Commit
54728f4f
authored
3 years ago
by
Peter Alexander
Browse files
Options
Downloads
Patches
Plain Diff
Allow year offset for LPJ-GUESS directories, used in GGCMI
parent
c3eaa31e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/ac/ed/lurg/ModelConfig.java
+1
-0
1 addition, 0 deletions
src/ac/ed/lurg/ModelConfig.java
src/ac/ed/lurg/Timestep.java
+1
-0
1 addition, 0 deletions
src/ac/ed/lurg/Timestep.java
with
2 additions
and
0 deletions
src/ac/ed/lurg/ModelConfig.java
+
1
−
0
View file @
54728f4f
...
...
@@ -376,6 +376,7 @@ public class ModelConfig {
public
static
final
double
PASTURE_MAX_IRRIGATION_RATE
=
getDoubleProperty
(
"DEFAULT_MAX_IRRIGATION_RATE"
,
50.0
);
// shouldn't need this but some areas crops don't have a value, but was causing them to be selected
public
static
final
int
LPJG_TIMESTEP_SIZE
=
getIntProperty
(
"LPJG_TIMESTEP_SIZE"
,
5
);
public
static
final
int
LPJ_YEAR_OFFSET
=
getIntProperty
(
"LPJ_YEAR_OFFSET"
,
0
);;
public
static
final
int
NUM_YIELD_CLUSTERS
=
getIntProperty
(
"NUM_YIELD_CLUSTERS"
,
8000
);
public
static
final
long
RANDOM_SEED
=
getIntProperty
(
"RANDOM_SEED"
,
1974329
);
// any number will do
...
...
This diff is collapsed.
Click to expand it.
src/ac/ed/lurg/Timestep.java
+
1
−
0
View file @
54728f4f
...
...
@@ -98,6 +98,7 @@ public class Timestep {
}
public
static
String
getYearSubDir
(
String
rootDir
,
int
endYear
)
{
endYear
+=
ModelConfig
.
LPJ_YEAR_OFFSET
;
return
rootDir
+
File
.
separator
+
(
endYear
-
ModelConfig
.
LPJG_TIMESTEP_SIZE
+
1
)
+
"-"
+
endYear
;
}
}
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