diff --git a/src/ac/ed/lurg/ModelConfig.java b/src/ac/ed/lurg/ModelConfig.java index e289c2a0ee0b43aa2ee306913809f7d593d4c0b6..5696afb49e8cfa2a06c82106478d9be46b30176c 100755 --- a/src/ac/ed/lurg/ModelConfig.java +++ b/src/ac/ed/lurg/ModelConfig.java @@ -157,7 +157,8 @@ public class ModelConfig { public static final String DEMAND_CURVES_FILE = getProperty("DEMAND_CURVES_FILE", DATA_DIR + File.separator + "com_curves.csv"); // either DEMAND_CURVES_FILE or DEMAND_CONSUMPTION_FILE is used, but not both public static final String DEMAND_CONSUMPTION_FILE = getProperty("DEMAND_CONSUMPTION_FILE", DATA_DIR + File.separator + "hist_comsump.csv"); public static final PriceType PRICE_CALCULATION = PriceType.findByName(getProperty("PRICE_CALCULATION", "weightedImportsExports")); - public static final String SSP_FILE = DATA_DIR + File.separator + "ssp.csv"; + public static final String SSP_FILENAME = getProperty("SSP_FILENAME", "ssp.csv"); + public static final String SSP_FILE = getProperty("SSP_FILE", DATA_DIR + File.separator + SSP_FILENAME); public static final String BASELINE_CONSUMP_FILE = DATA_DIR + File.separator + "base_consump.csv"; public static final String CALORIE_PER_T_FILE = DATA_DIR + File.separator + "calories_per_t.csv"; public static final String COUNTRY_CODES_FILE = DATA_DIR + File.separator + "country_codes4.csv";