Skip to content
Snippets Groups Projects
Commit 8b043cce authored by R0slyn's avatar R0slyn
Browse files

small tweaks in source files, mainly text.

parent 59526b0f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 757 additions and 449 deletions
data/3deg/protected_areas.txt
+ 366
− 66
View file @ 8b043cce
source diff could not be displayed: it is too large. Options to address this: view the blob.
data/sims/ssp_params.csv
+ 120
− 120
View file @ 8b043cce
Ensemble,pname,dist,xmin,xmax,x05,xmode,x95,value
ssp/SSP1,AGRI_LAND_EXPANSION_COST_FACTOR,beta,0.2,2,1.2,1.4,1.8,
ssp/SSP2,AGRI_LAND_EXPANSION_COST_FACTOR,beta,0.2,2,0.8,1,1.2,
ssp/SSP3,AGRI_LAND_EXPANSION_COST_FACTOR,beta,0.2,2,0.3,0.5,0.8,
ssp/SSP4,AGRI_LAND_EXPANSION_COST_FACTOR,beta,0.2,2,0.5,0.8,1,
ssp/SSP5,AGRI_LAND_EXPANSION_COST_FACTOR,beta,0.2,2,0.5,0.8,1.2,
ssp/SSP1,ANNUAL_MAX_IMPORT_CHANGE,beta,0.008,0.032,0.02,0.023,0.026,
ssp/SSP2,ANNUAL_MAX_IMPORT_CHANGE,beta,0.008,0.032,0.017,0.02,0.023,
ssp/SSP3,ANNUAL_MAX_IMPORT_CHANGE,beta,0.008,0.032,0.011,0.014,0.017,
ssp/SSP4,ANNUAL_MAX_IMPORT_CHANGE,beta,0.008,0.032,0.014,0.017,0.02,
ssp/SSP5,ANNUAL_MAX_IMPORT_CHANGE,beta,0.008,0.032,0.023,0.026,0.029,
ssp/SSP1,BIOENERGY_DEMAND_SHIFT,unif,0.9,1.1,,,,
ssp/SSP2,BIOENERGY_DEMAND_SHIFT,unif,0.9,1.1,,,,
ssp/SSP3,BIOENERGY_DEMAND_SHIFT,unif,0.9,1.1,,,,
ssp/SSP4,BIOENERGY_DEMAND_SHIFT,unif,0.9,1.1,,,,
ssp/SSP5,BIOENERGY_DEMAND_SHIFT,unif,0.9,1.1,,,,
ssp/SSP1,CROP_TO_PASTURE_COST_FACTOR,unif,0.7,1.3,,,,
ssp/SSP2,CROP_TO_PASTURE_COST_FACTOR,unif,0.7,1.3,,,,
ssp/SSP3,CROP_TO_PASTURE_COST_FACTOR,unif,0.7,1.3,,,,
ssp/SSP4,CROP_TO_PASTURE_COST_FACTOR,unif,0.7,1.3,,,,
ssp/SSP5,CROP_TO_PASTURE_COST_FACTOR,unif,0.7,1.3,,,,
ssp/SSP1,FERTILISER_COST_PER_T,beta,0.6,3,1.8,2.4,2.7,
ssp/SSP2,FERTILISER_COST_PER_T,beta,0.6,3,1.5,1.8,2.1,
ssp/SSP3,FERTILISER_COST_PER_T,beta,0.6,3,0.9,1.5,2.1,
ssp/SSP4,FERTILISER_COST_PER_T,beta,0.6,3,1.5,2.1,2.7,
ssp/SSP5,FERTILISER_COST_PER_T,beta,0.6,3,0.9,1.2,1.8,
ssp/SSP1,INITIAL_PRICE_SHIFT,unif,0.8,1.2,,,,
ssp/SSP2,INITIAL_PRICE_SHIFT,unif,0.8,1.2,,,,
ssp/SSP3,INITIAL_PRICE_SHIFT,unif,0.8,1.2,,,,
ssp/SSP4,INITIAL_PRICE_SHIFT,unif,0.8,1.2,,,,
ssp/SSP5,INITIAL_PRICE_SHIFT,unif,0.8,1.2,,,,
ssp/SSP1,IRRIG_COST_SCALE_FACTOR,beta,0.0001,0.0009,0.0005,0.0006,0.0007,
ssp/SSP2,IRRIG_COST_SCALE_FACTOR,beta,0.0001,0.0009,0.0003,0.00045,0.0006,
ssp/SSP3,IRRIG_COST_SCALE_FACTOR,beta,0.0001,0.0009,0.0002,0.00035,0.00035,
ssp/SSP4,IRRIG_COST_SCALE_FACTOR,beta,0.0001,0.0009,0.0003,0.0006,0.0007,
ssp/SSP5,IRRIG_COST_SCALE_FACTOR,beta,0.0001,0.0009,0.0002,0.00035,0.0005,
ssp/SSP1,IRRIGATION_EFFICIENCY,beta,0.4,0.6,0.52,0.55,0.58,
ssp/SSP2,IRRIGATION_EFFICIENCY,beta,0.4,0.6,0.48,0.5,0.52,
ssp/SSP3,IRRIGATION_EFFICIENCY,beta,0.4,0.6,0.42,0.45,0.48,
ssp/SSP4,IRRIGATION_EFFICIENCY,beta,0.4,0.6,0.45,0.5,0.55,
ssp/SSP5,IRRIGATION_EFFICIENCY,beta,0.4,0.6,0.5,0.52,0.55,
ssp/SSP1,LAND_CHANGE_COST,beta,0.05,0.35,0.225,0.275,0.3,
ssp/SSP2,LAND_CHANGE_COST,beta,0.05,0.35,0.175,0.2,0.225,
ssp/SSP3,LAND_CHANGE_COST,beta,0.05,0.35,0.15,0.2,0.25,
ssp/SSP4,LAND_CHANGE_COST,beta,0.05,0.35,0.2,0.225,0.275,
ssp/SSP5,LAND_CHANGE_COST,beta,0.05,0.35,0.1,0.15,0.175,
ssp/SSP1,MARKET_LAMBA,unif,0.3,0.5,,,,
ssp/SSP2,MARKET_LAMBA,unif,0.3,0.5,,,,
ssp/SSP3,MARKET_LAMBA,unif,0.3,0.5,,,,
ssp/SSP4,MARKET_LAMBA,unif,0.3,0.5,,,,
ssp/SSP5,MARKET_LAMBA,unif,0.3,0.5,,,,
ssp/SSP1,MEAT_EFFICIENCY,beta,0.95,1.05,1.01,1.02,1.04,
ssp/SSP2,MEAT_EFFICIENCY,beta,0.95,1.05,0.99,1,1.01,
ssp/SSP3,MEAT_EFFICIENCY,beta,0.95,1.05,0.98,1,1.02,
ssp/SSP4,MEAT_EFFICIENCY,beta,0.95,1.05,0.98,1,1.02,
ssp/SSP5,MEAT_EFFICIENCY,beta,0.95,1.05,1,1.01,1.02,
ssp/SSP1,MIN_NATURAL_RATE,beta,0,0.3,0.14,0.2,0.25,
ssp/SSP2,MIN_NATURAL_RATE,beta,0,0.3,0.06,0.1,0.14,
ssp/SSP3,MIN_NATURAL_RATE,beta,0,0.3,0.02,0.04,0.07,
ssp/SSP4,MIN_NATURAL_RATE,beta,0,0.3,0.04,0.06,0.1,
ssp/SSP5,MIN_NATURAL_RATE,beta,0,0.3,0.02,0.04,0.06,
ssp/SSP1,OTHER_INTENSITY_COST,beta,0.48,0.72,0.6,0.66,0.69,
ssp/SSP2,OTHER_INTENSITY_COST,beta,0.48,0.72,0.57,0.6,0.63,
ssp/SSP3,OTHER_INTENSITY_COST,beta,0.48,0.72,0.51,0.57,0.63,
ssp/SSP4,OTHER_INTENSITY_COST,beta,0.48,0.72,0.57,0.63,0.69,
ssp/SSP5,OTHER_INTENSITY_COST,beta,0.48,0.72,0.51,0.54,0.6,
ssp/SSP1,PASTURE_HARVEST_FRACTION,unif,0.4,0.6,,,,
ssp/SSP2,PASTURE_HARVEST_FRACTION,unif,0.4,0.6,,,,
ssp/SSP3,PASTURE_HARVEST_FRACTION,unif,0.4,0.6,,,,
ssp/SSP4,PASTURE_HARVEST_FRACTION,unif,0.4,0.6,,,,
ssp/SSP5,PASTURE_HARVEST_FRACTION,unif,0.4,0.6,,,,
ssp/SSP1,SSP_GDP_PC_FACTOR,unif,0.9,1.1,,,,
ssp/SSP2,SSP_GDP_PC_FACTOR,unif,0.9,1.1,,,,
ssp/SSP3,SSP_GDP_PC_FACTOR,unif,0.9,1.1,,,,
ssp/SSP4,SSP_GDP_PC_FACTOR,unif,0.9,1.1,,,,
ssp/SSP5,SSP_GDP_PC_FACTOR,unif,0.9,1.1,,,,
ssp/SSP1,SSP_POPULATION_FACTOR,unif,0.9,1.1,,,,
ssp/SSP2,SSP_POPULATION_FACTOR,unif,0.9,1.1,,,,
ssp/SSP3,SSP_POPULATION_FACTOR,unif,0.9,1.1,,,,
ssp/SSP4,SSP_POPULATION_FACTOR,unif,0.9,1.1,,,,
ssp/SSP5,SSP_POPULATION_FACTOR,unif,0.9,1.1,,,,
ssp/SSP1,SSP_SCENARIO,value,,,,,,SSP1_v9_130325
ssp/SSP2,SSP_SCENARIO,value,,,,,,SSP2_v9_130325
ssp/SSP3,SSP_SCENARIO,value,,,,,,SSP3_v9_130325
ssp/SSP4,SSP_SCENARIO,value,,,,,,SSP4_v9_130325
ssp/SSP5,SSP_SCENARIO,value,,,,,,SSP5_v9_130325
ssp/SSP1,TECHNOLOGY_CHANGE_ANNUAL_RATE,beta,-0.002,0.008,0.003,0.005,0.007,
ssp/SSP2,TECHNOLOGY_CHANGE_ANNUAL_RATE,beta,-0.002,0.008,0.001,0.002,0.003,
ssp/SSP3,TECHNOLOGY_CHANGE_ANNUAL_RATE,beta,-0.002,0.008,-0.001,0,0.001,
ssp/SSP4,TECHNOLOGY_CHANGE_ANNUAL_RATE,beta,-0.002,0.008,0,0.002,0.005,
ssp/SSP5,TECHNOLOGY_CHANGE_ANNUAL_RATE,beta,-0.002,0.008,0.002,0.004,0.005,
ssp/SSP1,TRADE_BARRIER_ADJ,beta,0.2,2,0.6,0.8,1,
ssp/SSP2,TRADE_BARRIER_ADJ,beta,0.2,2,0.8,1,1.2,
ssp/SSP3,TRADE_BARRIER_ADJ,beta,0.2,2,1.2,1.5,1.8,
ssp/SSP4,TRADE_BARRIER_ADJ,beta,0.2,2,1,1.2,1.5,
ssp/SSP5,TRADE_BARRIER_ADJ,beta,0.2,2,0.3,0.6,0.8,
ssp/SSP1,TRANSPORT_COST,beta,0.01,0.09,0.05,0.065,0.08,
ssp/SSP2,TRANSPORT_COST,beta,0.01,0.09,0.04,0.05,0.06,
ssp/SSP3,TRANSPORT_COST,beta,0.01,0.09,0.02,0.04,0.06,
ssp/SSP4,TRANSPORT_COST,beta,0.01,0.09,0.04,0.06,0.08,
ssp/SSP5,TRANSPORT_COST,beta,0.01,0.09,0.02,0.035,0.05,
ssp/SSP1,RCP,rcp,,,,,,ssp1
ssp/SSP2,RCP,rcp,,,,,,ssp2
ssp/SSP3,RCP,rcp,,,,,,ssp3
ssp/SSP4,RCP,rcp,,,,,,ssp4
ssp/SSP5,RCP,rcp,,,,,,ssp5
ssp/SSP1,BIOENERGY_DEMAND_SCENARIO,value,,,,,,ssp1
ssp/SSP2,BIOENERGY_DEMAND_SCENARIO,value,,,,,,ssp2
ssp/SSP3,BIOENERGY_DEMAND_SCENARIO,value,,,,,,ssp3
ssp/SSP4,BIOENERGY_DEMAND_SCENARIO,value,,,,,,ssp4
ssp/SSP5,BIOENERGY_DEMAND_SCENARIO,value,,,,,,ssp5
ssp/SSP1,YIELD_DIR_TOP,value,,,,,,ssp1
ssp/SSP2,YIELD_DIR_TOP,value,,,,,,ssp2
ssp/SSP3,YIELD_DIR_TOP,value,,,,,,ssp3
ssp/SSP4,YIELD_DIR_TOP,value,,,,,,ssp4
ssp/SSP5,YIELD_DIR_TOP,value,,,,,,ssp5
ssp/SSP1,BIOENERGY_FUTURE_DEMAND_FILENAME,value,,,,,,bioenergy_scenario_data.csv
ssp/SSP2,BIOENERGY_FUTURE_DEMAND_FILENAME,value,,,,,,bioenergy_scenario_data.csv
ssp/SSP3,BIOENERGY_FUTURE_DEMAND_FILENAME,value,,,,,,bioenergy_scenario_data.csv
ssp/SSP4,BIOENERGY_FUTURE_DEMAND_FILENAME,value,,,,,,bioenergy_scenario_data.csv
ssp/SSP5,BIOENERGY_FUTURE_DEMAND_FILENAME,value,,,,,,bioenergy_scenario_data.csv
\ No newline at end of file
ssp3/SSP1,AGRI_LAND_EXPANSION_COST_FACTOR,beta,0.2,2,1.2,1.4,1.8,
ssp3/SSP2,AGRI_LAND_EXPANSION_COST_FACTOR,beta,0.2,2,0.8,1,1.2,
ssp3/SSP3,AGRI_LAND_EXPANSION_COST_FACTOR,beta,0.2,2,0.3,0.5,0.8,
ssp3/SSP4,AGRI_LAND_EXPANSION_COST_FACTOR,beta,0.2,2,0.5,0.8,1,
ssp3/SSP5,AGRI_LAND_EXPANSION_COST_FACTOR,beta,0.2,2,0.5,0.8,1.2,
ssp3/SSP1,ANNUAL_MAX_IMPORT_CHANGE,beta,0.008,0.032,0.02,0.023,0.026,
ssp3/SSP2,ANNUAL_MAX_IMPORT_CHANGE,beta,0.008,0.032,0.017,0.02,0.023,
ssp3/SSP3,ANNUAL_MAX_IMPORT_CHANGE,beta,0.008,0.032,0.011,0.014,0.017,
ssp3/SSP4,ANNUAL_MAX_IMPORT_CHANGE,beta,0.008,0.032,0.014,0.017,0.02,
ssp3/SSP5,ANNUAL_MAX_IMPORT_CHANGE,beta,0.008,0.032,0.023,0.026,0.029,
ssp3/SSP1,BIOENERGY_DEMAND_SHIFT,unif,0.9,1.1,,,,
ssp3/SSP2,BIOENERGY_DEMAND_SHIFT,unif,0.9,1.1,,,,
ssp3/SSP3,BIOENERGY_DEMAND_SHIFT,unif,0.9,1.1,,,,
ssp3/SSP4,BIOENERGY_DEMAND_SHIFT,unif,0.9,1.1,,,,
ssp3/SSP5,BIOENERGY_DEMAND_SHIFT,unif,0.9,1.1,,,,
ssp3/SSP1,CROP_TO_PASTURE_COST_FACTOR,unif,0.8,1.2,,,,
ssp3/SSP2,CROP_TO_PASTURE_COST_FACTOR,unif,0.8,1.2,,,,
ssp3/SSP3,CROP_TO_PASTURE_COST_FACTOR,unif,0.8,1.2,,,,
ssp3/SSP4,CROP_TO_PASTURE_COST_FACTOR,unif,0.8,1.2,,,,
ssp3/SSP5,CROP_TO_PASTURE_COST_FACTOR,unif,0.8,1.2,,,,
ssp3/SSP1,FERTILISER_COST_PER_T,beta,0.7,3.1,1.9,2.5,2.8,
ssp3/SSP2,FERTILISER_COST_PER_T,beta,0.7,3.1,1.6,1.9,2.2,
ssp3/SSP3,FERTILISER_COST_PER_T,beta,0.7,3.1,0.9,1.6,2.2,
ssp3/SSP4,FERTILISER_COST_PER_T,beta,0.7,3.1,1.3,2.2,2.8,
ssp3/SSP5,FERTILISER_COST_PER_T,beta,0.7,3.1,0.9,1.3,1.9,
ssp3/SSP1,INITIAL_PRICE_SHIFT,unif,0.8,1.2,,,,
ssp3/SSP2,INITIAL_PRICE_SHIFT,unif,0.8,1.2,,,,
ssp3/SSP3,INITIAL_PRICE_SHIFT,unif,0.8,1.2,,,,
ssp3/SSP4,INITIAL_PRICE_SHIFT,unif,0.8,1.2,,,,
ssp3/SSP5,INITIAL_PRICE_SHIFT,unif,0.8,1.2,,,,
ssp3/SSP1,IRRIG_COST_SCALE_FACTOR,beta,0.0001,0.0009,0.0005,0.0006,0.0007,
ssp3/SSP2,IRRIG_COST_SCALE_FACTOR,beta,0.0001,0.0009,0.0004,0.0005,0.0006,
ssp3/SSP3,IRRIG_COST_SCALE_FACTOR,beta,0.0001,0.0009,0.0002,0.0003,0.0004,
ssp3/SSP4,IRRIG_COST_SCALE_FACTOR,beta,0.0001,0.0009,0.0003,0.0005,0.0007,
ssp3/SSP5,IRRIG_COST_SCALE_FACTOR,beta,0.0001,0.0009,0.0002,0.00035,0.0005,
ssp3/SSP1,IRRIGATION_EFFICIENCY,beta,0.4,0.6,0.52,0.55,0.58,
ssp3/SSP2,IRRIGATION_EFFICIENCY,beta,0.4,0.6,0.48,0.5,0.52,
ssp3/SSP3,IRRIGATION_EFFICIENCY,beta,0.4,0.6,0.42,0.45,0.48,
ssp3/SSP4,IRRIGATION_EFFICIENCY,beta,0.4,0.6,0.45,0.5,0.55,
ssp3/SSP5,IRRIGATION_EFFICIENCY,beta,0.4,0.6,0.5,0.52,0.55,
ssp3/SSP1,LAND_CHANGE_COST,beta,0.05,0.35,0.225,0.275,0.3,
ssp3/SSP2,LAND_CHANGE_COST,beta,0.05,0.35,0.175,0.2,0.225,
ssp3/SSP3,LAND_CHANGE_COST,beta,0.05,0.35,0.15,0.2,0.25,
ssp3/SSP4,LAND_CHANGE_COST,beta,0.05,0.35,0.2,0.225,0.275,
ssp3/SSP5,LAND_CHANGE_COST,beta,0.05,0.35,0.1,0.15,0.175,
ssp3/SSP1,MARKET_LAMBA,unif,0.3,0.5,,,,
ssp3/SSP2,MARKET_LAMBA,unif,0.3,0.5,,,,
ssp3/SSP3,MARKET_LAMBA,unif,0.3,0.5,,,,
ssp3/SSP4,MARKET_LAMBA,unif,0.3,0.5,,,,
ssp3/SSP5,MARKET_LAMBA,unif,0.3,0.5,,,,
ssp3/SSP1,MEAT_EFFICIENCY,beta,0.95,1.05,1.01,1.02,1.04,
ssp3/SSP2,MEAT_EFFICIENCY,beta,0.95,1.05,0.99,1,1.01,
ssp3/SSP3,MEAT_EFFICIENCY,beta,0.95,1.05,0.98,1,1.02,
ssp3/SSP4,MEAT_EFFICIENCY,beta,0.95,1.05,0.98,1,1.02,
ssp3/SSP5,MEAT_EFFICIENCY,beta,0.95,1.05,1,1.01,1.02,
ssp3/SSP1,MIN_NATURAL_RATE,beta,0,0.3,0.14,0.2,0.25,
ssp3/SSP2,MIN_NATURAL_RATE,beta,0,0.3,0.06,0.1,0.14,
ssp3/SSP3,MIN_NATURAL_RATE,beta,0,0.3,0.02,0.04,0.07,
ssp3/SSP4,MIN_NATURAL_RATE,beta,0,0.3,0.04,0.06,0.1,
ssp3/SSP5,MIN_NATURAL_RATE,beta,0,0.3,0.02,0.04,0.06,
ssp3/SSP1,OTHER_INTENSITY_COST,beta,0.4,0.8,0.6,0.7,0.75,
ssp3/SSP2,OTHER_INTENSITY_COST,beta,0.4,0.8,0.55,0.6,0.65,
ssp3/SSP3,OTHER_INTENSITY_COST,beta,0.4,0.8,0.45,0.55,0.65,
ssp3/SSP4,OTHER_INTENSITY_COST,beta,0.4,0.8,0.5,0.65,0.75,
ssp3/SSP5,OTHER_INTENSITY_COST,beta,0.4,0.8,0.45,0.5,0.6,
ssp3/SSP1,PASTURE_HARVEST_FRACTION,unif,0.4,0.6,,,,
ssp3/SSP2,PASTURE_HARVEST_FRACTION,unif,0.4,0.6,,,,
ssp3/SSP3,PASTURE_HARVEST_FRACTION,unif,0.4,0.6,,,,
ssp3/SSP4,PASTURE_HARVEST_FRACTION,unif,0.4,0.6,,,,
ssp3/SSP5,PASTURE_HARVEST_FRACTION,unif,0.4,0.6,,,,
ssp3/SSP1,SSP_GDP_PC_FACTOR,unif,0.9,1.1,,,,
ssp3/SSP2,SSP_GDP_PC_FACTOR,unif,0.9,1.1,,,,
ssp3/SSP3,SSP_GDP_PC_FACTOR,unif,0.9,1.1,,,,
ssp3/SSP4,SSP_GDP_PC_FACTOR,unif,0.9,1.1,,,,
ssp3/SSP5,SSP_GDP_PC_FACTOR,unif,0.9,1.1,,,,
ssp3/SSP1,SSP_POPULATION_FACTOR,unif,0.9,1.1,,,,
ssp3/SSP2,SSP_POPULATION_FACTOR,unif,0.9,1.1,,,,
ssp3/SSP3,SSP_POPULATION_FACTOR,unif,0.9,1.1,,,,
ssp3/SSP4,SSP_POPULATION_FACTOR,unif,0.9,1.1,,,,
ssp3/SSP5,SSP_POPULATION_FACTOR,unif,0.9,1.1,,,,
ssp3/SSP1,SSP_SCENARIO,value,,,,,,SSP1_v9_130325
ssp3/SSP2,SSP_SCENARIO,value,,,,,,SSP2_v9_130325
ssp3/SSP3,SSP_SCENARIO,value,,,,,,SSP3_v9_130325
ssp3/SSP4,SSP_SCENARIO,value,,,,,,SSP4_v9_130325
ssp3/SSP5,SSP_SCENARIO,value,,,,,,SSP5_v9_130325
ssp3/SSP1,TECHNOLOGY_CHANGE_ANNUAL_RATE,beta,-0.002,0.008,0.003,0.005,0.007,
ssp3/SSP2,TECHNOLOGY_CHANGE_ANNUAL_RATE,beta,-0.002,0.008,0.001,0.002,0.003,
ssp3/SSP3,TECHNOLOGY_CHANGE_ANNUAL_RATE,beta,-0.002,0.008,-0.001,0,0.001,
ssp3/SSP4,TECHNOLOGY_CHANGE_ANNUAL_RATE,beta,-0.002,0.008,0,0.002,0.005,
ssp3/SSP5,TECHNOLOGY_CHANGE_ANNUAL_RATE,beta,-0.002,0.008,0.002,0.004,0.005,
ssp3/SSP1,TRADE_BARRIER_ADJ,beta,0.2,2,0.6,0.8,1,
ssp3/SSP2,TRADE_BARRIER_ADJ,beta,0.2,2,0.8,1,1.2,
ssp3/SSP3,TRADE_BARRIER_ADJ,beta,0.2,2,1.2,1.5,1.8,
ssp3/SSP4,TRADE_BARRIER_ADJ,beta,0.2,2,1,1.2,1.5,
ssp3/SSP5,TRADE_BARRIER_ADJ,beta,0.2,2,0.3,0.6,0.8,
ssp3/SSP1,TRANSPORT_COST,beta,0.01,0.09,0.05,0.065,0.08,
ssp3/SSP2,TRANSPORT_COST,beta,0.01,0.09,0.04,0.05,0.06,
ssp3/SSP3,TRANSPORT_COST,beta,0.01,0.09,0.02,0.04,0.06,
ssp3/SSP4,TRANSPORT_COST,beta,0.01,0.09,0.04,0.06,0.08,
ssp3/SSP5,TRANSPORT_COST,beta,0.01,0.09,0.02,0.035,0.05,
ssp3/SSP1,RCP,rcp,,,,,,ssp1
ssp3/SSP2,RCP,rcp,,,,,,ssp2
ssp3/SSP3,RCP,rcp,,,,,,ssp3
ssp3/SSP4,RCP,rcp,,,,,,ssp4
ssp3/SSP5,RCP,rcp,,,,,,ssp5
ssp3/SSP1,BIOENERGY_DEMAND_SCENARIO,value,,,,,,ssp1
ssp3/SSP2,BIOENERGY_DEMAND_SCENARIO,value,,,,,,ssp2
ssp3/SSP3,BIOENERGY_DEMAND_SCENARIO,value,,,,,,ssp3
ssp3/SSP4,BIOENERGY_DEMAND_SCENARIO,value,,,,,,ssp4
ssp3/SSP5,BIOENERGY_DEMAND_SCENARIO,value,,,,,,ssp5
ssp3/SSP1,YIELD_DIR_TOP,value,,,,,,ssp1
ssp3/SSP2,YIELD_DIR_TOP,value,,,,,,ssp2
ssp3/SSP3,YIELD_DIR_TOP,value,,,,,,ssp3
ssp3/SSP4,YIELD_DIR_TOP,value,,,,,,ssp4
ssp3/SSP5,YIELD_DIR_TOP,value,,,,,,ssp5
ssp3/SSP1,BIOENERGY_FUTURE_DEMAND_FILENAME,value,,,,,,bioenergy_scenario_data.csv
ssp3/SSP2,BIOENERGY_FUTURE_DEMAND_FILENAME,value,,,,,,bioenergy_scenario_data.csv
ssp3/SSP3,BIOENERGY_FUTURE_DEMAND_FILENAME,value,,,,,,bioenergy_scenario_data.csv
ssp3/SSP4,BIOENERGY_FUTURE_DEMAND_FILENAME,value,,,,,,bioenergy_scenario_data.csv
ssp3/SSP5,BIOENERGY_FUTURE_DEMAND_FILENAME,value,,,,,,bioenergy_scenario_data.csv
\ No newline at end of file
data/sims/ssp_sims.csv
+ 250
− 250
View file @ 8b043cce
source diff could not be displayed: it is too large. Options to address this: view the blob.
src/ac/ed/lurg/ModelConfig.java
+ 1
− 1
View file @ 8b043cce
......@@ -260,7 +260,7 @@ public class ModelConfig {
public static final double STARCHY_ROOTS_SUB_PROPORTION = getDoubleProperty("STARCHY_ROOTS_SUB_PROPORTION", 0.3);
//RUGS limit yield in argentina
public static final boolean LIMIT_MAIZE_YIELD_ARGENTINA = getBooleanProperty("LIMIT_MAIZE_YIELD_ARGENTINA", false);
public static final boolean LIMIT_MAIZE_YIELD_SAMERICA = getBooleanProperty("LIMIT_MAIZE_YIELD_SAMERICA", false);
public static final double LIMIT_YIELD_BY = getDoubleProperty("LIMIT_YIELD_BY", 0.0);
//RUGS trade changes scenarios
......
src/ac/ed/lurg/ModelMain.java
+ 6
− 3
View file @ 8b043cce
......@@ -330,9 +330,9 @@ public class ModelMain {
}
private void writeDomesticProductionFile(Timestep timestep) {
private void writeDomesticProductionFile(Timestep timestep) {
try {
StringBuffer sbHeadings = new StringBuffer("Year, Country, Crop, Production, Production_cost, Export_price, Import_price, Net_imports, Net_import_cost");
StringBuffer sbHeadings = new StringBuffer("Year, Country, Crop, Area, Production, Production_cost, Export_price, Import_price, Net_imports, Net_import_cost, Feed_amount");
BufferedWriter outputFile = getFileWriter(timestep, ModelConfig.DOMESTIC_OUTPUT_FILE,
sbHeadings.toString());
......@@ -342,6 +342,9 @@ public class ModelMain {
GamsRasterOutput previousCountryGamsRasterOutput = country.getGamsOutput(); //this is not nice i.e. accessing gamsOutput here but can't think of a way to do it
Double prodCosts = previousCountryGamsRasterOutput.getCropUsageData().get(crop).getProdCost();
Double prod = previousCountryGamsRasterOutput.getCropUsageData().get(crop).getProduction();
Double area = previousCountryGamsRasterOutput.getCropUsageData().get(crop).getArea();
Double feedAmount = previousCountryGamsRasterOutput.getCropUsageData().get(crop).getMonogastricFeed()+
previousCountryGamsRasterOutput.getCropUsageData().get(crop).getRuminantFeed();
Double importPrice;
Double exportPrice;
......@@ -364,7 +367,7 @@ public class ModelMain {
StringBuffer sbData = new StringBuffer();
sbData.append(String.format("%d,%s, %s", timestep.getYear(), country.getCountry(),crop.getGamsName()));
sbData.append(String.format(",%.3f,%.3f,%.3f,%.3f,%.3f,%.3f",prod, prodCosts, importPrice, exportPrice, netImports, netImportCost));
sbData.append(String.format(",%.3f,%.3f,%.3f,%.3f,%.3f,%.3f,%.3f,%.3f",area,prod, prodCosts, importPrice, exportPrice, netImports, netImportCost, feedAmount));
outputFile.write(sbData.toString());
outputFile.newLine();
......
src/ac/ed/lurg/country/CountryAgent.java
+ 1
− 1
View file @ 8b043cce
......@@ -109,7 +109,7 @@ public class CountryAgent {
currentCountryPrices = calculateCountryPrices(worldPrices, timestep.getYear());
if(ModelConfig.LIMIT_MAIZE_YIELD_ARGENTINA & country.getRegion().equals("Latin America & Caribbean")){
if(ModelConfig.LIMIT_MAIZE_YIELD_SAMERICA & country.getRegion().equals("Latin America & Caribbean")){
for (Entry<RasterKey, YieldResponsesItem> entry : countryYieldSurfaces.entrySet()) {
YieldResponsesItem yresp = entry.getValue();
if (yresp != null){
......
src/ac/ed/lurg/country/gams/GamsLocationOptimiser.java
+ 2
− 2
View file @ 8b043cce
......@@ -354,7 +354,7 @@ public class GamsLocationOptimiser {
prodCost = getParmValue(parmProdCost, itemName);
double totalArea = getParmValue(parmTotalArea, itemName);
cropUsageData.put(cropType, new CropUsageData(ruminantFeed, monogastricFeed, netImport, netImportCost, prod, prodCost));
cropUsageData.put(cropType, new CropUsageData(ruminantFeed, monogastricFeed, netImport, netImportCost, prod, prodCost, totalArea));
if (DEBUG) LogWriter.println(String.format("\n%s:\tarea= %.1f,\tfeedAmount= %.1f,\tnetImports= %.3f,\tnetImportCost= %.3f,\tprod= %.3f,\tprodCost= %.3f,\tprodCostRate= %.3f", itemName, totalArea, ruminantFeed+monogastricFeed, netImport, netImportCost, prod, prodCost, prodCost/prod));
}
......@@ -386,7 +386,7 @@ public class GamsLocationOptimiser {
prod = getParmValue(parmProd, meatTypes.getGamsName());
prodCost = getParmValue(parmProdCost, meatTypes.getGamsName()); // currently not calculated in GAMS correctly, not sure it's needed
cropUsageData.put(meatTypes, new CropUsageData(0.0, 0.0, netImport, netImportCost, prod, prodCost));
cropUsageData.put(meatTypes, new CropUsageData(0.0, 0.0, netImport, netImportCost, prod, prodCost, Double.NaN));
if (DEBUG) LogWriter.println(String.format("\n%s:\t\t\t\t\tnetImports= %.3f,tnetImportCost= %.3f,\tprod= %.3f,\tprodCost= %.3f", meatTypes.getGamsName(), netImport, netImportCost, prod, prodCost));
}
LogWriter.println(String.format("\n%s %s: Total area= %.1f (crop=%.1f, pasture %.1f)",
......
src/ac/ed/lurg/demand/DemandManagerSSP.java
+ 2
− 3
View file @ 8b043cce
......@@ -40,10 +40,9 @@ public class DemandManagerSSP extends AbstractDemandManager {
if((ModelConfig.CONSTANT_DIET_HIGH_INCOME & c.getIncomeGroup().toLowerCase().contains("high")) ||
(ModelConfig.CONSTANT_DIET_LOW_INCOME & !c.getIncomeGroup().toLowerCase().contains("high")))
gdpPcYear = baseSspData.getGdpPc();
else gdpPcYear= sd.getGdpPc();
else gdpPcYear= sd.getGdpPc();
LogWriter.println("Got ssp data for " + c.getCountryName() + " of " + sd);
for (CommodityType commodity : CommodityType.getAllItems()) {
......
src/ac/ed/lurg/landuse/CropUsageData.java
+ 7
− 1
View file @ 8b043cce
......@@ -8,8 +8,9 @@ public class CropUsageData {
private double netImportCost;
private double prod;
private double prodCost;
private double area;
public CropUsageData(double ruminantFeed, double monogastricFeed, double netImports, double netImportCost, double prod, double prodCost) {
public CropUsageData(double ruminantFeed, double monogastricFeed, double netImports, double netImportCost, double prod, double prodCost, double area) {
super();
this.ruminantFeed = ruminantFeed;
this.monogastricFeed = monogastricFeed;
......@@ -17,6 +18,7 @@ public class CropUsageData {
this.netImportCost=netImportCost;
this.prod = prod;
this.prodCost = prodCost;
this.area= area;
}
public double getRuminantFeed() {
......@@ -42,4 +44,8 @@ public class CropUsageData {
public double getProdCost() {
return prodCost;
}
public double getArea(){
return area;
}
}
src/ac/ed/lurg/landuse/CropUsageReader.java
+ 2
− 2
View file @ 8b043cce
......@@ -32,7 +32,7 @@ public class CropUsageReader {
LazyHashMap<CompositeCountry, Map<CropType, CropUsageData>> commodityMap = new LazyHashMap<CompositeCountry, Map<CropType, CropUsageData>>() {
protected Map<CropType, CropUsageData> createValue() {
Map<CropType, CropUsageData> countryData = new HashMap<CropType, CropUsageData>();
countryData.put(CropType.ENERGY_CROPS, new CropUsageData(Double.NaN, Double.NaN, 0.0, Double.NaN,Double.NaN, Double.NaN)); // 2nd generation energy crops not in FAO data, so adding zero values.
countryData.put(CropType.ENERGY_CROPS, new CropUsageData(Double.NaN, Double.NaN, 0.0, Double.NaN,Double.NaN, Double.NaN, Double.NaN)); // 2nd generation energy crops not in FAO data, so adding zero values.
return countryData;
}
};
......@@ -67,7 +67,7 @@ public class CropUsageReader {
netImports += oldData.getNetImports();
}
CropUsageData newData = new CropUsageData(Double.NaN, Double.NaN, netImports, Double.NaN,Double.NaN, Double.NaN);
CropUsageData newData = new CropUsageData(Double.NaN, Double.NaN, netImports, Double.NaN,Double.NaN, Double.NaN, Double.NaN);
countryData.put(crop, newData);
}
fitReader.close();
......
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