From 344e73695d37abf68dfc4d2bd602059c6720240b Mon Sep 17 00:00:00 2001
From: Peter Alexander <>
Date: Thu, 3 Feb 2022 14:45:31 +0000
Subject: [PATCH] Changes to demand output file and minor refactoring
---
data/sims/globalShock.csv | 40 +++++++++----------
data/sims/globalShockBarriers.csv | 40 +++++++++----------
data/sims/globalShock_params.csv | 16 ++++----
data/sims/globalShock_paramsBarriers.csv | 16 ++++----
src/ac/ed/lurg/ModelMain.java | 5 ++-
.../ed/lurg/country/AbstractCountryAgent.java | 20 +++++++---
src/ac/ed/lurg/country/CountryAgent.java | 13 ------
.../country/crafty/CraftyCountryAgent.java | 12 ------
8 files changed, 74 insertions(+), 88 deletions(-)
diff --git a/data/sims/globalShock.csv b/data/sims/globalShock.csv
index ec89007c..b7a12927 100644
--- a/data/sims/globalShock.csv
+++ b/data/sims/globalShock.csv
@@ -1,21 +1,21 @@
Ensemble,Scenario,AGRI_LAND_EXPANSION_COST_FACTOR,ANNUAL_MAX_IMPORT_CHANGE,BIOENERGY_DEMAND_SHIFT,CROP_TO_PASTURE_COST_FACTOR,FERTILISER_COST_PER_T,INITIAL_PRICE_SHIFT,IRRIG_COST_SCALE_FACTOR,IRRIGATION_EFFICIENCY,LAND_CHANGE_COST,MARKET_LAMBA,MEAT_EFFICIENCY,MIN_NATURAL_RATE,OTHER_INTENSITY_COST,PASTURE_HARVEST_FRACTION,SSP_GDP_PC_FACTOR,SSP_POPULATION_FACTOR,SSP_SCENARIO,TECHNOLOGY_CHANGE_ANNUAL_RATE,TRADE_BARRIER_MULTIPLIER,TRANSPORT_COST,TRANSPORT_LOSSES,RCP,SHOCKS_POSSIBLE,APPLY_EXPORT_TAXES,EXPORT_TAX_RATE,EXPORT_TAX_THRESHOLD,YIELD_DIR_TOP,BIOENERGY_DEMAND_SCENARIO
-shocks/noShockNoTax,s1,1,0.02,1,1,1.6,1,0.00035,0.5,0.2,0.4,1,0.1,0.7,0.5,1,1,SSP2_v9_130325,0.002,1,0.1,0.5,rcp45,FALSE,FALSE,1,0.1,rcp45,SSP2_RCP45
-shocks/noShockNoTax,s2,1.08270938702243,0.0187532681030967,1.05,0.9,1.72467318969033,0.9,0.000392014778383574,0.491729061297757,0.189688362297416,0.45,0.995864530648878,0.12174185522096,0.679221135051611,0.55,0.95,1.05,SSP2_v9_130325,0.00158753449189663,1.08500433504854,0.0914995664951457,0.585004335048543,rcp45,FALSE,FALSE,1.25,0.125,rcp45,SSP2_RCP45
-shocks/noShockNoTax,s3,0.91729061297757,0.0212467318969033,0.95,1.1,1.47532681030967,1.1,0.000307985221616426,0.508270938702243,0.210311637702584,0.35,1.00413546935112,0.0782581447790401,0.720778864948389,0.45,1.05,0.95,SSP2_v9_130325,0.00241246550810337,0.914995664951457,0.108500433504854,0.414995664951457,rcp45,FALSE,FALSE,0.75,0.075,rcp45,SSP2_RCP45
-shocks/noShockNoTax,s4,0.960874657414893,0.0194097808551165,1.025,0.85,1.81153483560056,1.15,0.000279015531982238,0.503912534258511,0.182453074797474,0.475,0.998043732870745,0.110368611745326,0.664744194066573,0.475,1.025,0.925,SSP2_v9_130325,0.00180496552244993,0.959612716462545,0.114296975860531,0.642969758605306,rcp45,FALSE,FALSE,0.875,0.0625,rcp45,SSP2_RCP45
-shocks/noShockNoTax,s5,1.14060088096457,0.0221153483560056,0.925,1.05,1.54097808551165,0.95,0.000369925055308764,0.485939911903543,0.204875861938752,0.375,1.00703004404823,0.0637597348849639,0.709836985748058,0.575,0.925,1.025,SSP2_v9_130325,0.00270187700810103,1.14296975860531,0.0959612716462545,0.459612716462545,rcp45,FALSE,FALSE,1.375,0.1125,rcp45,SSP2_RCP45
-shocks/withShockNoTax,s1,1,0.02,1,1,1.6,1,0.00035,0.5,0.2,0.4,1,0.1,0.7,0.5,1,1,SSP2_v9_130325,0.002,1,0.1,0.5,rcp45,TRUE,FALSE,1,0.1,rcp45,SSP2_RCP45
-shocks/withShockNoTax,s2,1.08270938702243,0.0187532681030967,1.05,0.9,1.72467318969033,0.9,0.000392014778383574,0.491729061297757,0.189688362297416,0.45,0.995864530648878,0.12174185522096,0.679221135051611,0.55,0.95,1.05,SSP2_v9_130325,0.00158753449189663,1.08500433504854,0.0914995664951457,0.585004335048543,rcp45,TRUE,FALSE,1.25,0.125,rcp45,SSP2_RCP45
-shocks/withShockNoTax,s3,0.91729061297757,0.0212467318969033,0.95,1.1,1.47532681030967,1.1,0.000307985221616426,0.508270938702243,0.210311637702584,0.35,1.00413546935112,0.0782581447790401,0.720778864948389,0.45,1.05,0.95,SSP2_v9_130325,0.00241246550810337,0.914995664951457,0.108500433504854,0.414995664951457,rcp45,TRUE,FALSE,0.75,0.075,rcp45,SSP2_RCP45
-shocks/withShockNoTax,s4,0.960874657414893,0.0194097808551165,1.025,0.85,1.81153483560056,1.15,0.000279015531982238,0.503912534258511,0.182453074797474,0.475,0.998043732870745,0.110368611745326,0.664744194066573,0.475,1.025,0.925,SSP2_v9_130325,0.00180496552244993,0.959612716462545,0.114296975860531,0.642969758605306,rcp45,TRUE,FALSE,0.875,0.0625,rcp45,SSP2_RCP45
-shocks/withShockNoTax,s5,1.14060088096457,0.0221153483560056,0.925,1.05,1.54097808551165,0.95,0.000369925055308764,0.485939911903543,0.204875861938752,0.375,1.00703004404823,0.0637597348849639,0.709836985748058,0.575,0.925,1.025,SSP2_v9_130325,0.00270187700810103,1.14296975860531,0.0959612716462545,0.459612716462545,rcp45,TRUE,FALSE,1.375,0.1125,rcp45,SSP2_RCP45
-shocks/noShockWithTax,s1,1,0.02,1,1,1.6,1,0.00035,0.5,0.2,0.4,1,0.1,0.7,0.5,1,1,SSP2_v9_130325,0.002,1,0.1,0.5,rcp45,FALSE,TRUE,1,0.1,rcp45,SSP2_RCP45
-shocks/noShockWithTax,s2,1.08270938702243,0.0187532681030967,1.05,0.9,1.72467318969033,0.9,0.000392014778383574,0.491729061297757,0.189688362297416,0.45,0.995864530648878,0.12174185522096,0.679221135051611,0.55,0.95,1.05,SSP2_v9_130325,0.00158753449189663,1.08500433504854,0.0914995664951457,0.585004335048543,rcp45,FALSE,TRUE,1.25,0.125,rcp45,SSP2_RCP45
-shocks/noShockWithTax,s3,0.91729061297757,0.0212467318969033,0.95,1.1,1.47532681030967,1.1,0.000307985221616426,0.508270938702243,0.210311637702584,0.35,1.00413546935112,0.0782581447790401,0.720778864948389,0.45,1.05,0.95,SSP2_v9_130325,0.00241246550810337,0.914995664951457,0.108500433504854,0.414995664951457,rcp45,FALSE,TRUE,0.75,0.075,rcp45,SSP2_RCP45
-shocks/noShockWithTax,s4,0.960874657414893,0.0194097808551165,1.025,0.85,1.81153483560056,1.15,0.000279015531982238,0.503912534258511,0.182453074797474,0.475,0.998043732870745,0.110368611745326,0.664744194066573,0.475,1.025,0.925,SSP2_v9_130325,0.00180496552244993,0.959612716462545,0.114296975860531,0.642969758605306,rcp45,FALSE,TRUE,0.875,0.0625,rcp45,SSP2_RCP45
-shocks/noShockWithTax,s5,1.14060088096457,0.0221153483560056,0.925,1.05,1.54097808551165,0.95,0.000369925055308764,0.485939911903543,0.204875861938752,0.375,1.00703004404823,0.0637597348849639,0.709836985748058,0.575,0.925,1.025,SSP2_v9_130325,0.00270187700810103,1.14296975860531,0.0959612716462545,0.459612716462545,rcp45,FALSE,TRUE,1.375,0.1125,rcp45,SSP2_RCP45
-shocks/withShockWithTax,s1,1,0.02,1,1,1.6,1,0.00035,0.5,0.2,0.4,1,0.1,0.7,0.5,1,1,SSP2_v9_130325,0.002,1,0.1,0.5,rcp45,TRUE,TRUE,1,0.1,rcp45,SSP2_RCP45
-shocks/withShockWithTax,s2,1.08270938702243,0.0187532681030967,1.05,0.9,1.72467318969033,0.9,0.000392014778383574,0.491729061297757,0.189688362297416,0.45,0.995864530648878,0.12174185522096,0.679221135051611,0.55,0.95,1.05,SSP2_v9_130325,0.00158753449189663,1.08500433504854,0.0914995664951457,0.585004335048543,rcp45,TRUE,TRUE,1.25,0.125,rcp45,SSP2_RCP45
-shocks/withShockWithTax,s3,0.91729061297757,0.0212467318969033,0.95,1.1,1.47532681030967,1.1,0.000307985221616426,0.508270938702243,0.210311637702584,0.35,1.00413546935112,0.0782581447790401,0.720778864948389,0.45,1.05,0.95,SSP2_v9_130325,0.00241246550810337,0.914995664951457,0.108500433504854,0.414995664951457,rcp45,TRUE,TRUE,0.75,0.075,rcp45,SSP2_RCP45
-shocks/withShockWithTax,s4,0.960874657414893,0.0194097808551165,1.025,0.85,1.81153483560056,1.15,0.000279015531982238,0.503912534258511,0.182453074797474,0.475,0.998043732870745,0.110368611745326,0.664744194066573,0.475,1.025,0.925,SSP2_v9_130325,0.00180496552244993,0.959612716462545,0.114296975860531,0.642969758605306,rcp45,TRUE,TRUE,0.875,0.0625,rcp45,SSP2_RCP45
-shocks/withShockWithTax,s5,1.14060088096457,0.0221153483560056,0.925,1.05,1.54097808551165,0.95,0.000369925055308764,0.485939911903543,0.204875861938752,0.375,1.00703004404823,0.0637597348849639,0.709836985748058,0.575,0.925,1.025,SSP2_v9_130325,0.00270187700810103,1.14296975860531,0.0959612716462545,0.459612716462545,rcp45,TRUE,TRUE,1.375,0.1125,rcp45,SSP2_RCP45
+shocks/noShockNoTax,s1,1,0.02,1,1,1.6,1,0.00035,0.5,0.2,0.4,1,0.1,0.7,0.5,1,1,SSP2_v9_130325,0.002,1,0.1,0.05,rcp45,FALSE,FALSE,1,0.3,rcp45,SSP2_RCP45
+shocks/noShockNoTax,s2,1.08270938702243,0.0187532681030967,1.05,0.9,1.72467318969033,0.9,0.000392014778383574,0.491729061297757,0.189688362297416,0.45,0.995864530648878,0.12174185522096,0.679221135051611,0.55,0.95,1.05,SSP2_v9_130325,0.00158753449189663,1.08500433504854,0.0914995664951457,0.0585004335048543,rcp45,FALSE,FALSE,1.25,0.35,rcp45,SSP2_RCP45
+shocks/noShockNoTax,s3,0.91729061297757,0.0212467318969033,0.95,1.1,1.47532681030967,1.1,0.000307985221616426,0.508270938702243,0.210311637702584,0.35,1.00413546935112,0.0782581447790401,0.720778864948389,0.45,1.05,0.95,SSP2_v9_130325,0.00241246550810337,0.914995664951457,0.108500433504854,0.0414995664951457,rcp45,FALSE,FALSE,0.75,0.25,rcp45,SSP2_RCP45
+shocks/noShockNoTax,s4,0.960874657414893,0.0194097808551165,1.025,0.85,1.81153483560056,1.15,0.000279015531982238,0.503912534258511,0.182453074797474,0.475,0.998043732870745,0.110368611745326,0.664744194066573,0.475,1.025,0.925,SSP2_v9_130325,0.00180496552244993,0.959612716462545,0.114296975860531,0.0642969758605306,rcp45,FALSE,FALSE,0.875,0.225,rcp45,SSP2_RCP45
+shocks/noShockNoTax,s5,1.14060088096457,0.0221153483560056,0.925,1.05,1.54097808551165,0.95,0.000369925055308764,0.485939911903543,0.204875861938752,0.375,1.00703004404823,0.0637597348849639,0.709836985748058,0.575,0.925,1.025,SSP2_v9_130325,0.00270187700810103,1.14296975860531,0.0959612716462545,0.0459612716462545,rcp45,FALSE,FALSE,1.375,0.325,rcp45,SSP2_RCP45
+shocks/withShockNoTax,s1,1,0.02,1,1,1.6,1,0.00035,0.5,0.2,0.4,1,0.1,0.7,0.5,1,1,SSP2_v9_130325,0.002,1,0.1,0.05,rcp45,TRUE,FALSE,1,0.3,rcp45,SSP2_RCP45
+shocks/withShockNoTax,s2,1.08270938702243,0.0187532681030967,1.05,0.9,1.72467318969033,0.9,0.000392014778383574,0.491729061297757,0.189688362297416,0.45,0.995864530648878,0.12174185522096,0.679221135051611,0.55,0.95,1.05,SSP2_v9_130325,0.00158753449189663,1.08500433504854,0.0914995664951457,0.0585004335048543,rcp45,TRUE,FALSE,1.25,0.35,rcp45,SSP2_RCP45
+shocks/withShockNoTax,s3,0.91729061297757,0.0212467318969033,0.95,1.1,1.47532681030967,1.1,0.000307985221616426,0.508270938702243,0.210311637702584,0.35,1.00413546935112,0.0782581447790401,0.720778864948389,0.45,1.05,0.95,SSP2_v9_130325,0.00241246550810337,0.914995664951457,0.108500433504854,0.0414995664951457,rcp45,TRUE,FALSE,0.75,0.25,rcp45,SSP2_RCP45
+shocks/withShockNoTax,s4,0.960874657414893,0.0194097808551165,1.025,0.85,1.81153483560056,1.15,0.000279015531982238,0.503912534258511,0.182453074797474,0.475,0.998043732870745,0.110368611745326,0.664744194066573,0.475,1.025,0.925,SSP2_v9_130325,0.00180496552244993,0.959612716462545,0.114296975860531,0.0642969758605306,rcp45,TRUE,FALSE,0.875,0.225,rcp45,SSP2_RCP45
+shocks/withShockNoTax,s5,1.14060088096457,0.0221153483560056,0.925,1.05,1.54097808551165,0.95,0.000369925055308764,0.485939911903543,0.204875861938752,0.375,1.00703004404823,0.0637597348849639,0.709836985748058,0.575,0.925,1.025,SSP2_v9_130325,0.00270187700810103,1.14296975860531,0.0959612716462545,0.0459612716462545,rcp45,TRUE,FALSE,1.375,0.325,rcp45,SSP2_RCP45
+shocks/noShockWithTax,s1,1,0.02,1,1,1.6,1,0.00035,0.5,0.2,0.4,1,0.1,0.7,0.5,1,1,SSP2_v9_130325,0.002,1,0.1,0.05,rcp45,FALSE,TRUE,1,0.3,rcp45,SSP2_RCP45
+shocks/noShockWithTax,s2,1.08270938702243,0.0187532681030967,1.05,0.9,1.72467318969033,0.9,0.000392014778383574,0.491729061297757,0.189688362297416,0.45,0.995864530648878,0.12174185522096,0.679221135051611,0.55,0.95,1.05,SSP2_v9_130325,0.00158753449189663,1.08500433504854,0.0914995664951457,0.0585004335048543,rcp45,FALSE,TRUE,1.25,0.35,rcp45,SSP2_RCP45
+shocks/noShockWithTax,s3,0.91729061297757,0.0212467318969033,0.95,1.1,1.47532681030967,1.1,0.000307985221616426,0.508270938702243,0.210311637702584,0.35,1.00413546935112,0.0782581447790401,0.720778864948389,0.45,1.05,0.95,SSP2_v9_130325,0.00241246550810337,0.914995664951457,0.108500433504854,0.0414995664951457,rcp45,FALSE,TRUE,0.75,0.25,rcp45,SSP2_RCP45
+shocks/noShockWithTax,s4,0.960874657414893,0.0194097808551165,1.025,0.85,1.81153483560056,1.15,0.000279015531982238,0.503912534258511,0.182453074797474,0.475,0.998043732870745,0.110368611745326,0.664744194066573,0.475,1.025,0.925,SSP2_v9_130325,0.00180496552244993,0.959612716462545,0.114296975860531,0.0642969758605306,rcp45,FALSE,TRUE,0.875,0.225,rcp45,SSP2_RCP45
+shocks/noShockWithTax,s5,1.14060088096457,0.0221153483560056,0.925,1.05,1.54097808551165,0.95,0.000369925055308764,0.485939911903543,0.204875861938752,0.375,1.00703004404823,0.0637597348849639,0.709836985748058,0.575,0.925,1.025,SSP2_v9_130325,0.00270187700810103,1.14296975860531,0.0959612716462545,0.0459612716462545,rcp45,FALSE,TRUE,1.375,0.325,rcp45,SSP2_RCP45
+shocks/withShockWithTax,s1,1,0.02,1,1,1.6,1,0.00035,0.5,0.2,0.4,1,0.1,0.7,0.5,1,1,SSP2_v9_130325,0.002,1,0.1,0.05,rcp45,TRUE,TRUE,1,0.3,rcp45,SSP2_RCP45
+shocks/withShockWithTax,s2,1.08270938702243,0.0187532681030967,1.05,0.9,1.72467318969033,0.9,0.000392014778383574,0.491729061297757,0.189688362297416,0.45,0.995864530648878,0.12174185522096,0.679221135051611,0.55,0.95,1.05,SSP2_v9_130325,0.00158753449189663,1.08500433504854,0.0914995664951457,0.0585004335048543,rcp45,TRUE,TRUE,1.25,0.35,rcp45,SSP2_RCP45
+shocks/withShockWithTax,s3,0.91729061297757,0.0212467318969033,0.95,1.1,1.47532681030967,1.1,0.000307985221616426,0.508270938702243,0.210311637702584,0.35,1.00413546935112,0.0782581447790401,0.720778864948389,0.45,1.05,0.95,SSP2_v9_130325,0.00241246550810337,0.914995664951457,0.108500433504854,0.0414995664951457,rcp45,TRUE,TRUE,0.75,0.25,rcp45,SSP2_RCP45
+shocks/withShockWithTax,s4,0.960874657414893,0.0194097808551165,1.025,0.85,1.81153483560056,1.15,0.000279015531982238,0.503912534258511,0.182453074797474,0.475,0.998043732870745,0.110368611745326,0.664744194066573,0.475,1.025,0.925,SSP2_v9_130325,0.00180496552244993,0.959612716462545,0.114296975860531,0.0642969758605306,rcp45,TRUE,TRUE,0.875,0.225,rcp45,SSP2_RCP45
+shocks/withShockWithTax,s5,1.14060088096457,0.0221153483560056,0.925,1.05,1.54097808551165,0.95,0.000369925055308764,0.485939911903543,0.204875861938752,0.375,1.00703004404823,0.0637597348849639,0.709836985748058,0.575,0.925,1.025,SSP2_v9_130325,0.00270187700810103,1.14296975860531,0.0959612716462545,0.0459612716462545,rcp45,TRUE,TRUE,1.375,0.325,rcp45,SSP2_RCP45
diff --git a/data/sims/globalShockBarriers.csv b/data/sims/globalShockBarriers.csv
index 05dc822d..cd9a68c8 100644
--- a/data/sims/globalShockBarriers.csv
+++ b/data/sims/globalShockBarriers.csv
@@ -1,21 +1,21 @@
Ensemble,Scenario,AGRI_LAND_EXPANSION_COST_FACTOR,ANNUAL_MAX_IMPORT_CHANGE,BIOENERGY_DEMAND_SHIFT,CROP_TO_PASTURE_COST_FACTOR,FERTILISER_COST_PER_T,INITIAL_PRICE_SHIFT,IRRIG_COST_SCALE_FACTOR,IRRIGATION_EFFICIENCY,LAND_CHANGE_COST,MARKET_LAMBA,MEAT_EFFICIENCY,MIN_NATURAL_RATE,OTHER_INTENSITY_COST,PASTURE_HARVEST_FRACTION,SSP_GDP_PC_FACTOR,SSP_POPULATION_FACTOR,SSP_SCENARIO,TECHNOLOGY_CHANGE_ANNUAL_RATE,TRADE_BARRIER_MULTIPLIER,TRANSPORT_COST,TRANSPORT_LOSSES,RCP,SHOCKS_POSSIBLE,APPLY_EXPORT_TAXES,EXPORT_TAX_RATE,EXPORT_TAX_THRESHOLD,YIELD_DIR_TOP,BIOENERGY_DEMAND_SCENARIO
-shocksBarriers/noShockNoTax,s1,1,0.02,1,1,1.6,1,0.00035,0.5,0.2,0.4,1,0.1,0.7,0.5,1,1,SSP2_v9_130325,0.002,2,0.2,1,rcp45,FALSE,FALSE,1,0.1,rcp45,SSP2_RCP45
-shocksBarriers/noShockNoTax,s2,1.08270938702243,0.0187532681030967,1.05,0.9,1.72467318969033,0.9,0.000392014778383574,0.491729061297757,0.189688362297416,0.45,0.995864530648878,0.12174185522096,0.679221135051611,0.55,0.95,1.05,SSP2_v9_130325,0.00158753449189663,2.17000867009709,0.182999132990291,1.17000867009709,rcp45,FALSE,FALSE,1.25,0.125,rcp45,SSP2_RCP45
-shocksBarriers/noShockNoTax,s3,0.91729061297757,0.0212467318969033,0.95,1.1,1.47532681030967,1.1,0.000307985221616426,0.508270938702243,0.210311637702584,0.35,1.00413546935112,0.0782581447790401,0.720778864948389,0.45,1.05,0.95,SSP2_v9_130325,0.00241246550810337,1.82999132990291,0.217000867009709,0.829991329902914,rcp45,FALSE,FALSE,0.75,0.075,rcp45,SSP2_RCP45
-shocksBarriers/noShockNoTax,s4,0.960874657414893,0.0194097808551165,1.025,0.85,1.81153483560056,1.15,0.000279015531982238,0.503912534258511,0.182453074797474,0.475,0.998043732870745,0.110368611745326,0.664744194066573,0.475,1.025,0.925,SSP2_v9_130325,0.00180496552244993,1.91922543292509,0.228593951721061,1.28593951721061,rcp45,FALSE,FALSE,0.875,0.0625,rcp45,SSP2_RCP45
-shocksBarriers/noShockNoTax,s5,1.14060088096457,0.0221153483560056,0.925,1.05,1.54097808551165,0.95,0.000369925055308764,0.485939911903543,0.204875861938752,0.375,1.00703004404823,0.0637597348849639,0.709836985748058,0.575,0.925,1.025,SSP2_v9_130325,0.00270187700810103,2.28593951721061,0.191922543292509,0.91922543292509,rcp45,FALSE,FALSE,1.375,0.1125,rcp45,SSP2_RCP45
-shocksBarriers/withShockNoTax,s1,1,0.02,1,1,1.6,1,0.00035,0.5,0.2,0.4,1,0.1,0.7,0.5,1,1,SSP2_v9_130325,0.002,2,0.2,1,rcp45,TRUE,FALSE,1,0.1,rcp45,SSP2_RCP45
-shocksBarriers/withShockNoTax,s2,1.08270938702243,0.0187532681030967,1.05,0.9,1.72467318969033,0.9,0.000392014778383574,0.491729061297757,0.189688362297416,0.45,0.995864530648878,0.12174185522096,0.679221135051611,0.55,0.95,1.05,SSP2_v9_130325,0.00158753449189663,2.17000867009709,0.182999132990291,1.17000867009709,rcp45,TRUE,FALSE,1.25,0.125,rcp45,SSP2_RCP45
-shocksBarriers/withShockNoTax,s3,0.91729061297757,0.0212467318969033,0.95,1.1,1.47532681030967,1.1,0.000307985221616426,0.508270938702243,0.210311637702584,0.35,1.00413546935112,0.0782581447790401,0.720778864948389,0.45,1.05,0.95,SSP2_v9_130325,0.00241246550810337,1.82999132990291,0.217000867009709,0.829991329902914,rcp45,TRUE,FALSE,0.75,0.075,rcp45,SSP2_RCP45
-shocksBarriers/withShockNoTax,s4,0.960874657414893,0.0194097808551165,1.025,0.85,1.81153483560056,1.15,0.000279015531982238,0.503912534258511,0.182453074797474,0.475,0.998043732870745,0.110368611745326,0.664744194066573,0.475,1.025,0.925,SSP2_v9_130325,0.00180496552244993,1.91922543292509,0.228593951721061,1.28593951721061,rcp45,TRUE,FALSE,0.875,0.0625,rcp45,SSP2_RCP45
-shocksBarriers/withShockNoTax,s5,1.14060088096457,0.0221153483560056,0.925,1.05,1.54097808551165,0.95,0.000369925055308764,0.485939911903543,0.204875861938752,0.375,1.00703004404823,0.0637597348849639,0.709836985748058,0.575,0.925,1.025,SSP2_v9_130325,0.00270187700810103,2.28593951721061,0.191922543292509,0.91922543292509,rcp45,TRUE,FALSE,1.375,0.1125,rcp45,SSP2_RCP45
-shocksBarriers/noShockWithTax,s1,1,0.02,1,1,1.6,1,0.00035,0.5,0.2,0.4,1,0.1,0.7,0.5,1,1,SSP2_v9_130325,0.002,2,0.2,1,rcp45,FALSE,TRUE,1,0.1,rcp45,SSP2_RCP45
-shocksBarriers/noShockWithTax,s2,1.08270938702243,0.0187532681030967,1.05,0.9,1.72467318969033,0.9,0.000392014778383574,0.491729061297757,0.189688362297416,0.45,0.995864530648878,0.12174185522096,0.679221135051611,0.55,0.95,1.05,SSP2_v9_130325,0.00158753449189663,2.17000867009709,0.182999132990291,1.17000867009709,rcp45,FALSE,TRUE,1.25,0.125,rcp45,SSP2_RCP45
-shocksBarriers/noShockWithTax,s3,0.91729061297757,0.0212467318969033,0.95,1.1,1.47532681030967,1.1,0.000307985221616426,0.508270938702243,0.210311637702584,0.35,1.00413546935112,0.0782581447790401,0.720778864948389,0.45,1.05,0.95,SSP2_v9_130325,0.00241246550810337,1.82999132990291,0.217000867009709,0.829991329902914,rcp45,FALSE,TRUE,0.75,0.075,rcp45,SSP2_RCP45
-shocksBarriers/noShockWithTax,s4,0.960874657414893,0.0194097808551165,1.025,0.85,1.81153483560056,1.15,0.000279015531982238,0.503912534258511,0.182453074797474,0.475,0.998043732870745,0.110368611745326,0.664744194066573,0.475,1.025,0.925,SSP2_v9_130325,0.00180496552244993,1.91922543292509,0.228593951721061,1.28593951721061,rcp45,FALSE,TRUE,0.875,0.0625,rcp45,SSP2_RCP45
-shocksBarriers/noShockWithTax,s5,1.14060088096457,0.0221153483560056,0.925,1.05,1.54097808551165,0.95,0.000369925055308764,0.485939911903543,0.204875861938752,0.375,1.00703004404823,0.0637597348849639,0.709836985748058,0.575,0.925,1.025,SSP2_v9_130325,0.00270187700810103,2.28593951721061,0.191922543292509,0.91922543292509,rcp45,FALSE,TRUE,1.375,0.1125,rcp45,SSP2_RCP45
-shocksBarriers/withShockWithTax,s1,1,0.02,1,1,1.6,1,0.00035,0.5,0.2,0.4,1,0.1,0.7,0.5,1,1,SSP2_v9_130325,0.002,2,0.2,1,rcp45,TRUE,TRUE,1,0.1,rcp45,SSP2_RCP45
-shocksBarriers/withShockWithTax,s2,1.08270938702243,0.0187532681030967,1.05,0.9,1.72467318969033,0.9,0.000392014778383574,0.491729061297757,0.189688362297416,0.45,0.995864530648878,0.12174185522096,0.679221135051611,0.55,0.95,1.05,SSP2_v9_130325,0.00158753449189663,2.17000867009709,0.182999132990291,1.17000867009709,rcp45,TRUE,TRUE,1.25,0.125,rcp45,SSP2_RCP45
-shocksBarriers/withShockWithTax,s3,0.91729061297757,0.0212467318969033,0.95,1.1,1.47532681030967,1.1,0.000307985221616426,0.508270938702243,0.210311637702584,0.35,1.00413546935112,0.0782581447790401,0.720778864948389,0.45,1.05,0.95,SSP2_v9_130325,0.00241246550810337,1.82999132990291,0.217000867009709,0.829991329902914,rcp45,TRUE,TRUE,0.75,0.075,rcp45,SSP2_RCP45
-shocksBarriers/withShockWithTax,s4,0.960874657414893,0.0194097808551165,1.025,0.85,1.81153483560056,1.15,0.000279015531982238,0.503912534258511,0.182453074797474,0.475,0.998043732870745,0.110368611745326,0.664744194066573,0.475,1.025,0.925,SSP2_v9_130325,0.00180496552244993,1.91922543292509,0.228593951721061,1.28593951721061,rcp45,TRUE,TRUE,0.875,0.0625,rcp45,SSP2_RCP45
-shocksBarriers/withShockWithTax,s5,1.14060088096457,0.0221153483560056,0.925,1.05,1.54097808551165,0.95,0.000369925055308764,0.485939911903543,0.204875861938752,0.375,1.00703004404823,0.0637597348849639,0.709836985748058,0.575,0.925,1.025,SSP2_v9_130325,0.00270187700810103,2.28593951721061,0.191922543292509,0.91922543292509,rcp45,TRUE,TRUE,1.375,0.1125,rcp45,SSP2_RCP45
+shocksBarriers/noShockNoTax,s1,1,0.02,1,1,1.6,1,0.00035,0.5,0.2,0.4,1,0.1,0.7,0.5,1,1,SSP2_v9_130325,0.002,2,0.2,0.1,rcp45,FALSE,FALSE,1,0.3,rcp45,SSP2_RCP45
+shocksBarriers/noShockNoTax,s2,1.08270938702243,0.0187532681030967,1.05,0.9,1.72467318969033,0.9,0.000392014778383574,0.491729061297757,0.189688362297416,0.45,0.995864530648878,0.12174185522096,0.679221135051611,0.55,0.95,1.05,SSP2_v9_130325,0.00158753449189663,2.17000867009709,0.182999132990291,0.12174185522096,rcp45,FALSE,FALSE,1.25,0.35,rcp45,SSP2_RCP45
+shocksBarriers/noShockNoTax,s3,0.91729061297757,0.0212467318969033,0.95,1.1,1.47532681030967,1.1,0.000307985221616426,0.508270938702243,0.210311637702584,0.35,1.00413546935112,0.0782581447790401,0.720778864948389,0.45,1.05,0.95,SSP2_v9_130325,0.00241246550810337,1.82999132990291,0.217000867009709,0.0782581447790401,rcp45,FALSE,FALSE,0.75,0.25,rcp45,SSP2_RCP45
+shocksBarriers/noShockNoTax,s4,0.960874657414893,0.0194097808551165,1.025,0.85,1.81153483560056,1.15,0.000279015531982238,0.503912534258511,0.182453074797474,0.475,0.998043732870745,0.110368611745326,0.664744194066573,0.475,1.025,0.925,SSP2_v9_130325,0.00180496552244993,1.91922543292509,0.228593951721061,0.136240265115036,rcp45,FALSE,FALSE,0.875,0.225,rcp45,SSP2_RCP45
+shocksBarriers/noShockNoTax,s5,1.14060088096457,0.0221153483560056,0.925,1.05,1.54097808551165,0.95,0.000369925055308764,0.485939911903543,0.204875861938752,0.375,1.00703004404823,0.0637597348849639,0.709836985748058,0.575,0.925,1.025,SSP2_v9_130325,0.00270187700810103,2.28593951721061,0.191922543292509,0.0896313882546741,rcp45,FALSE,FALSE,1.375,0.325,rcp45,SSP2_RCP45
+shocksBarriers/withShockNoTax,s1,1,0.02,1,1,1.6,1,0.00035,0.5,0.2,0.4,1,0.1,0.7,0.5,1,1,SSP2_v9_130325,0.002,2,0.2,0.1,rcp45,TRUE,FALSE,1,0.3,rcp45,SSP2_RCP45
+shocksBarriers/withShockNoTax,s2,1.08270938702243,0.0187532681030967,1.05,0.9,1.72467318969033,0.9,0.000392014778383574,0.491729061297757,0.189688362297416,0.45,0.995864530648878,0.12174185522096,0.679221135051611,0.55,0.95,1.05,SSP2_v9_130325,0.00158753449189663,2.17000867009709,0.182999132990291,0.12174185522096,rcp45,TRUE,FALSE,1.25,0.35,rcp45,SSP2_RCP45
+shocksBarriers/withShockNoTax,s3,0.91729061297757,0.0212467318969033,0.95,1.1,1.47532681030967,1.1,0.000307985221616426,0.508270938702243,0.210311637702584,0.35,1.00413546935112,0.0782581447790401,0.720778864948389,0.45,1.05,0.95,SSP2_v9_130325,0.00241246550810337,1.82999132990291,0.217000867009709,0.0782581447790401,rcp45,TRUE,FALSE,0.75,0.25,rcp45,SSP2_RCP45
+shocksBarriers/withShockNoTax,s4,0.960874657414893,0.0194097808551165,1.025,0.85,1.81153483560056,1.15,0.000279015531982238,0.503912534258511,0.182453074797474,0.475,0.998043732870745,0.110368611745326,0.664744194066573,0.475,1.025,0.925,SSP2_v9_130325,0.00180496552244993,1.91922543292509,0.228593951721061,0.136240265115036,rcp45,TRUE,FALSE,0.875,0.225,rcp45,SSP2_RCP45
+shocksBarriers/withShockNoTax,s5,1.14060088096457,0.0221153483560056,0.925,1.05,1.54097808551165,0.95,0.000369925055308764,0.485939911903543,0.204875861938752,0.375,1.00703004404823,0.0637597348849639,0.709836985748058,0.575,0.925,1.025,SSP2_v9_130325,0.00270187700810103,2.28593951721061,0.191922543292509,0.0896313882546741,rcp45,TRUE,FALSE,1.375,0.325,rcp45,SSP2_RCP45
+shocksBarriers/noShockWithTax,s1,1,0.02,1,1,1.6,1,0.00035,0.5,0.2,0.4,1,0.1,0.7,0.5,1,1,SSP2_v9_130325,0.002,2,0.2,0.1,rcp45,FALSE,TRUE,1,0.3,rcp45,SSP2_RCP45
+shocksBarriers/noShockWithTax,s2,1.08270938702243,0.0187532681030967,1.05,0.9,1.72467318969033,0.9,0.000392014778383574,0.491729061297757,0.189688362297416,0.45,0.995864530648878,0.12174185522096,0.679221135051611,0.55,0.95,1.05,SSP2_v9_130325,0.00158753449189663,2.17000867009709,0.182999132990291,0.12174185522096,rcp45,FALSE,TRUE,1.25,0.35,rcp45,SSP2_RCP45
+shocksBarriers/noShockWithTax,s3,0.91729061297757,0.0212467318969033,0.95,1.1,1.47532681030967,1.1,0.000307985221616426,0.508270938702243,0.210311637702584,0.35,1.00413546935112,0.0782581447790401,0.720778864948389,0.45,1.05,0.95,SSP2_v9_130325,0.00241246550810337,1.82999132990291,0.217000867009709,0.0782581447790401,rcp45,FALSE,TRUE,0.75,0.25,rcp45,SSP2_RCP45
+shocksBarriers/noShockWithTax,s4,0.960874657414893,0.0194097808551165,1.025,0.85,1.81153483560056,1.15,0.000279015531982238,0.503912534258511,0.182453074797474,0.475,0.998043732870745,0.110368611745326,0.664744194066573,0.475,1.025,0.925,SSP2_v9_130325,0.00180496552244993,1.91922543292509,0.228593951721061,0.136240265115036,rcp45,FALSE,TRUE,0.875,0.225,rcp45,SSP2_RCP45
+shocksBarriers/noShockWithTax,s5,1.14060088096457,0.0221153483560056,0.925,1.05,1.54097808551165,0.95,0.000369925055308764,0.485939911903543,0.204875861938752,0.375,1.00703004404823,0.0637597348849639,0.709836985748058,0.575,0.925,1.025,SSP2_v9_130325,0.00270187700810103,2.28593951721061,0.191922543292509,0.0896313882546741,rcp45,FALSE,TRUE,1.375,0.325,rcp45,SSP2_RCP45
+shocksBarriers/withShockWithTax,s1,1,0.02,1,1,1.6,1,0.00035,0.5,0.2,0.4,1,0.1,0.7,0.5,1,1,SSP2_v9_130325,0.002,2,0.2,0.1,rcp45,TRUE,TRUE,1,0.3,rcp45,SSP2_RCP45
+shocksBarriers/withShockWithTax,s2,1.08270938702243,0.0187532681030967,1.05,0.9,1.72467318969033,0.9,0.000392014778383574,0.491729061297757,0.189688362297416,0.45,0.995864530648878,0.12174185522096,0.679221135051611,0.55,0.95,1.05,SSP2_v9_130325,0.00158753449189663,2.17000867009709,0.182999132990291,0.12174185522096,rcp45,TRUE,TRUE,1.25,0.35,rcp45,SSP2_RCP45
+shocksBarriers/withShockWithTax,s3,0.91729061297757,0.0212467318969033,0.95,1.1,1.47532681030967,1.1,0.000307985221616426,0.508270938702243,0.210311637702584,0.35,1.00413546935112,0.0782581447790401,0.720778864948389,0.45,1.05,0.95,SSP2_v9_130325,0.00241246550810337,1.82999132990291,0.217000867009709,0.0782581447790401,rcp45,TRUE,TRUE,0.75,0.25,rcp45,SSP2_RCP45
+shocksBarriers/withShockWithTax,s4,0.960874657414893,0.0194097808551165,1.025,0.85,1.81153483560056,1.15,0.000279015531982238,0.503912534258511,0.182453074797474,0.475,0.998043732870745,0.110368611745326,0.664744194066573,0.475,1.025,0.925,SSP2_v9_130325,0.00180496552244993,1.91922543292509,0.228593951721061,0.136240265115036,rcp45,TRUE,TRUE,0.875,0.225,rcp45,SSP2_RCP45
+shocksBarriers/withShockWithTax,s5,1.14060088096457,0.0221153483560056,0.925,1.05,1.54097808551165,0.95,0.000369925055308764,0.485939911903543,0.204875861938752,0.375,1.00703004404823,0.0637597348849639,0.709836985748058,0.575,0.925,1.025,SSP2_v9_130325,0.00270187700810103,2.28593951721061,0.191922543292509,0.0896313882546741,rcp45,TRUE,TRUE,1.375,0.325,rcp45,SSP2_RCP45
diff --git a/data/sims/globalShock_params.csv b/data/sims/globalShock_params.csv
index 4ce316e7..7691f62c 100644
--- a/data/sims/globalShock_params.csv
+++ b/data/sims/globalShock_params.csv
@@ -19,14 +19,14 @@ noShockNoTax,SSP_SCENARIO,value,,,,,,SSP2_v9_130325
noShockNoTax,TECHNOLOGY_CHANGE_ANNUAL_RATE,beta,-0.004,0.008,0.001,0.002,0.003,
noShockNoTax,TRADE_BARRIER_MULTIPLIER,beta,0.5,1.5,0.8,1,1.2,
noShockNoTax,TRANSPORT_COST,beta,0.05,0.15,0.08,0.1,0.12,
-noShockNoTax,TRANSPORT_LOSSES,beta,0,1,0.3,0.5,0.7,
+noShockNoTax,TRANSPORT_LOSSES,beta,0,0.1,0.03,0.05,0.07,
noShockNoTax,RCP,value,,,,,,rcp45
noShockNoTax,BIOENERGY_DEMAND_SCENARIO,value,,,,,,ssp2
noShockNoTax,YIELD_DIR_TOP,value,,,,,,ssp2
noShockNoTax,SHOCKS_POSSIBLE,value,,,,,,FALSE
noShockNoTax,APPLY_EXPORT_TAXES,value,,,,,,FALSE
noShockNoTax,EXPORT_TAX_RATE,unif,0.5,1.5,,,,
-noShockNoTax,EXPORT_TAX_THRESHOLD,unif,0.05,0.15,,,,
+noShockNoTax,EXPORT_TAX_THRESHOLD,unif,0.2,0.4,,,,
withShockNoTax,AGRI_LAND_EXPANSION_COST_FACTOR,beta,0,2,0.8,1,1.2,
withShockNoTax,ANNUAL_MAX_IMPORT_CHANGE,beta,0.008,0.032,0.017,0.02,0.023,
withShockNoTax,BIOENERGY_DEMAND_SHIFT,unif,0.9,1.1,,,,
@@ -47,14 +47,14 @@ withShockNoTax,SSP_SCENARIO,value,,,,,,SSP2_v9_130325
withShockNoTax,TECHNOLOGY_CHANGE_ANNUAL_RATE,beta,-0.004,0.008,0.001,0.002,0.003,
withShockNoTax,TRADE_BARRIER_MULTIPLIER,beta,0.5,1.5,0.8,1,1.2,
withShockNoTax,TRANSPORT_COST,beta,0.05,0.15,0.08,0.1,0.12,
-withShockNoTax,TRANSPORT_LOSSES,beta,0,1,0.3,0.5,0.7,
+withShockNoTax,TRANSPORT_LOSSES,beta,0,0.1,0.03,0.05,0.07,
withShockNoTax,RCP,value,,,,,,rcp45
withShockNoTax,BIOENERGY_DEMAND_SCENARIO,value,,,,,,ssp2
withShockNoTax,YIELD_DIR_TOP,value,,,,,,ssp2
withShockNoTax,SHOCKS_POSSIBLE,value,,,,,,TRUE
withShockNoTax,APPLY_EXPORT_TAXES,value,,,,,,FALSE
withShockNoTax,EXPORT_TAX_RATE,unif,0.5,1.5,,,,
-withShockNoTax,EXPORT_TAX_THRESHOLD,unif,0.05,0.15,,,,
+withShockNoTax,EXPORT_TAX_THRESHOLD,unif,0.2,0.4,,,,
noShockWithTax,AGRI_LAND_EXPANSION_COST_FACTOR,beta,0,2,0.8,1,1.2,
noShockWithTax,ANNUAL_MAX_IMPORT_CHANGE,beta,0.008,0.032,0.017,0.02,0.023,
noShockWithTax,BIOENERGY_DEMAND_SHIFT,unif,0.9,1.1,,,,
@@ -75,14 +75,14 @@ noShockWithTax,SSP_SCENARIO,value,,,,,,SSP2_v9_130325
noShockWithTax,TECHNOLOGY_CHANGE_ANNUAL_RATE,beta,-0.004,0.008,0.001,0.002,0.003,
noShockWithTax,TRADE_BARRIER_MULTIPLIER,beta,0.5,1.5,0.8,1,1.2,
noShockWithTax,TRANSPORT_COST,beta,0.05,0.15,0.08,0.1,0.12,
-noShockWithTax,TRANSPORT_LOSSES,beta,0,1,0.3,0.5,0.7,
+noShockWithTax,TRANSPORT_LOSSES,beta,0,0.1,0.03,0.05,0.07,
noShockWithTax,RCP,value,,,,,,rcp45
noShockWithTax,BIOENERGY_DEMAND_SCENARIO,value,,,,,,ssp2
noShockWithTax,YIELD_DIR_TOP,value,,,,,,ssp2
noShockWithTax,SHOCKS_POSSIBLE,value,,,,,,FALSE
noShockWithTax,APPLY_EXPORT_TAXES,value,,,,,,TRUE
noShockWithTax,EXPORT_TAX_RATE,unif,0.5,1.5,,,,
-noShockWithTax,EXPORT_TAX_THRESHOLD,unif,0.05,0.15,,,,
+noShockWithTax,EXPORT_TAX_THRESHOLD,unif,0.2,0.4,,,,
withShockWithTax,AGRI_LAND_EXPANSION_COST_FACTOR,beta,0,2,0.8,1,1.2,
withShockWithTax,ANNUAL_MAX_IMPORT_CHANGE,beta,0.008,0.032,0.017,0.02,0.023,
withShockWithTax,BIOENERGY_DEMAND_SHIFT,unif,0.9,1.1,,,,
@@ -103,11 +103,11 @@ withShockWithTax,SSP_SCENARIO,value,,,,,,SSP2_v9_130325
withShockWithTax,TECHNOLOGY_CHANGE_ANNUAL_RATE,beta,-0.004,0.008,0.001,0.002,0.003,
withShockWithTax,TRADE_BARRIER_MULTIPLIER,beta,0.5,1.5,0.8,1,1.2,
withShockWithTax,TRANSPORT_COST,beta,0.05,0.15,0.08,0.1,0.12,
-withShockWithTax,TRANSPORT_LOSSES,beta,0,1,0.3,0.5,0.7,
+withShockWithTax,TRANSPORT_LOSSES,beta,0,0.1,0.03,0.05,0.07,
withShockWithTax,RCP,value,,,,,,rcp45
withShockWithTax,BIOENERGY_DEMAND_SCENARIO,value,,,,,,ssp2
withShockWithTax,YIELD_DIR_TOP,value,,,,,,ssp2
withShockWithTax,SHOCKS_POSSIBLE,value,,,,,,TRUE
withShockWithTax,APPLY_EXPORT_TAXES,value,,,,,,TRUE
withShockWithTax,EXPORT_TAX_RATE,unif,0.5,1.5,,,,
-withShockWithTax,EXPORT_TAX_THRESHOLD,unif,0.05,0.15,,,,
\ No newline at end of file
+withShockWithTax,EXPORT_TAX_THRESHOLD,unif,0.2,0.4,,,,
\ No newline at end of file
diff --git a/data/sims/globalShock_paramsBarriers.csv b/data/sims/globalShock_paramsBarriers.csv
index df6d4c07..77c779f5 100644
--- a/data/sims/globalShock_paramsBarriers.csv
+++ b/data/sims/globalShock_paramsBarriers.csv
@@ -19,14 +19,14 @@ noShockNoTax,SSP_SCENARIO,value,,,,,,SSP2_v9_130325
noShockNoTax,TECHNOLOGY_CHANGE_ANNUAL_RATE,beta,-0.004,0.008,0.001,0.002,0.003,
noShockNoTax,TRADE_BARRIER_MULTIPLIER,beta,1,3,1.6,2,2.4,
noShockNoTax,TRANSPORT_COST,beta,0.1,0.3,0.16,0.2,0.24,
-noShockNoTax,TRANSPORT_LOSSES,beta,0,2,0.6,1,1.4,
+noShockNoTax,TRANSPORT_LOSSES,beta,0,0.2,0.05,0.1,0.15,
noShockNoTax,RCP,value,,,,,,rcp45
noShockNoTax,BIOENERGY_DEMAND_SCENARIO,value,,,,,,ssp2
noShockNoTax,YIELD_DIR_TOP,value,,,,,,ssp2
noShockNoTax,SHOCKS_POSSIBLE,value,,,,,,FALSE
noShockNoTax,APPLY_EXPORT_TAXES,value,,,,,,FALSE
noShockNoTax,EXPORT_TAX_RATE,unif,0.5,1.5,,,,
-noShockNoTax,EXPORT_TAX_THRESHOLD,unif,0.05,0.15,,,,
+noShockNoTax,EXPORT_TAX_THRESHOLD,unif,0.2,0.4,,,,
withShockNoTax,AGRI_LAND_EXPANSION_COST_FACTOR,beta,0,2,0.8,1,1.2,
withShockNoTax,ANNUAL_MAX_IMPORT_CHANGE,beta,0.008,0.032,0.017,0.02,0.023,
withShockNoTax,BIOENERGY_DEMAND_SHIFT,unif,0.9,1.1,,,,
@@ -47,14 +47,14 @@ withShockNoTax,SSP_SCENARIO,value,,,,,,SSP2_v9_130325
withShockNoTax,TECHNOLOGY_CHANGE_ANNUAL_RATE,beta,-0.004,0.008,0.001,0.002,0.003,
withShockNoTax,TRADE_BARRIER_MULTIPLIER,beta,1,3,1.6,2,2.4,
withShockNoTax,TRANSPORT_COST,beta,0.1,0.3,0.16,0.2,0.24,
-withShockNoTax,TRANSPORT_LOSSES,beta,0,2,0.6,1,1.4,
+withShockNoTax,TRANSPORT_LOSSES,beta,0,0.2,0.05,0.1,0.15,
withShockNoTax,RCP,value,,,,,,rcp45
withShockNoTax,BIOENERGY_DEMAND_SCENARIO,value,,,,,,ssp2
withShockNoTax,YIELD_DIR_TOP,value,,,,,,ssp2
withShockNoTax,SHOCKS_POSSIBLE,value,,,,,,TRUE
withShockNoTax,APPLY_EXPORT_TAXES,value,,,,,,FALSE
withShockNoTax,EXPORT_TAX_RATE,unif,0.5,1.5,,,,
-withShockNoTax,EXPORT_TAX_THRESHOLD,unif,0.05,0.15,,,,
+withShockNoTax,EXPORT_TAX_THRESHOLD,unif,0.2,0.4,,,,
noShockWithTax,AGRI_LAND_EXPANSION_COST_FACTOR,beta,0,2,0.8,1,1.2,
noShockWithTax,ANNUAL_MAX_IMPORT_CHANGE,beta,0.008,0.032,0.017,0.02,0.023,
noShockWithTax,BIOENERGY_DEMAND_SHIFT,unif,0.9,1.1,,,,
@@ -75,14 +75,14 @@ noShockWithTax,SSP_SCENARIO,value,,,,,,SSP2_v9_130325
noShockWithTax,TECHNOLOGY_CHANGE_ANNUAL_RATE,beta,-0.004,0.008,0.001,0.002,0.003,
noShockWithTax,TRADE_BARRIER_MULTIPLIER,beta,1,3,1.6,2,2.4,
noShockWithTax,TRANSPORT_COST,beta,0.1,0.3,0.16,0.2,0.24,
-noShockWithTax,TRANSPORT_LOSSES,beta,0,2,0.6,1,1.4,
+noShockWithTax,TRANSPORT_LOSSES,beta,0,0.2,0.05,0.1,0.15,
noShockWithTax,RCP,value,,,,,,rcp45
noShockWithTax,BIOENERGY_DEMAND_SCENARIO,value,,,,,,ssp2
noShockWithTax,YIELD_DIR_TOP,value,,,,,,ssp2
noShockWithTax,SHOCKS_POSSIBLE,value,,,,,,FALSE
noShockWithTax,APPLY_EXPORT_TAXES,value,,,,,,TRUE
noShockWithTax,EXPORT_TAX_RATE,unif,0.5,1.5,,,,
-noShockWithTax,EXPORT_TAX_THRESHOLD,unif,0.05,0.15,,,,
+noShockWithTax,EXPORT_TAX_THRESHOLD,unif,0.2,0.4,,,,
withShockWithTax,AGRI_LAND_EXPANSION_COST_FACTOR,beta,0,2,0.8,1,1.2,
withShockWithTax,ANNUAL_MAX_IMPORT_CHANGE,beta,0.008,0.032,0.017,0.02,0.023,
withShockWithTax,BIOENERGY_DEMAND_SHIFT,unif,0.9,1.1,,,,
@@ -103,11 +103,11 @@ withShockWithTax,SSP_SCENARIO,value,,,,,,SSP2_v9_130325
withShockWithTax,TECHNOLOGY_CHANGE_ANNUAL_RATE,beta,-0.004,0.008,0.001,0.002,0.003,
withShockWithTax,TRADE_BARRIER_MULTIPLIER,beta,1,3,1.6,2,2.4,
withShockWithTax,TRANSPORT_COST,beta,0.1,0.3,0.16,0.2,0.24,
-withShockWithTax,TRANSPORT_LOSSES,beta,0,2,0.6,1,1.4,
+withShockWithTax,TRANSPORT_LOSSES,beta,0,0.2,0.05,0.1,0.15,
withShockWithTax,RCP,value,,,,,,rcp45
withShockWithTax,BIOENERGY_DEMAND_SCENARIO,value,,,,,,ssp2
withShockWithTax,YIELD_DIR_TOP,value,,,,,,ssp2
withShockWithTax,SHOCKS_POSSIBLE,value,,,,,,TRUE
withShockWithTax,APPLY_EXPORT_TAXES,value,,,,,,TRUE
withShockWithTax,EXPORT_TAX_RATE,unif,0.5,1.5,,,,
-withShockWithTax,EXPORT_TAX_THRESHOLD,unif,0.05,0.15,,,,
\ No newline at end of file
+withShockWithTax,EXPORT_TAX_THRESHOLD,unif,0.2,0.4,,,,
\ No newline at end of file
diff --git a/src/ac/ed/lurg/ModelMain.java b/src/ac/ed/lurg/ModelMain.java
index 47951cdc..abf26f65 100644
--- a/src/ac/ed/lurg/ModelMain.java
+++ b/src/ac/ed/lurg/ModelMain.java
@@ -357,17 +357,18 @@ public class ModelMain {
private void writeCountryDemandFile(Timestep timestep){
try {
- StringBuffer sbHeadings = new StringBuffer("Year, Country, Commodity, Demand, BioenergyDemand");
+ StringBuffer sbHeadings = new StringBuffer("Year, Country, Commodity, Demand, BioenergyDemand, ConsumerPrice");
BufferedWriter outputFile = FileWriterHelper.getFileWriter(timestep, ModelConfig.COUNTRY_DEMAND_FILE, sbHeadings.toString());
for (AbstractCountryAgent country : countryAgents.getAll()) {
for (CommodityType commodity : CommodityType.getAllFoodItems()) {
double bioenergyDemand = demandManager.getFirstGenBioenergyDemand(country.getCountry(), timestep.getYear(), commodity);
double demand = country.getCurrentProjectedDemand().get(commodity);
+ double consumerPrice = country.getCurrentConsumerPrice(commodity);
StringBuffer sbData = new StringBuffer();
sbData.append(String.format("%d,%s,%s", timestep.getYear(), country.getCountry(), commodity.getGamsName()));
- sbData.append(String.format(",%.3f,%.3f", demand, bioenergyDemand));
+ sbData.append(String.format(",%.4f,%.4f,%.4f", demand, bioenergyDemand, consumerPrice));
outputFile.write(sbData.toString());
outputFile.newLine();
diff --git a/src/ac/ed/lurg/country/AbstractCountryAgent.java b/src/ac/ed/lurg/country/AbstractCountryAgent.java
index 20b55b74..3768bf7e 100644
--- a/src/ac/ed/lurg/country/AbstractCountryAgent.java
+++ b/src/ac/ed/lurg/country/AbstractCountryAgent.java
@@ -20,6 +20,7 @@ public abstract class AbstractCountryAgent {
private Map<CropType, GlobalPrice> currentWorldPrices;
protected Map<CropType, CountryPrice> currentCountryPrices;
private Map<CropType, CountryPrice> previousCountryPrices;
+ private Map<CommodityType, Double> currentConsumerCommodityPrices;
protected Timestep currentTimestep;
protected Map<CommodityType, Map<CropType, Double>> currentDemandFract;
protected double currentGen2EcDemand;
@@ -94,18 +95,27 @@ public abstract class AbstractCountryAgent {
if (!ModelConfig.PRICE_ELASTIC_DEMAND)
return null;
- Map<CommodityType, Double> prices = new HashMap<CommodityType, Double>();
+ currentConsumerCommodityPrices = new HashMap<CommodityType, Double>();
for (CommodityType commodity : CommodityType.getAllFoodItems()) {
- double commPricePlum = getCommPriceFromCropPrice(commodity);
- prices.put(commodity, commPricePlum);
+ double commPricePlum = 0;
+ Map<CropType, Double> demandFract = currentDemandFract.get(commodity);
+
+ for (CropType crop : commodity.getCropTypes()) {
+ double consumerCropPrice = currentCountryPrices.get(crop).getConsumerPrice();
+ commPricePlum += consumerCropPrice * demandFract.get(crop); // weight price by base demand of each cereal crop
+ }
+
+ currentConsumerCommodityPrices.put(commodity, commPricePlum);
LogWriter.println("Producer price for " + commodity.getGamsName() + " is " + commPricePlum);
}
- return prices;
+ return currentConsumerCommodityPrices;
}
- protected abstract double getCommPriceFromCropPrice(CommodityType commodity);
+ public double getCurrentConsumerPrice(CommodityType commodity) {
+ return currentConsumerCommodityPrices.get(commodity);
+ }
public Map<CommodityType, Double> getCurrentProjectedDemand() {
return currentProjectedDemand;
diff --git a/src/ac/ed/lurg/country/CountryAgent.java b/src/ac/ed/lurg/country/CountryAgent.java
index ab668e46..714f0b20 100644
--- a/src/ac/ed/lurg/country/CountryAgent.java
+++ b/src/ac/ed/lurg/country/CountryAgent.java
@@ -203,20 +203,7 @@ public class CountryAgent extends AbstractCountryAgent {
return input;
}
-
- @Override
- protected double getCommPriceFromCropPrice(CommodityType commodity) {
- double commPricePlum = 0;
- Map<CropType, Double> demandFract = currentDemandFract.get(commodity);
-
- for (CropType crop : commodity.getCropTypes()) {
- double consumerCropPrice = currentCountryPrices.get(crop).getConsumerPrice();
- commPricePlum += consumerCropPrice * demandFract.get(crop); // weight price by base demand of each cereal crop
- }
- return commPricePlum;
- }
-
@Override
protected CountryPrice createCountryPrices(CropType crop, GlobalPrice worldPrice) {
Map<CropType, CropUsageData> cropUsageMap = previousGamsRasterOutput.getCropUsageData();
diff --git a/src/ac/ed/lurg/country/crafty/CraftyCountryAgent.java b/src/ac/ed/lurg/country/crafty/CraftyCountryAgent.java
index 0117c8e2..c1e69d00 100644
--- a/src/ac/ed/lurg/country/crafty/CraftyCountryAgent.java
+++ b/src/ac/ed/lurg/country/crafty/CraftyCountryAgent.java
@@ -8,7 +8,6 @@ import ac.ed.lurg.country.CountryPrice;
import ac.ed.lurg.country.GlobalPrice;
import ac.ed.lurg.demand.AbstractDemandManager;
import ac.ed.lurg.landuse.CropUsageData;
-import ac.ed.lurg.types.CommodityType;
import ac.ed.lurg.types.CropType;
/**
@@ -33,17 +32,6 @@ public class CraftyCountryAgent extends AbstractCountryAgent {
updateNetImportsFromProdAndDemand(currentProjectedDemand, currentDemandFract, cropUsageMap);
}
- @Override
- protected double getCommPriceFromCropPrice(CommodityType commodity) {
- double commPricePlum = 0;
- Map<CropType, Double> demandFract = currentDemandFract.get(commodity);
-
- for (CropType crop : commodity.getCropTypes()) {
- commPricePlum += currentCountryPrices.get(crop).getImportPrice() * demandFract.get(crop); // weight price by base demand of each cereal crop
- }
- return commPricePlum;
- }
-
@Override
protected CountryPrice createCountryPrices(CropType crop, GlobalPrice worldPrice) {
// TODO Auto-generated method stub
--
GitLab