More config changes

data/sims/hindparms.csv

+Ensemble,pname,dist,xmin,xmax
+ha,CROP_INCREASE_COST,unif,0.5,1.3
+ha,CROP_OR_PASTURE_DECREASE_COST,unif,0.2,0.7
+ha,PASTURE_INCREASE_COST,unif,0,0.04
+ha,AGRI_EXPANSION_COST_BASE,unif,0,0.04
+ha,AGRI_EXPANSION_COST_BASE_MANAGED_FOREST,unif,0,0.5
+ha,FERTILISER_COST_PER_T,unif,2.2,3.3
+ha,IRRIG_COST_SCALE_FACTOR,unif,0.1,0.3
+ha,OTHER_INTENSITY_COST,unif,0.1,0.3
+ha,PASTURE_HARVEST_FRACTION,unif,0.4,0.6
+ha,MEAT_EFFICIENCY,unif,0.9,1.1
\ No newline at end of file

data/sims/ssp_params.csv

@@ -14,16 +14,16 @@ SSP2,MIN_NATURAL_RATE,beta,0,0.3,0.07,0.1,0.15,
 SSP3,MIN_NATURAL_RATE,beta,0,0.3,0.02,0.04,0.07,
 SSP4,MIN_NATURAL_RATE,beta,0,0.3,0.04,0.07,0.1,
 SSP5,MIN_NATURAL_RATE,beta,0,0.3,0.02,0.04,0.07,
-SSP1,TECHNOLOGY_CHANGE_ANNUAL_RATE,beta,0,0.01,0.006,0.008,0.009,
-SSP2,TECHNOLOGY_CHANGE_ANNUAL_RATE,beta,0,0.01,0.004,0.005,0.008,
+SSP1,TECHNOLOGY_CHANGE_ANNUAL_RATE,beta,0,0.01,0.006,0.007,0.009,
+SSP2,TECHNOLOGY_CHANGE_ANNUAL_RATE,beta,0,0.01,0.004,0.005,0.007,
 SSP3,TECHNOLOGY_CHANGE_ANNUAL_RATE,beta,0,0.01,0.001,0.002,0.004,
-SSP4,TECHNOLOGY_CHANGE_ANNUAL_RATE,beta,0,0.01,0.002,0.005,0.008,
-SSP5,TECHNOLOGY_CHANGE_ANNUAL_RATE,beta,0,0.01,0.005,0.006,0.008,
-SSP1,TRADE_BARRIER_ADJ,beta,0.3,1.7,0.6,0.8,1,
-SSP2,TRADE_BARRIER_ADJ,beta,0.3,1.7,0.8,1,1.2,
-SSP3,TRADE_BARRIER_ADJ,beta,0.3,1.7,1.2,1.4,1.6,
-SSP4,TRADE_BARRIER_ADJ,beta,0.3,1.7,1,1.2,1.4,
-SSP5,TRADE_BARRIER_ADJ,beta,0.3,1.7,0.4,0.6,0.8,
+SSP4,TECHNOLOGY_CHANGE_ANNUAL_RATE,beta,0,0.01,0.002,0.005,0.007,
+SSP5,TECHNOLOGY_CHANGE_ANNUAL_RATE,beta,0,0.01,0.005,0.006,0.007,
+SSP1,TRADE_BARRIER_ADJ,beta,0.65,1.35,0.8,0.9,1,
+SSP2,TRADE_BARRIER_ADJ,beta,0.65,1.35,0.9,1,1.1,
+SSP3,TRADE_BARRIER_ADJ,beta,0.65,1.35,1.1,1.2,1.3,
+SSP4,TRADE_BARRIER_ADJ,beta,0.65,1.35,1,1.1,1.2,
+SSP5,TRADE_BARRIER_ADJ,beta,0.65,1.35,0.7,0.8,0.9,
 SSP1,TRANSPORT_COST,beta,0.1,0.5,0.3,0.4,0.45,
 SSP2,TRANSPORT_COST,beta,0.1,0.5,0.25,0.3,0.35,
 SSP3,TRANSPORT_COST,beta,0.1,0.5,0.15,0.25,0.35,
@@ -79,11 +79,11 @@ SSP2,AGRI_LAND_ABANDONMENT_COST_FACTOR,beta,0.8,1.2,0.95,1,1.05,
 SSP3,AGRI_LAND_ABANDONMENT_COST_FACTOR,beta,0.8,1.2,1.05,1.1,1.15,
 SSP4,AGRI_LAND_ABANDONMENT_COST_FACTOR,beta,0.8,1.2,0.95,1,1.05,
 SSP5,AGRI_LAND_ABANDONMENT_COST_FACTOR,beta,0.8,1.2,1.05,1.1,1.15,
-SSP1,CROP_TO_PASTURE_COST_FACTOR,unif,0.8,1.2,,,,
-SSP2,CROP_TO_PASTURE_COST_FACTOR,unif,0.8,1.2,,,,
-SSP3,CROP_TO_PASTURE_COST_FACTOR,unif,0.8,1.2,,,,
-SSP4,CROP_TO_PASTURE_COST_FACTOR,unif,0.8,1.2,,,,
-SSP5,CROP_TO_PASTURE_COST_FACTOR,unif,0.8,1.2,,,,
+SSP1,CROP_TO_PASTURE_COST_FACTOR,beta,0.8,1.2,1.05,1.1,1.15,
+SSP2,CROP_TO_PASTURE_COST_FACTOR,beta,0.8,1.2,0.95,1,1.05,
+SSP3,CROP_TO_PASTURE_COST_FACTOR,beta,0.8,1.2,0.85,0.9,0.95,
+SSP4,CROP_TO_PASTURE_COST_FACTOR,beta,0.8,1.2,0.9,0.95,1,
+SSP5,CROP_TO_PASTURE_COST_FACTOR,beta,0.8,1.2,0.9,0.95,1,
 SSP1,PASTURE_HARVEST_FRACTION,unif,0.45,0.55,,,,
 SSP2,PASTURE_HARVEST_FRACTION,unif,0.45,0.55,,,,
 SSP3,PASTURE_HARVEST_FRACTION,unif,0.45,0.55,,,,

debug_config.properties

 BASE_DIR=.
 
-YIELD_DIR=/Users/peteralexander/Documents/LURG/LPJ/IPSL/LPJG_PLUM_expt1.2_rcp45_ipsl_lessIO_forED
+#YIELD_DIR=/Users/peteralexander/Documents/LURG/LPJ/IPSL/LPJG_PLUM_expt1.2_rcp45_ipsl_lessIO_forED
+YIELD_DIR=/Users/peteralexander/Documents/LURG/LPJ/12Apr2017/LPJG_PLUM_expt1.2_rcp45_ipsl_lessIO_forED_20170407122433
 
 # Properties for testing
 #CHANGE_YIELD_DATA_YEAR=true

src/ac/ed/lurg/ModelConfig.java

@@ -191,7 +191,7 @@ public class ModelConfig {
 	public static final double AGRI_LAND_ABANDONMENT_COST_FACTOR = getDoubleProperty("AGRI_LAND_ABANDONMENT_COST_FACTOR", 1.0);
 
 	public static final double CROP_INCREASE_COST = getDoubleProperty("CROP_INCREASE_COST", 1.0 * LAND_CHANGE_COST);
-	public static final double CROP_OR_PASTURE_DECREASE_COST = getDoubleProperty("CROP_OR_PASTURE_DECREASE_COST", 0.8 * LAND_CHANGE_COST * AGRI_LAND_ABANDONMENT_COST_FACTOR);
+	public static final double CROP_OR_PASTURE_DECREASE_COST = getDoubleProperty("CROP_OR_PASTURE_DECREASE_COST", 0.6 * LAND_CHANGE_COST * AGRI_LAND_ABANDONMENT_COST_FACTOR);
 	public static final double PASTURE_INCREASE_COST = getDoubleProperty("PASTURE_INCREASE_COST", 0.2 * LAND_CHANGE_COST * CROP_TO_PASTURE_COST_FACTOR);
 	public static final double AGRI_EXPANSION_COST_BASE = getDoubleProperty("AGRI_EXPANSION_COST_BASE", 0.1 * LAND_CHANGE_COST);
 	public static final double AGRI_EXPANSION_COST_BASE_MANAGED_FOREST = getDoubleProperty("AGRI_EXPANSION_COST_BASE_MANAGED_FOREST", 0.3 * LAND_CHANGE_COST);