diff --git a/src/ac/ed/lurg/ModelConfig.java b/src/ac/ed/lurg/ModelConfig.java index 0addb374e16401eb26e483afa3d159298b59ebcd..454288a946de660be10063de4027dec4c2a237b8 100755 --- a/src/ac/ed/lurg/ModelConfig.java +++ b/src/ac/ed/lurg/ModelConfig.java @@ -164,7 +164,8 @@ public class ModelConfig { public static final String BIOENERGY_1GEN_BASE_DEMAND_FILE = DATA_DIR + File.separator + "bio_demand.csv"; public static final String BIOENERGY_FUTURE_DEMAND_FILENAME = getProperty("BIOENERGY_FUTURE_DEMAND_FILENAME", "bioenergy_futures_BAU.csv"); public static final String BIOENERGY_FUTURE_DEMAND_FILE = getProperty("BIOENERGY_FUTURE_DEMAND_FILE", DATA_DIR + File.separator + BIOENERGY_FUTURE_DEMAND_FILENAME); - public static final String TRADE_BARRIERS_FILE = DATA_DIR + File.separator + "tradeBarriers.csv"; + public static final String TRADE_BARRIERS_FILENAME = getProperty("TRADE_BARRIERS_FILENAME", "tradeBarriers.csv"); + public static final String TRADE_BARRIERS_FILE = getProperty("TRADE_BARRIERS_FILE", DATA_DIR + File.separator + TRADE_BARRIERS_FILENAME); public static final String TRADE_DISTORTIONS_FILE = DATA_DIR + File.separator + "tradeDistortions.csv"; public static final String STOCKS_FILE = DATA_DIR + File.separator + "global_stocks.csv"; public static final String FAO_CONSUMPTION_FILE = DATA_DIR + File.separator + "fao_consump.csv";