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
f227da9b
Commit
f227da9b
authored
1 year ago
by
Bart Arendarczyk
Browse files
Options
Downloads
Patches
Plain Diff
Initial trade set at the start rather than 2nd timestep.
parent
0b0a9ac6
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/ModelMain.java
+4
-0
4 additions, 0 deletions
src/ac/ed/lurg/ModelMain.java
src/ac/ed/lurg/country/GlobalPrice.java
+1
-1
1 addition, 1 deletion
src/ac/ed/lurg/country/GlobalPrice.java
with
5 additions
and
1 deletion
src/ac/ed/lurg/ModelMain.java
+
4
−
0
View file @
f227da9b
...
...
@@ -99,6 +99,10 @@ public class ModelMain {
private
void
doTimestep
(
Timestep
timestep
)
{
LogWriter
.
println
(
"Timestep: "
+
timestep
.
toString
());
if
(
ModelConfig
.
IS_CALIBRATION_RUN
&&
timestep
.
isInitialTimestep
())
{
// initialize trade and production
internationalMarket
.
determineInternationalTrade
(
countryAgents
.
getAll
(),
timestep
);
}
yieldSurfaces
=
getYieldSurfaces
(
timestep
);
// this will wait for the marker file from LPJ if configured to do so
getUpdateIrrigationData
(
timestep
);
// updating currentIrrigationData
...
...
This diff is collapsed.
Click to expand it.
src/ac/ed/lurg/country/GlobalPrice.java
+
1
−
1
View file @
f227da9b
...
...
@@ -39,7 +39,7 @@ public class GlobalPrice implements Serializable {
public
static
GlobalPrice
createInitial
(
double
exportPrice
,
double
intitalStock
)
{
return
new
GlobalPrice
(
new
Timestep
(
ModelConfig
.
START_TIMESTEP
-
1
),
exportPrice
,
intitalStock
,
Double
.
NaN
,
Double
.
NaN
,
Double
.
NaN
,
Double
.
NaN
,
Double
.
NaN
,
0.0
,
intitalStock
/
0.1
);
Double
.
NaN
,
Double
.
NaN
,
Double
.
NaN
,
Double
.
NaN
,
0.0
,
Double
.
NaN
);
}
public
double
getExportPrice
(){
...
...
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