Skip to content
Snippets Groups Projects
Commit 01f6a915 authored by Peter Alexander's avatar Peter Alexander
Browse files

merge

parents b3ebcd05 bf9334f4
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
data/sims/hind_params_old.csv deleted 100644 → 0
+ 0
− 18
View file @ b3ebcd05
Ensemble,pname,dist,xmin,xmax
hb,BIOENERGY_CHANGE_ANNUAL_RATE,unif,0,0.8
hb,FERTILISER_COST_PER_T,unif,0.4,3.2
hb,IRRIG_COST_SCALE_FACTOR,unif,0.0001,0.0011
hb,IRRIGIATION_EFFICIENCY,unif,0.2,0.8
hb,MEAT_EFFICIENCY,unif,0.8,1.2
hb,OTHER_INTENSITY_COST,unif,0.2,1
hb,PASTURE_HARVEST_FRACTION,unif,0.4,0.6
hb,MIN_NATURAL_RATE,unif,0.05,0.15
hb,TRADE_BARRIER_ADJ,unif,0.5,1.5
hb,TRANSPORT_COST,unif,0.1,0.5
hb,ANNUAL_MAX_IMPORT_CHANGE,unif,0.01,0.09
hb,LAND_CHANGE_COST,unif,0.1,0.3
hb,CROP_DECREASE_COST,unif,0.2,1
hb,AGRI_LAND_EXPANSION_COST_FACTOR,unif,0.5,1.5
hb,CROP_TO_PASTURE_COST_FACTOR,unif,0.5,1.5
hb,TECHNOLOGY_CHANGE_ANNUAL_RATE,unif,0,0.01
hb,INITIAL_PRICE_SHIFT,unif,0.5,1.5
\ No newline at end of file
data/sims/rcp_params.csv
+ 62
− 36
View file @ 01f6a915
......@@ -3,99 +3,125 @@ rcp/26,AGRI_LAND_EXPANSION_COST_FACTOR,unif,0.5,1.5,
rcp/45,AGRI_LAND_EXPANSION_COST_FACTOR,unif,0.5,1.5,
rcp/60,AGRI_LAND_EXPANSION_COST_FACTOR,unif,0.5,1.5,
rcp/85,AGRI_LAND_EXPANSION_COST_FACTOR,unif,0.5,1.5,
rcp/none,AGRI_LAND_EXPANSION_COST_FACTOR,unif,0.5,1.5,
rcp/constCO2_constClim,AGRI_LAND_EXPANSION_COST_FACTOR,unif,0.5,1.5,
rcp/85_constCO2,AGRI_LAND_EXPANSION_COST_FACTOR,unif,0.5,1.5,
rcp/85_constClim,AGRI_LAND_EXPANSION_COST_FACTOR,unif,0.5,1.5,
rcp/26,ANNUAL_MAX_IMPORT_CHANGE,unif,0.01,0.03,
rcp/45,ANNUAL_MAX_IMPORT_CHANGE,unif,0.01,0.03,
rcp/60,ANNUAL_MAX_IMPORT_CHANGE,unif,0.01,0.03,
rcp/85,ANNUAL_MAX_IMPORT_CHANGE,unif,0.01,0.03,
rcp/none,ANNUAL_MAX_IMPORT_CHANGE,unif,0.01,0.03,
rcp/26,CHANGE_YIELD_DATA_YEAR,value,,,TRUE
rcp/45,CHANGE_YIELD_DATA_YEAR,value,,,TRUE
rcp/60,CHANGE_YIELD_DATA_YEAR,value,,,TRUE
rcp/85,CHANGE_YIELD_DATA_YEAR,value,,,TRUE
rcp/none,CHANGE_YIELD_DATA_YEAR,value,,,FALSE
rcp/constCO2_constClim,ANNUAL_MAX_IMPORT_CHANGE,unif,0.01,0.03,
rcp/85_constCO2,ANNUAL_MAX_IMPORT_CHANGE,unif,0.01,0.03,
rcp/85_constClim,ANNUAL_MAX_IMPORT_CHANGE,unif,0.01,0.03,
rcp/26,CROP_TO_PASTURE_COST_FACTOR,unif,0.5,1.5,
rcp/45,CROP_TO_PASTURE_COST_FACTOR,unif,0.5,1.5,
rcp/60,CROP_TO_PASTURE_COST_FACTOR,unif,0.5,1.5,
rcp/85,CROP_TO_PASTURE_COST_FACTOR,unif,0.5,1.5,
rcp/none,CROP_TO_PASTURE_COST_FACTOR,unif,0.5,1.5,
rcp/constCO2_constClim,CROP_TO_PASTURE_COST_FACTOR,unif,0.5,1.5,
rcp/85_constCO2,CROP_TO_PASTURE_COST_FACTOR,unif,0.5,1.5,
rcp/85_constClim,CROP_TO_PASTURE_COST_FACTOR,unif,0.5,1.5,
rcp/26,FERTILISER_COST_PER_T,unif,1.4,2.2,
rcp/45,FERTILISER_COST_PER_T,unif,1.4,2.2,
rcp/60,FERTILISER_COST_PER_T,unif,1.4,2.2,
rcp/85,FERTILISER_COST_PER_T,unif,1.4,2.2,
rcp/none,FERTILISER_COST_PER_T,unif,1.4,2.2,
rcp/constCO2_constClim,FERTILISER_COST_PER_T,unif,1.4,2.2,
rcp/85_constCO2,FERTILISER_COST_PER_T,unif,1.4,2.2,
rcp/85_constClim,FERTILISER_COST_PER_T,unif,1.4,2.2,
rcp/26,INITIAL_PRICE_SHIFT,unif,0.5,1.5,
rcp/45,INITIAL_PRICE_SHIFT,unif,0.5,1.5,
rcp/60,INITIAL_PRICE_SHIFT,unif,0.5,1.5,
rcp/85,INITIAL_PRICE_SHIFT,unif,0.5,1.5,
rcp/none,INITIAL_PRICE_SHIFT,unif,0.5,1.5,
rcp/constCO2_constClim,INITIAL_PRICE_SHIFT,unif,0.5,1.5,
rcp/85_constCO2,INITIAL_PRICE_SHIFT,unif,0.5,1.5,
rcp/85_constClim,INITIAL_PRICE_SHIFT,unif,0.5,1.5,
rcp/26,IRRIG_COST_SCALE_FACTOR,unif,0.00025,0.00075,
rcp/45,IRRIG_COST_SCALE_FACTOR,unif,0.00025,0.00075,
rcp/60,IRRIG_COST_SCALE_FACTOR,unif,0.00025,0.00075,
rcp/85,IRRIG_COST_SCALE_FACTOR,unif,0.00025,0.00075,
rcp/none,IRRIG_COST_SCALE_FACTOR,unif,0.00025,0.00075,
rcp/constCO2_constClim,IRRIG_COST_SCALE_FACTOR,unif,0.00025,0.00075,
rcp/85_constCO2,IRRIG_COST_SCALE_FACTOR,unif,0.00025,0.00075,
rcp/85_constClim,IRRIG_COST_SCALE_FACTOR,unif,0.00025,0.00075,
rcp/26,LAND_CHANGE_COST,unif,0.1,0.3,
rcp/45,LAND_CHANGE_COST,unif,0.1,0.3,
rcp/60,LAND_CHANGE_COST,unif,0.1,0.3,
rcp/85,LAND_CHANGE_COST,unif,0.1,0.3,
rcp/none,LAND_CHANGE_COST,unif,0.1,0.3,
rcp/constCO2_constClim,LAND_CHANGE_COST,unif,0.1,0.3,
rcp/85_constCO2,LAND_CHANGE_COST,unif,0.1,0.3,
rcp/85_constClim,LAND_CHANGE_COST,unif,0.1,0.3,
rcp/26,MIN_NATURAL_RATE,unif,0.05,0.15,
rcp/45,MIN_NATURAL_RATE,unif,0.05,0.15,
rcp/60,MIN_NATURAL_RATE,unif,0.05,0.15,
rcp/85,MIN_NATURAL_RATE,unif,0.05,0.15,
rcp/none,MIN_NATURAL_RATE,unif,0.05,0.15,
rcp/constCO2_constClim,MIN_NATURAL_RATE,unif,0.05,0.15,
rcp/85_constCO2,MIN_NATURAL_RATE,unif,0.05,0.15,
rcp/85_constClim,MIN_NATURAL_RATE,unif,0.05,0.15,
rcp/26,OTHER_INTENSITY_COST,unif,0.3,0.9,
rcp/45,OTHER_INTENSITY_COST,unif,0.3,0.9,
rcp/60,OTHER_INTENSITY_COST,unif,0.3,0.9,
rcp/85,OTHER_INTENSITY_COST,unif,0.3,0.9,
rcp/none,OTHER_INTENSITY_COST,unif,0.3,0.9,
rcp/26,PASTURE_DECREASE_COST,unif,0.075,0.225,
rcp/45,PASTURE_DECREASE_COST,unif,0.075,0.225,
rcp/60,PASTURE_DECREASE_COST,unif,0.075,0.225,
rcp/85,PASTURE_DECREASE_COST,unif,0.075,0.225,
rcp/none,PASTURE_DECREASE_COST,unif,0.075,0.225,
rcp/constCO2_constClim,OTHER_INTENSITY_COST,unif,0.3,0.9,
rcp/85_constCO2,OTHER_INTENSITY_COST,unif,0.3,0.9,
rcp/85_constClim,OTHER_INTENSITY_COST,unif,0.3,0.9,
rcp/26,PASTURE_HARVEST_FRACTION,unif,0.4,0.6,
rcp/45,PASTURE_HARVEST_FRACTION,unif,0.4,0.6,
rcp/60,PASTURE_HARVEST_FRACTION,unif,0.4,0.6,
rcp/85,PASTURE_HARVEST_FRACTION,unif,0.4,0.6,
rcp/none,PASTURE_HARVEST_FRACTION,unif,0.4,0.6,
rcp/constCO2_constClim,PASTURE_HARVEST_FRACTION,unif,0.4,0.6,
rcp/85_constCO2,PASTURE_HARVEST_FRACTION,unif,0.4,0.6,
rcp/85_constClim,PASTURE_HARVEST_FRACTION,unif,0.4,0.6,
rcp/26,PASTURE_INCREASE_COST,unif,0.04,0.12,
rcp/45,PASTURE_INCREASE_COST,unif,0.04,0.12,
rcp/60,PASTURE_INCREASE_COST,unif,0.04,0.12,
rcp/85,PASTURE_INCREASE_COST,unif,0.04,0.12,
rcp/none,PASTURE_INCREASE_COST,unif,0.04,0.12,
rcp/constCO2_constClim,PASTURE_INCREASE_COST,unif,0.04,0.12,
rcp/85_constCO2,PASTURE_INCREASE_COST,unif,0.04,0.12,
rcp/85_constClim,PASTURE_INCREASE_COST,unif,0.04,0.12,
rcp/26,SEED_AND_WASTE_FRACTION,unif,0.05,0.15,
rcp/45,SEED_AND_WASTE_FRACTION,unif,0.05,0.15,
rcp/60,SEED_AND_WASTE_FRACTION,unif,0.05,0.15,
rcp/85,SEED_AND_WASTE_FRACTION,unif,0.05,0.15,
rcp/none,SEED_AND_WASTE_FRACTION,unif,0.05,0.15,
rcp/constCO2_constClim,SEED_AND_WASTE_FRACTION,unif,0.05,0.15,
rcp/85_constCO2,SEED_AND_WASTE_FRACTION,unif,0.05,0.15,
rcp/85_constClim,SEED_AND_WASTE_FRACTION,unif,0.05,0.15,
rcp/26,SSP_SCENARIO,value,,,SSP2_v9_130325
rcp/45,SSP_SCENARIO,value,,,SSP2_v9_130325
rcp/60,SSP_SCENARIO,value,,,SSP2_v9_130325
rcp/85,SSP_SCENARIO,value,,,SSP2_v9_130325
rcp/none,SSP_SCENARIO,value,,,SSP2_v9_130325
rcp/constCO2_constClim,SSP_SCENARIO,value,,,SSP2_v9_130325
rcp/85_constCO2,SSP_SCENARIO,value,,,SSP2_v9_130325
rcp/85_constClim,SSP_SCENARIO,value,,,SSP2_v9_130325
rcp/26,TECHNOLOGY_CHANGE_ANNUAL_RATE,unif,0.001,0.003,
rcp/45,TECHNOLOGY_CHANGE_ANNUAL_RATE,unif,0.001,0.003,
rcp/60,TECHNOLOGY_CHANGE_ANNUAL_RATE,unif,0.001,0.003,
rcp/85,TECHNOLOGY_CHANGE_ANNUAL_RATE,unif,0.001,0.003,
rcp/none,TECHNOLOGY_CHANGE_ANNUAL_RATE,unif,0.001,0.003,
rcp/constCO2_constClim,TECHNOLOGY_CHANGE_ANNUAL_RATE,unif,0.001,0.003,
rcp/85_constCO2,TECHNOLOGY_CHANGE_ANNUAL_RATE,unif,0.001,0.003,
rcp/85_constClim,TECHNOLOGY_CHANGE_ANNUAL_RATE,unif,0.001,0.003,
rcp/26,TRADE_BARRIER_FACTOR_DEFAULT,unif,0.15,0.45,
rcp/45,TRADE_BARRIER_FACTOR_DEFAULT,unif,0.15,0.45,
rcp/60,TRADE_BARRIER_FACTOR_DEFAULT,unif,0.15,0.45,
rcp/85,TRADE_BARRIER_FACTOR_DEFAULT,unif,0.15,0.45,
rcp/none,TRADE_BARRIER_FACTOR_DEFAULT,unif,0.15,0.45,
rcp/26,TRANSPORT_COST,unif,0.15,0.45,
rcp/45,TRANSPORT_COST,unif,0.15,0.45,
rcp/60,TRANSPORT_COST,unif,0.15,0.45,
rcp/85,TRANSPORT_COST,unif,0.15,0.45,
rcp/none,TRANSPORT_COST,unif,0.15,0.45,
rcp/constCO2_constClim,TRADE_BARRIER_FACTOR_DEFAULT,unif,0.15,0.45,
rcp/85_constCO2,TRADE_BARRIER_FACTOR_DEFAULT,unif,0.15,0.45,
rcp/85_constClim,TRADE_BARRIER_FACTOR_DEFAULT,unif,0.15,0.45,
rcp/26,TRANSPORT_COST,unif,0.05,0.15,
rcp/45,TRANSPORT_COST,unif,0.05,0.15,
rcp/60,TRANSPORT_COST,unif,0.05,0.15,
rcp/85,TRANSPORT_COST,unif,0.05,0.15,
rcp/constCO2_constClim,TRANSPORT_COST,unif,0.05,0.15,
rcp/85_constCO2,TRANSPORT_COST,unif,0.05,0.15,
rcp/85_constClim,TRANSPORT_COST,unif,0.05,0.15,
rcp/26,TRANSPORT_LOSSES,unif,0.025,0.075,
rcp/45,TRANSPORT_LOSSES,unif,0.025,0.075,
rcp/60,TRANSPORT_LOSSES,unif,0.025,0.075,
rcp/85,TRANSPORT_LOSSES,unif,0.025,0.075,
rcp/none,TRANSPORT_LOSSES,unif,0.025,0.075,
rcp/26,YIELD_DIR_TOP,value,,,LPJG_PLUM_expt1.2_rcp26_ipsl_irrV7104_b20170728_bothDS_irrWaits_forED_20170904130513
rcp/45,YIELD_DIR_TOP,value,,,LPJG_PLUM_expt1.2_rcp45_ipsl_irrV7104_b20170728_bothDS_irrWaits_forED_20170904131307
rcp/60,YIELD_DIR_TOP,value,,,LPJG_PLUM_expt1.2_rcp60_ipsl_irrV7104_b20170728_bothDS_irrWaits_forED_20170904131712
rcp/85,YIELD_DIR_TOP,value,,,LPJG_PLUM_expt1.2_rcp85_ipsl_irrV7104_b20170728_bothDS_irrWaits_forED_20170904131814
rcp/none,YIELD_DIR_TOP,value,,,LPJG_PLUM_expt1.2_rcp26_ipsl_irrV7104_b20170728_bothDS_irrWaits_forED_20170904130513
\ No newline at end of file
rcp/constCO2_constClim,TRANSPORT_LOSSES,unif,0.025,0.075,
rcp/85_constCO2,TRANSPORT_LOSSES,unif,0.025,0.075,
rcp/85_constClim,TRANSPORT_LOSSES,unif,0.025,0.075,
rcp/26,YIELD_DIR_TOP,value,,,runs_20170925/LPJG_PLUM_expt1.2_rcp26_ipsl_irrV7104_b20170728_bothDS_irrWaits_forED_20170925154752
rcp/45,YIELD_DIR_TOP,value,,,runs_20170925/LPJG_PLUM_expt1.2_rcp45_ipsl_irrV7104_b20170728_bothDS_irrWaits_forED_20170925151730
rcp/60,YIELD_DIR_TOP,value,,,runs_20170925/LPJG_PLUM_expt1.2_rcp60_ipsl_irrV7104_b20170728_bothDS_irrWaits_forED_20170925151858
rcp/85,YIELD_DIR_TOP,value,,,runs_20170925/LPJG_PLUM_expt1.2_rcp85_ipsl_irrV7104_b20170728_bothDS_irrWaits_forED_20170925151957
rcp/constCO2_constClim,YIELD_DIR_TOP,value,,,runs_20171008_constCO2_constClim/LPJG_PLUM_expt1.2_rcp85_ipsl_irrV7104_b20170728_bothDS_irrWaits_constCO2_constClim_forED_20171008124330
rcp/85_constCO2,YIELD_DIR_TOP,value,,,runs_20170925_constCO2/LPJG_PLUM_expt1.2_rcp85_ipsl_irrV7104_b20170728_bothDS_irrWaits_constCO2_forED_20170925152021
rcp/85_constClim,YIELD_DIR_TOP,value,,,runs_20171008_constClim/LPJG_PLUM_expt1.2_rcp85_ipsl_irrV7104_b20170728_bothDS_irrWaits_constClim_forED_20171008124324
\ No newline at end of file
data/sims/rcp_sims.csv
+ 351
− 251
View file @ 01f6a915
This diff is collapsed.
src/ac/ed/lurg/ModelConfig.java
+ 1
− 1
View file @ 01f6a915
......@@ -255,7 +255,7 @@ public class ModelConfig {
public static final double DOMESTIC_PRICE_MARKUP = getDoubleProperty("DOMESTIC_PRICE_MARKUP", 1.0);
public static final double TRANSPORT_LOSSES = getDoubleProperty("TRANSPORT_LOSSES", 0.05); // in international trade
public static final double TRANSPORT_COST = getDoubleProperty("TRANSPORT_COST", 0.3); // 100 $/t see Wheat Transportation Profile - USDA
public static final double TRANSPORT_COST = getDoubleProperty("TRANSPORT_COST", 0.1); // 100 $/t see Wheat Transportation Profile - USDA
public static final double TRADE_BARRIER_FACTOR_DEFAULT = getDoubleProperty("TRADE_BARRIER_FACTOR_DEFAULT", 0.3); // price factor in international trade, transport cost and real trade barriers
public static final double TRADE_BARRIER_ADJ = getDoubleProperty("TRADE_BARRIER_ADJ", 1.0);
public static final boolean ACTIVE_TRADE_BARRIERS = getBooleanProperty("ACTIVE_TRADE_BARRIERS", false); // if set to true read in barrier information from file, otherwise use default as above
......
src/ac/ed/lurg/country/GlobalPrice.java
+ 1
− 1
View file @ 01f6a915
......@@ -23,7 +23,7 @@ public class GlobalPrice {
}
public double getCountryImportPrice(double countryTradeBarrier) {
double importPrice = exportPrice * (1.0 + countryTradeBarrier*ModelConfig.TRADE_BARRIER_ADJ) / (1.0 - ModelConfig.TRANSPORT_LOSSES);
double importPrice = (exportPrice * (1.0 + countryTradeBarrier*ModelConfig.TRADE_BARRIER_ADJ) / (1.0 - ModelConfig.TRANSPORT_LOSSES)) + ModelConfig.TRANSPORT_COST;
return importPrice;
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment