From 5b7bc0eff89c7c9dbbda688d4489c301b2f03a83 Mon Sep 17 00:00:00 2001
From: ALEXANDER Peter <palexand@login02.ecdf.ed.ac.uk>
Date: Sun, 16 Aug 2020 16:53:49 +0100
Subject: [PATCH] allow LPJ-GUESS timestep to be specified
---
data/shockProbabilities.csv | 10 +++++-----
src/ac/ed/lurg/ModelConfig.java | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/data/shockProbabilities.csv b/data/shockProbabilities.csv
index 3ce0dffa..251b6619 100644
--- a/data/shockProbabilities.csv
+++ b/data/shockProbabilities.csv
@@ -1,6 +1,6 @@
ssp,protectionism,automation,diet,climate,cyber,financial
-SSP1,0,1,0,0,0,0
-SSP2,0,1,0,0,0,0
-SSP3,0,1,0,0,0,0
-SSP4,0,1,0,0,0,0
-SSP5,0,1,0,0,0,0
+SSP1,0,0,1,0,0,0
+SSP2,0,0,1,0,0,0
+SSP3,0,0,1,0,0,0
+SSP4,0,0,1,0,0,0
+SSP5,0,0,1,0,0,0
diff --git a/src/ac/ed/lurg/ModelConfig.java b/src/ac/ed/lurg/ModelConfig.java
index 015b641d..1e7a00fe 100755
--- a/src/ac/ed/lurg/ModelConfig.java
+++ b/src/ac/ed/lurg/ModelConfig.java
@@ -394,7 +394,7 @@ public class ModelConfig {
public static final String GAMS_COUNTRY_TO_SAVE = getProperty("GAMS_COUNTRY_TO_SAVE", "China");;
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 = 5;
+ public static final int LPJG_TIMESTEP_SIZE = getIntProperty("LPJG_TIMESTEP_SIZE", 5);
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
--
GitLab