diff --git a/data/sims/ssp_params.csv b/data/sims/ssp_params.csv index 3efe40fcc4cc73633f822db968530f7b6a1b3bdf..73c58f265dcef3067a04aa25253c4704e636a15a 100644 --- a/data/sims/ssp_params.csv +++ b/data/sims/ssp_params.csv @@ -1,9 +1,9 @@ Ensemble,pname,dist,xmin,xmax,x05,xmode,x95,value -SSP1,IRRIGATION_EFFICIENCY,beta,0.45,0.55,0.51,0.525,0.54, -SSP2,IRRIGATION_EFFICIENCY,beta,0.45,0.55,0.49,0.5,0.51, -SSP3,IRRIGATION_EFFICIENCY,beta,0.45,0.55,0.46,0.475,0.49, -SSP4,IRRIGATION_EFFICIENCY,beta,0.45,0.55,0.475,0.5,0.525, -SSP5,IRRIGATION_EFFICIENCY,beta,0.45,0.55,0.5,0.51,0.525, +SSP1,IRRIGATION_EFFICIENCY,beta,0.35,0.65,0.53,0.575,0.62, +SSP2,IRRIGATION_EFFICIENCY,beta,0.35,0.65,0.47,0.5,0.53, +SSP3,IRRIGATION_EFFICIENCY,beta,0.35,0.65,0.38,0.425,0.47, +SSP4,IRRIGATION_EFFICIENCY,beta,0.35,0.65,0.425,0.5,0.575, +SSP5,IRRIGATION_EFFICIENCY,beta,0.35,0.65,0.5,0.53,0.575, SSP1,MEAT_EFFICIENCY,beta,0.95,1.1,1.04,1.06,1.09, SSP2,MEAT_EFFICIENCY,beta,0.95,1.1,1.01,1.03,1.04, SSP3,MEAT_EFFICIENCY,beta,0.95,1.1,0.97,0.99,1.01, @@ -14,11 +14,6 @@ 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.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.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, @@ -39,31 +34,31 @@ SSP2,YIELD_DIR_TOP,rcp,,,,,,ssp2 SSP3,YIELD_DIR_TOP,rcp,,,,,,ssp3 SSP4,YIELD_DIR_TOP,rcp,,,,,,ssp4 SSP5,YIELD_DIR_TOP,rcp,,,,,,ssp5 -SSP1,BIOENERGY_CHANGE_ANNUAL_RATE,beta,0.03,0.27,0.18,0.21,0.24, -SSP2,BIOENERGY_CHANGE_ANNUAL_RATE,beta,0.03,0.27,0.12,0.15,0.18, -SSP3,BIOENERGY_CHANGE_ANNUAL_RATE,beta,0.03,0.27,0.09,0.12,0.15, -SSP4,BIOENERGY_CHANGE_ANNUAL_RATE,beta,0.03,0.27,0.09,0.15,0.21, -SSP5,BIOENERGY_CHANGE_ANNUAL_RATE,beta,0.03,0.27,0.06,0.09,0.12, +SSP1,BIOENERGY_DEMAND_SHIFT,beta,0.5,1.5,0.7,1,1.3, +SSP2,BIOENERGY_DEMAND_SHIFT,beta,0.5,1.5,0.7,1,1.3, +SSP3,BIOENERGY_DEMAND_SHIFT,beta,0.5,1.5,0.7,1,1.3, +SSP4,BIOENERGY_DEMAND_SHIFT,beta,0.5,1.5,0.7,1,1.3, +SSP5,BIOENERGY_DEMAND_SHIFT,beta,0.5,1.5,0.7,1,1.3, SSP1,FERTILISER_COST_PER_T,beta,1.5,3.9,2.7,3.3,3.6, SSP2,FERTILISER_COST_PER_T,beta,1.5,3.9,2.4,2.7,3, SSP3,FERTILISER_COST_PER_T,beta,1.5,3.9,1.8,2.4,3, SSP4,FERTILISER_COST_PER_T,beta,1.5,3.9,2.4,3,3.6, SSP5,FERTILISER_COST_PER_T,beta,1.5,3.9,1.8,2.1,2.7, -SSP1,OTHER_INTENSITY_COST,beta,0.22,0.38,0.3,0.34,0.36, -SSP2,OTHER_INTENSITY_COST,beta,0.22,0.38,0.28,0.3,0.32, -SSP3,OTHER_INTENSITY_COST,beta,0.22,0.38,0.24,0.28,0.32, -SSP4,OTHER_INTENSITY_COST,beta,0.22,0.38,0.28,0.32,0.36, -SSP5,OTHER_INTENSITY_COST,beta,0.22,0.38,0.24,0.26,0.3, +SSP1,OTHER_INTENSITY_COST,beta,0.18,0.42,0.3,0.36,0.39, +SSP2,OTHER_INTENSITY_COST,beta,0.18,0.42,0.27,0.3,0.33, +SSP3,OTHER_INTENSITY_COST,beta,0.18,0.42,0.21,0.27,0.33, +SSP4,OTHER_INTENSITY_COST,beta,0.18,0.42,0.27,0.33,0.39, +SSP5,OTHER_INTENSITY_COST,beta,0.18,0.42,0.21,0.24,0.3, SSP1,IRRIG_COST_SCALE_FACTOR,beta,0.0006,0.0014,0.001,0.0012,0.0013, SSP2,IRRIG_COST_SCALE_FACTOR,beta,0.0006,0.0014,0.0009,0.001,0.0011, SSP3,IRRIG_COST_SCALE_FACTOR,beta,0.0006,0.0014,0.0007,0.0009,0.0011, SSP4,IRRIG_COST_SCALE_FACTOR,beta,0.0006,0.0014,0.0009,0.0011,0.0013, SSP5,IRRIG_COST_SCALE_FACTOR,beta,0.0006,0.0014,0.0007,0.0008,0.001, -SSP1,ANNUAL_MAX_IMPORT_CHANGE,beta,0.012,0.028,0.02,0.022,0.024, -SSP2,ANNUAL_MAX_IMPORT_CHANGE,beta,0.012,0.028,0.018,0.02,0.022, -SSP3,ANNUAL_MAX_IMPORT_CHANGE,beta,0.012,0.028,0.014,0.016,0.018, -SSP4,ANNUAL_MAX_IMPORT_CHANGE,beta,0.012,0.028,0.016,0.018,0.02, -SSP5,ANNUAL_MAX_IMPORT_CHANGE,beta,0.012,0.028,0.022,0.024,0.026, +SSP1,ANNUAL_MAX_IMPORT_CHANGE,beta,0.008,0.032,0.02,0.023,0.026, +SSP2,ANNUAL_MAX_IMPORT_CHANGE,beta,0.008,0.032,0.017,0.02,0.023, +SSP3,ANNUAL_MAX_IMPORT_CHANGE,beta,0.008,0.032,0.011,0.014,0.017, +SSP4,ANNUAL_MAX_IMPORT_CHANGE,beta,0.008,0.032,0.014,0.017,0.02, +SSP5,ANNUAL_MAX_IMPORT_CHANGE,beta,0.008,0.032,0.023,0.026,0.029, SSP1,DIETARY_CLOSURE,beta,0,0.16,0.04,0.08,0.12, SSP2,DIETARY_CLOSURE,beta,0,0.16,0.02,0.08,0.12, SSP3,DIETARY_CLOSURE,beta,0,0.16,0.01,0.02,0.04, @@ -84,13 +79,13 @@ SSP2,CROP_TO_PASTURE_COST_FACTOR,beta,0.5,2,0.9,1,1.2, SSP3,CROP_TO_PASTURE_COST_FACTOR,beta,0.5,2,1.2,1.5,1.8, SSP4,CROP_TO_PASTURE_COST_FACTOR,beta,0.5,2,1,1.2,1.5, SSP5,CROP_TO_PASTURE_COST_FACTOR,beta,0.5,2,1,1.2,1.5, -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,,,, -SSP4,PASTURE_HARVEST_FRACTION,unif,0.45,0.55,,,, -SSP5,PASTURE_HARVEST_FRACTION,unif,0.45,0.55,,,, -SSP1,BIOENERGY_DEMAND_SCENARIO,rcp_ssp,,,,,,ssp1 -SSP2,BIOENERGY_DEMAND_SCENARIO,rcp_ssp,,,,,,ssp2 -SSP3,BIOENERGY_DEMAND_SCENARIO,rcp_ssp,,,,,,ssp3 -SSP4,BIOENERGY_DEMAND_SCENARIO,rcp_ssp,,,,,,ssp4 -SSP5,BIOENERGY_DEMAND_SCENARIO,rcp_ssp,,,,,,ssp5 \ No newline at end of file +SSP1,PASTURE_HARVEST_FRACTION,unif,0.4,0.6,,,, +SSP2,PASTURE_HARVEST_FRACTION,unif,0.4,0.6,,,, +SSP3,PASTURE_HARVEST_FRACTION,unif,0.4,0.6,,,, +SSP4,PASTURE_HARVEST_FRACTION,unif,0.4,0.6,,,, +SSP5,PASTURE_HARVEST_FRACTION,unif,0.4,0.6,,,, +SSP1,MARKET_LAMBA,unif,3,5,,,, +SSP2,MARKET_LAMBA,unif,3,5,,,, +SSP3,MARKET_LAMBA,unif,3,5,,,, +SSP4,MARKET_LAMBA,unif,3,5,,,, +SSP5,MARKET_LAMBA,unif,3,5,,,, \ No newline at end of file diff --git a/src/ac/ed/lurg/ModelConfig.java b/src/ac/ed/lurg/ModelConfig.java index 9d82fa2cadcaf0ab476a261f382f75aaf4322a5e..d61bc11410f59f461bc83b6f912554d4fde3cabd 100644 --- a/src/ac/ed/lurg/ModelConfig.java +++ b/src/ac/ed/lurg/ModelConfig.java @@ -132,7 +132,7 @@ public class ModelConfig { public static final double CALIB_FACTOR_PULSES = getDoubleProperty("CALIB_FACTOR_PULSES", 0.616); public static final double CALIB_FACTOR_STARCHY_ROOTS = getDoubleProperty("CALIB_FACTOR_STARCHY_ROOTS", 6.225); - public static final double CALIB_FACTOR_MISCANTHUS = getDoubleProperty("CALIB_FACTOR_MISCANTHUS", 2.7779); + public static final double CALIB_FACTOR_MISCANTHUS = getDoubleProperty("CALIB_FACTOR_MISCANTHUS", 2.113); public static final double CALIB_FACTOR_SRC = getDoubleProperty("CALIB_FACTOR_SRC", Double.NaN); // Spatial (gridded) data