diff --git a/src/ac/ed/lurg/ModelMain.java b/src/ac/ed/lurg/ModelMain.java index a3050e745d686f3698c443103ecf745725529c4e..bd97461bab523679b68050fdfc2f955cc1b70bb1 100644 --- a/src/ac/ed/lurg/ModelMain.java +++ b/src/ac/ed/lurg/ModelMain.java @@ -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 diff --git a/src/ac/ed/lurg/country/GlobalPrice.java b/src/ac/ed/lurg/country/GlobalPrice.java index 7263e879db8db695c59f031ce627dc2bc4b83dd1..e08cfa84bd3241ac48b563812ba6e5daf33e5200 100644 --- a/src/ac/ed/lurg/country/GlobalPrice.java +++ b/src/ac/ed/lurg/country/GlobalPrice.java @@ -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(){