From 3aac767c378c5666ff6d0342e2478eebfe653bb5 Mon Sep 17 00:00:00 2001
From: Juliette Maire <juliette.maire@ed.ac.uk>
Date: Thu, 18 Feb 2021 13:29:41 +0000
Subject: [PATCH] updated to take different ssp file as input
---
src/ac/ed/lurg/ModelConfig.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/ac/ed/lurg/ModelConfig.java b/src/ac/ed/lurg/ModelConfig.java
index e289c2a0..5696afb4 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";
--
GitLab