From a04321dc01991839b2757e5cad9bfa9459e3e1aa Mon Sep 17 00:00:00 2001
From: R0slyn <roslyn.henry.08@aberdeen.ac.uk>
Date: Wed, 31 Oct 2018 11:59:16 +0000
Subject: [PATCH] small tweaks

---
 data/sims/shocks_params.csv               |  10 +--
 data/sims/shocks_sims.csv                 | 100 +++++++++++-----------
 data/sims/ssp_params.csv                  |  12 +--
 scripts/createShockFiles.R                |   2 +-
 src/ac/ed/lurg/InternationalMarket.java   |   2 +-
 src/ac/ed/lurg/ModelMain.java             |  10 +--
 src/ac/ed/lurg/country/GlobalPrice.java   |  18 ++--
 src/ac/ed/lurg/landuse/CropUsageData.java |   4 -
 8 files changed, 73 insertions(+), 85 deletions(-)

diff --git a/data/sims/shocks_params.csv b/data/sims/shocks_params.csv
index 9582d147..acbef527 100644
--- a/data/sims/shocks_params.csv
+++ b/data/sims/shocks_params.csv
@@ -4,11 +4,11 @@ SSP2,AGRI_LAND_EXPANSION_COST_FACTOR,beta,0,2,0.8,1,1.2,
 SSP3,AGRI_LAND_EXPANSION_COST_FACTOR,beta,0,2,0.3,0.5,0.8,
 SSP4,AGRI_LAND_EXPANSION_COST_FACTOR,beta,0,2,0.5,0.8,1,
 SSP5,AGRI_LAND_EXPANSION_COST_FACTOR,beta,0,2,0.5,0.8,1.2,
-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,ANNUAL_MAX_IMPORT_CHANGE,beta,0.01,0.16,0.08,0.11,0.14,
+SSP2,ANNUAL_MAX_IMPORT_CHANGE,beta,0.01,0.16,0.07,0.1,0.13,
+SSP3,ANNUAL_MAX_IMPORT_CHANGE,beta,0.01,0.16,0.03,0.06,0.09,
+SSP4,ANNUAL_MAX_IMPORT_CHANGE,beta,0.01,0.16,0.05,0.08,0.11,
+SSP5,ANNUAL_MAX_IMPORT_CHANGE,beta,0.01,0.16,0.09,0.12,0.15,
 SSP1,BIOENERGY_DEMAND_SHIFT,unif,0.9,1.1,,,,
 SSP2,BIOENERGY_DEMAND_SHIFT,unif,0.9,1.1,,,,
 SSP3,BIOENERGY_DEMAND_SHIFT,unif,0.9,1.1,,,,
diff --git a/data/sims/shocks_sims.csv b/data/sims/shocks_sims.csv
index d94b701b..5201b1da 100644
--- a/data/sims/shocks_sims.csv
+++ b/data/sims/shocks_sims.csv
@@ -1,51 +1,51 @@
 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_BARRIERS_MULTIPLIER,TRANSPORT_COST,RCP,BIOENERGY_FUTURE_DEMAND_FILENAME,SHOCKS_POSSIBLE,CEREALS_SUB_PROPORTION,PULSES_SUB_PROPORTION,OILCROPS_SUB_PROPORTION,STARCHY_ROOTS_SUB_PROPORTION,ORIG_LEAST_COST_MIN,YIELD_DIR_TOP,BIOENERGY_DEMAND_SCENARIO
-shocks/SSP1,s1,1.30660468251533,0.0228770160929893,1,1,1.95478849592337,1,0.000390070160965327,0.543143007232545,0.273082824305185,0.4,1.01533023412577,0.195035080482664,0.792464749320561,0.5,1,1,SSP1_v9_130325,0.0043697548242007,0.804684232679383,0.0625529531354358,rcp45,bioenergy_scenario_data.csv,TRUE,0.3,0.35,0.05,0.3,FALSE,rcp45,SSP1_RCP45
-shocks/SSP1,s2,1.54790984303127,0.0214839384786384,1.05,0.9,2.11331205428652,0.9,0.000439712506444229,0.522883961636984,0.260497349959828,0.45,1.00172299275499,0.219856253222114,0.762938815233838,0.55,0.95,1.05,SSP1_v9_130325,0.00284782774978011,0.892981559287351,0.0534306136855851,rcp60,bioenergy_scenario_data.csv,TRUE,0.340909090909091,0.397727272727273,0.0568181818181818,0.204545454545455,FALSE,rcp60,SSP1_RCP60
-shocks/SSP1,s3,1.03445985509982,0.0242169546991675,0.95,1.1,1.77763289140303,1.1,0.000336454765220775,0.560804997269742,0.284824516367045,0.35,1.02739549215156,0.168227382610388,0.818885342381086,0.45,1.05,0.95,SSP1_v9_130325,0.00567673525237017,0.718456680365365,0.0707791804420796,rcp45,bioenergy_scenario_data.csv,TRUE,0.25,0.291666666666667,0.0416666666666667,0.416666666666667,FALSE,rcp45,SSP1_RCP45
-shocks/SSP1,s4,1.18011203692493,0.0222238146836663,1.025,0.85,2.21138114822018,1.15,0.000297658154750587,0.55187750477836,0.251190281847944,0.475,1.00900560184625,0.207081890146159,0.740803236535345,0.475,1.025,0.925,SSP1_v9_130325,0.00366905314915087,0.763628922290554,0.0757348286419711,rcp60,bioenergy_scenario_data.csv,TRUE,0.44,0.326666666666667,0.0333333333333333,0.2,FALSE,rcp60,SSP1_RCP60
-shocks/SSP1,s5,1.68712459733118,0.0251160485505954,0.925,1.05,1.87306648304096,0.95,0.000414163780292317,0.507738565320178,0.278743046214026,0.375,1.03435622986656,0.148829077375294,0.805387725330027,0.575,0.925,1.025,SSP1_v9_130325,0.00641323525127281,0.955955002707142,0.0583130649033555,rcp45,bioenergy_scenario_data.csv,TRUE,0.230769230769231,0.423076923076923,0.0494505494505494,0.296703296703297,FALSE,rcp45,SSP1_RCP45
-shocks/SSP1,s6,1.42608431668559,0.020484656645973,0.975,0.95,1.64481941921207,1.05,0.000471149717022949,0.571197905518257,0.267233889736522,0.325,0.992019633340972,0.182541367124365,0.77884441384016,0.525,1.075,1.075,SSP1_v9_130325,0.00172654612000884,0.846202333458787,0.0665902063269412,rcp45,bioenergy_scenario_data.csv,TRUE,0.205479452054795,0.431506849315068,0.0753424657534247,0.287671232876712,FALSE,rcp45,SSP1_RCP45
-shocks/SSP1,s7,0.840392666819443,0.0235183190940216,1.075,1.15,2.03232635198016,0.85,0.000365082734248729,0.533822367498968,0.292533770487903,0.425,1.02130421583428,0.235574858511474,0.83523019137003,0.425,0.975,0.975,SSP1_v9_130325,0.00502166031087259,0.659406330981701,0.0468469071878789,rcp60,bioenergy_scenario_data.csv,TRUE,0.333333333333333,0.216049382716049,0.0432098765432099,0.407407407407407,FALSE,rcp60,SSP1_RCP60
-shocks/SSP1,s8,0.947079413058987,0.0218711945581873,0.9625,1.075,1.99362745293572,0.875,0.000266547291002851,0.578207463425012,0.256377522723662,0.3125,1.02430218052628,0.227088490947081,0.798937908822619,0.5375,0.9375,1.0375,SSP1_v9_130325,0.00083953812772664,0.613112316714834,0.0730918071675773,rcp60,bioenergy_scenario_data.csv,TRUE,0.284810126582278,0.420886075949367,0.0474683544303797,0.246835443037975,FALSE,rcp60,SSP1_RCP60
-shocks/SSP1,s9,1.48604361052557,0.0246241323378201,1.0625,0.875,1.53497915088738,1.075,0.000402092805288833,0.538606920741212,0.28168325290689,0.4125,0.997353970652949,0.175733923722865,0.722496525147897,0.4375,1.0375,0.9375,SSP1_v9_130325,0.0046985541914294,0.82513042147288,0.0559918173191546,rcp45,bioenergy_scenario_data.csv,TRUE,0.379120879120879,0.211538461538462,0.0631868131868132,0.346153846153846,FALSE,rcp45,SSP1_RCP45
-shocks/SSP1,s10,1.7775717843041,0.0196770094284043,1.0125,1.175,1.82793270700347,0.975,0.000454176981894161,0.556262112241531,0.270217915435747,0.4625,1.03887858921521,0.133273645501426,0.826440118671977,0.4875,0.9875,0.9875,SSP1_v9_130325,0.00328017089364283,0.921083111431939,0.0645757939740144,rcp45,bioenergy_scenario_data.csv,TRUE,0.39041095890411,0.35958904109589,0.0650684931506849,0.184931506849315,FALSE,rcp45,SSP1_RCP45
-shocks/SSP2,s1,1,0.02,1,1,1.4,1,3e-04,0.5,0.2,0.4,1,0.102766896900118,0.7,0.5,1,1,SSP2_v9_130325,0.002,1,0.05,rcp60,bioenergy_scenario_data.csv,TRUE,0.3,0.35,0.05,0.3,FALSE,rcp60,SSP2_RCP60
-shocks/SSP2,s2,1.08270938702243,0.0187532681030967,1.05,0.9,1.52467318969033,0.9,0.000342014778383574,0.491729061297757,0.189688362297416,0.45,0.995864530648878,0.122695883337939,0.679221135051611,0.55,0.95,1.05,SSP2_v9_130325,0.00158753449189663,1.08270938702243,0.0458442270103222,rcp60,bioenergy_scenario_data.csv,TRUE,0.340909090909091,0.397727272727273,0.0568181818181818,0.204545454545455,FALSE,rcp60,SSP2_RCP60
-shocks/SSP2,s3,0.91729061297757,0.0212467318969033,0.95,1.1,1.27532681030967,1.1,0.000257985221616426,0.508270938702243,0.210311637702584,0.35,1.00413546935112,0.0840110432944513,0.720778864948389,0.45,1.05,0.95,SSP2_v9_130325,0.00241246550810337,0.91729061297757,0.0541557729896778,rcp60,bioenergy_scenario_data.csv,TRUE,0.25,0.291666666666667,0.0416666666666667,0.416666666666667,FALSE,rcp60,SSP2_RCP60
-shocks/SSP2,s4,0.960874657414893,0.0194097808551165,1.025,0.85,1.61153483560056,1.15,0.000229015531982238,0.503912534258511,0.182453074797474,0.475,0.998043732870745,0.112067534446962,0.664744194066573,0.475,1.025,0.925,SSP2_v9_130325,0.00180496552244993,0.960874657414893,0.0570511611866855,rcp85,bioenergy_scenario_data.csv,TRUE,0.44,0.326666666666667,0.0333333333333333,0.2,FALSE,rcp85,SSP2_RCP85
-shocks/SSP2,s5,1.14060088096457,0.0221153483560056,0.925,1.05,1.34097808551165,0.95,0.000319925055308764,0.485939911903543,0.204875861938752,0.375,1.00703004404823,0.0717421347364521,0.709836985748058,0.575,0.925,1.025,SSP2_v9_130325,0.00270187700810103,1.14060088096457,0.0480326028503884,rcp60,bioenergy_scenario_data.csv,TRUE,0.230769230769231,0.423076923076923,0.0494505494505494,0.296703296703297,FALSE,rcp60,SSP2_RCP60
-shocks/SSP2,s6,1.03912534258511,0.0178846516439944,0.975,0.95,1.18846516439944,1.05,0.000370984468017762,0.514060088096457,0.195124138061248,0.325,0.992969955951772,0.0937292467329929,0.690163014251942,0.525,1.075,1.075,SSP2_v9_130325,0.00129812299189897,1.03912534258511,0.0519673971496117,rcp60,bioenergy_scenario_data.csv,TRUE,0.205479452054795,0.431506849315068,0.0753424657534247,0.287671232876712,FALSE,rcp60,SSP2_RCP60
-shocks/SSP2,s7,0.859399119035433,0.0205902191448835,1.075,1.15,1.45902191448835,0.85,0.000280074944691236,0.496087465741489,0.217546925202526,0.425,1.00195626712926,0.13716683564989,0.735255805933427,0.425,0.975,0.975,SSP2_v9_130325,0.00219503447755007,0.859399119035433,0.0429488388133145,rcp60,bioenergy_scenario_data.csv,TRUE,0.333333333333333,0.216049382716049,0.0432098765432099,0.407407407407407,FALSE,rcp60,SSP2_RCP60
-shocks/SSP2,s8,0.891349695386158,0.0190953765627878,0.9625,1.075,1.42915219840989,0.875,0.000206379438102187,0.518678231924779,0.186448969904585,0.3125,1.00299925739028,0.129136314317571,0.704858699734982,0.5375,0.9375,1.0375,SSP2_v9_130325,0.00106646891392977,0.813217680752207,0.0554552181300731,rcp85,bioenergy_scenario_data.csv,TRUE,0.284810126582278,0.420886075949367,0.0474683544303797,0.246835443037975,FALSE,rcp85,SSP2_RCP85
-shocks/SSP2,s9,1.05998514780556,0.0216365654390219,1.0625,0.875,1.11961312890323,1.075,0.000309845153366947,0.498067840937043,0.207476646078755,0.4125,0.994567484769308,0.0890295783085543,0.653268854817205,0.4375,1.0375,0.9375,SSP2_v9_130325,0.00209630682320497,1.01932159062957,0.0469845885426258,rcp60,bioenergy_scenario_data.csv,TRUE,0.379120879120879,0.211538461538462,0.0631868131868132,0.346153846153846,FALSE,rcp60,SSP2_RCP60
-shocks/SSP2,s10,1.18678231924779,0.0171961312890323,1.0125,1.175,1.30953765627878,0.975,0.00035506220712875,0.505998514780556,0.197592329419876,0.4625,1.00933911596239,0.0625340908685169,0.727276090650366,0.4875,0.9875,0.9875,SSP2_v9_130325,0.00170093415684978,1.10865030461384,0.0509717399469965,rcp60,bioenergy_scenario_data.csv,TRUE,0.39041095890411,0.35958904109589,0.0650684931506849,0.184931506849315,FALSE,rcp60,SSP2_RCP60
-shocks/SSP3,s1,0.52024973082015,0.0144521138994884,1,1,1.24996893009364,1,0.000181512340250704,0.456856935948328,0.2,0.4,1,0.0445126831921568,0.663245104481559,0.5,1,1,SSP3_v9_130325,3.69271604227922e-05,1.43143007232545,0.0426490208963119,rcp60,bioenergy_scenario_data.csv,TRUE,0.3,0.35,0.05,0.3,FALSE,rcp60,SSP3_RCP60
-shocks/SSP3,s2,0.626836319372511,0.0128668802502573,1.05,0.9,1.71576868292866,0.9,0.000257608797012638,0.439195017296463,0.178992610808213,0.45,0.991499566495146,0.057952756518755,0.609099799539873,0.55,0.95,1.05,SSP3_v9_130325,-0.000403161804191794,1.60804997269742,0.0318199599079746,rcp85,bioenergy_scenario_data.csv,TRUE,0.340909090909091,0.397727272727273,0.0568181818181818,0.204545454545455,FALSE,rcp85,SSP3_RCP85
-shocks/SSP3,s3,0.42240292862359,0.0162236675874247,0.95,1.1,0.81494452402692,1.1,0.000116163234931558,0.477115892757839,0.221007389191787,0.35,1.00850043350485,0.0330090823549182,0.721568949329571,0.45,1.05,0.95,SSP3_v9_130325,0.000493430076903505,1.22883961636984,0.0543137898659143,rcp60,bioenergy_scenario_data.csv,TRUE,0.25,0.291666666666667,0.0416666666666667,0.416666666666667,FALSE,rcp60,SSP3_RCP60
-shocks/SSP3,s4,0.472828658836114,0.0136767363178329,1.025,0.85,2.00628515703454,1.15,7.93381979158249e-05,0.466177534970001,0.164507765991119,0.475,0.995961271646254,0.0506301059058289,0.576813814608971,0.475,1.025,0.925,SSP3_v9_130325,-0.000173264707884575,1.33822367498968,0.0622443170156101,rcp85,bioenergy_scenario_data.csv,TRUE,0.44,0.326666666666667,0.0333333333333333,0.2,FALSE,rcp85,SSP3_RCP85
-shocks/SSP3,s5,0.706212456808112,0.0175518005237929,0.925,1.05,1.03427294323604,0.95,0.000216547471988307,0.428802142902719,0.209962527654382,0.375,1.01429697586053,0.0261085152314528,0.690726165466602,0.575,0.925,1.025,SSP3_v9_130325,0.000823126072871327,1.71197905518257,0.0373432953175058,rcp60,bioenergy_scenario_data.csv,TRUE,0.230769230769231,0.423076923076923,0.0494505494505494,0.296703296703297,FALSE,rcp60,SSP3_RCP60
-shocks/SSP3,s6,0.569627876199485,0.0118861903281928,0.975,0.95,0.575006888801793,1.05,0.000313672946680845,0.492261225015423,0.190037472345618,0.325,0.985703024139469,0.0388290458435607,0.636716476587529,0.525,1.075,1.075,SSP3_v9_130325,-0.00070170222053337,1.5187750477836,0.0481452330933205,rcp45,bioenergy_scenario_data.csv,TRUE,0.205479452054795,0.431506849315068,0.0753424657534247,0.287671232876712,FALSE,rcp45,SSP3_RCP45
-shocks/SSP3,s7,0.35950033211296,0.0152693329537884,1.075,1.15,1.47281094120852,0.85,0.000148917022380211,0.448122475133549,0.235492234008881,0.425,1.00403872835375,0.0684984107814919,0.761221585078051,0.425,0.975,0.975,SSP3_v9_130325,0.000250787709514898,1.07738565320178,0.0253627629217942,rcp60,bioenergy_scenario_data.csv,TRUE,0.333333333333333,0.216049382716049,0.0432098765432099,0.407407407407407,FALSE,rcp60,SSP3_RCP60
-shocks/SSP3,s8,0.393630352957537,0.0132817729600999,0.9625,1.075,1.35981822722675,0.875,5.57880317639894e-05,0.504575935346175,0.172468896435625,0.3125,1.00618145203469,0.0625634106275243,0.676741762503836,0.5375,0.9375,1.0375,SSP3_v9_130325,-0.000934322350810428,0.95423807573882,0.0579273940735087,rcp85,bioenergy_scenario_data.csv,TRUE,0.284810126582278,0.420886075949367,0.0474683544303797,0.246835443037975,FALSE,rcp85,SSP3_RCP85
-shocks/SSP3,s9,0.596725537287047,0.0168110877200933,1.0625,0.875,0.432703060835255,1.075,0.000198549210969431,0.452464080654622,0.215259115964058,0.4125,0.988879099276111,0.0359763457745679,0.555379009321426,0.4375,1.0375,0.9375,SSP3_v9_130325,0.000142076929961531,1.47535881251776,0.0346392703707599,rcp60,bioenergy_scenario_data.csv,TRUE,0.379120879120879,0.211538461538462,0.0631868131868132,0.346153846153846,FALSE,rcp60,SSP3_RCP60
-shocks/SSP3,s10,0.772118515732619,0.0111863738577089,1.0125,1.175,0.925831345256541,0.975,0.000282646540713303,0.471349162143331,0.195077423316527,0.4625,1.01875730938355,0.0212752105246864,0.739636970367543,0.4875,0.9875,0.9875,SSP3_v9_130325,-0.000283850702175425,1.65677298115535,0.0453483525007672,rcp60,bioenergy_scenario_data.csv,TRUE,0.39041095890411,0.35958904109589,0.0650684931506849,0.184931506849315,FALSE,rcp60,SSP3_RCP60
-shocks/SSP4,s1,0.811640789284124,0.0171229837882688,1,1,1.62052874275472,1,3e-04,0.5,0.223224848256224,0.4,1,0.0617946629980457,0.73675479045912,0.5,1,1,SSP4_v9_130325,0.002,1.18835921530899,0.057350958091824,rcp60,bioenergy_scenario_data.csv,TRUE,0.3,0.35,0.05,0.3,FALSE,rcp60,SSP4_RCP60
-shocks/SSP4,s2,0.950913447119588,0.0157830458101546,1.05,0.9,1.94540176353163,0.9,0.000392219996545916,0.47825814477904,0.200109409407399,0.45,0.991499566495146,0.0721511689357051,0.678430727670076,0.55,0.95,1.05,SSP4_v9_130325,0.00115970443232851,1.32271087533741,0.0456861455340151,rcp60,bioenergy_scenario_data.csv,TRUE,0.340909090909091,0.397727272727273,0.0568181818181818,0.204545454545455,FALSE,rcp60,SSP4_RCP60
-shocks/SSP4,s3,0.677289103652929,0.0185160607259331,0.95,1.1,1.27058436602045,1.1,0.000207780003454084,0.52174185522096,0.245602104047409,0.35,1.00850043350485,0.0522332070850587,0.790900293921938,0.45,1.05,0.95,SSP4_v9_130325,0.00284029556767149,1.04908658487231,0.0681800587843877,rcp45,bioenergy_scenario_data.csv,TRUE,0.25,0.291666666666667,0.0416666666666667,0.416666666666667,FALSE,rcp45,SSP4_RCP45
-shocks/SSP4,s4,0.747317644437761,0.0164816810924002,1.025,0.85,2.13911822036366,1.15,0.000149872893774089,0.510368611745326,0.18380421752541,0.475,0.995961271646254,0.0665930165455536,0.638777971110566,0.475,1.025,0.925,SSP4_v9_130325,0.00160149889382473,1.12293272169141,0.0746372740121221,rcp60,bioenergy_scenario_data.csv,TRUE,0.44,0.326666666666667,0.0333333333333333,0.2,FALSE,rcp60,SSP4_RCP60
-shocks/SSP4,s5,1.04992250232152,0.0195153420744095,0.925,1.05,1.45564174279705,0.95,0.000344420554391967,0.463759734884964,0.233937129448582,0.375,1.01429697586053,0.0460025680312655,0.763283519442843,0.575,0.925,1.025,SSP4_v9_130325,0.00341968936035525,1.41248926790519,0.0518547247599017,rcp60,bioenergy_scenario_data.csv,TRUE,0.230769230769231,0.423076923076923,0.0494505494505494,0.296703296703297,FALSE,rcp60,SSP4_RCP60
-shocks/SSP4,s6,0.877067295765406,0.014883952352434,0.975,0.95,1.0326678266634,1.05,0.000450127106225911,0.536240265115036,0.212346886972287,0.325,0.985703024139469,0.0571740490794656,0.709273623799508,0.525,1.075,1.075,SSP4_v9_130325,0.000580310639644753,1.25268234769637,0.0626567038885685,rcp45,bioenergy_scenario_data.csv,TRUE,0.205479452054795,0.431506849315068,0.0753424657534247,0.287671232876712,FALSE,rcp45,SSP4_RCP45
-shocks/SSP4,s7,0.58751069527749,0.0177761848815033,1.075,1.15,1.77970111665706,0.85,0.000255579445608033,0.489631388254674,0.260527881418834,0.425,1.00403872835375,0.0798896931694546,0.82318637006061,0.425,0.975,0.975,SSP4_v9_130325,0.00239850110617527,0.950077548783454,0.0377555942221132,rcp60,bioenergy_scenario_data.csv,TRUE,0.333333333333333,0.216049382716049,0.0432098765432099,0.407407407407407,FALSE,rcp60,SSP4_RCP60
-shocks/SSP4,s8,0.63656265300707,0.0161451239025991,0.9625,1.075,1.70010973398956,0.875,0.000110146094662154,0.547056058716041,0.192800029046496,0.3125,1.00618145203469,0.075567884872693,0.750018288998261,0.5375,0.9375,1.0375,SSP4_v9_130325,0.00012758876204373,0.870914911636531,0.0712118788776287,rcp85,bioenergy_scenario_data.csv,TRUE,0.284810126582278,0.420886075949367,0.0474683544303797,0.246835443037975,FALSE,rcp85,SSP4_RCP85
-shocks/SSP4,s9,0.912306235156161,0.0189617450307193,1.0625,0.875,0.857329300359078,1.075,0.000322023747407471,0.494870514918668,0.239559992470989,0.4125,0.988879099276111,0.0547823376612273,0.60955488339318,0.4375,1.0375,0.9375,SSP4_v9_130325,0.00219690306733894,1.22027912056015,0.0488966261241963,rcp60,bioenergy_scenario_data.csv,TRUE,0.379120879120879,0.211538461538462,0.0631868131868132,0.346153846153846,FALSE,rcp60,SSP4_RCP60
-shocks/SSP4,s10,1.12908515409343,0.0141930803193253,1.0125,1.175,1.36689878372589,0.975,0.000419131787359978,0.515846543233086,0.217869810476089,0.4625,1.01875730938355,0.0413016340925494,0.806059394388144,0.4875,0.9875,0.9875,SSP4_v9_130325,0.00138963536143769,1.36343731863701,0.0600036577996521,rcp45,bioenergy_scenario_data.csv,TRUE,0.39041095890411,0.35958904109589,0.0650684931506849,0.184931506849315,FALSE,rcp45,SSP4_RCP45
-shocks/SSP5,s1,0.811640789284124,0.0255478849592337,1,1,0.926049361002817,1,0.000181512340250704,0.518835921530899,0.154964919394384,0.4,1.00976578836866,0.0445126831921568,0.607535231658141,0.5,1,1,SSP5_v9_130325,0.00396307283703912,0.635905109239572,0.0374470532300597,rcp85,bioenergy_scenario_data.csv,TRUE,0.3,0.35,0.05,0.3,FALSE,rcp85,SSP5_RCP85
-shocks/SSP5,s2,0.950913447119588,0.0237763289140303,1.05,0.9,1.23043518805055,0.9,0.000257608797012638,0.504908658487231,0.130143746947899,0.45,1.00535092206312,0.057952756518755,0.581114670837621,0.55,0.95,1.05,SSP5_v9_130325,0.00350656990464916,0.803172883434773,0.0292208157420578,rcp85,bioenergy_scenario_data.csv,TRUE,0.340909090909091,0.397727272727273,0.0568181818181818,0.204545454545455,FALSE,rcp85,SSP5_RCP85
-shocks/SSP5,s3,0.677289103652929,0.0271331205428652,0.95,1.1,0.664652939726232,1.1,0.000116163234931558,0.532271087533741,0.181772616931047,0.35,1.01407716596062,0.0330090823549182,0.637061126457078,0.45,1.05,0.95,SSP5_v9_130325,0.00440316181646114,0.483175490607284,0.0465694046538295,rcp60,bioenergy_scenario_data.csv,TRUE,0.25,0.291666666666667,0.0416666666666667,0.416666666666667,FALSE,rcp60,SSP5_RCP60
-shocks/SSP5,s4,0.747317644437761,0.0247306648304096,1.025,0.85,1.45469178672338,1.15,7.93381979158249e-05,0.525268234769637,0.114425141818419,0.475,1.00768988334135,0.0506301059058289,0.564769838803214,0.475,1.025,0.925,SSP5_v9_130325,0.00374921228054304,0.561543291189036,0.0531531191676086,rcp85,bioenergy_scenario_data.csv,TRUE,0.44,0.326666666666667,0.0333333333333333,0.2,FALSE,rcp85,SSP5_RCP85
-shocks/SSP5,s5,1.04992250232152,0.0281138114822018,0.925,1.05,0.795668089520843,0.95,0.000216547471988307,0.495007754878345,0.167458632596606,0.375,1.01702968341419,0.0261085152314528,0.621155549229806,0.575,0.925,1.025,SSP5_v9_130325,0.00470170224237687,0.92597876013111,0.0334097948543317,rcp60,bioenergy_scenario_data.csv,TRUE,0.230769230769231,0.423076923076923,0.0494505494505494,0.296703296703297,FALSE,rcp60,SSP5_RCP60
-shocks/SSP5,s6,0.877067295765406,0.0224481941921206,0.975,0.95,0.5173527916633,1.05,0.000313672946680845,0.541248926790519,0.142918109877283,0.325,1.00220224990988,0.0388290458435607,0.594612271963882,0.525,1.075,1.075,SSP5_v9_130325,0.00317687389702778,0.713535210739204,0.0416869470585662,rcp60,bioenergy_scenario_data.csv,TRUE,0.205479452054795,0.431506849315068,0.0753424657534247,0.287671232876712,FALSE,rcp60,SSP5_RCP60
-shocks/SSP5,s7,0.58751069527749,0.0263232635198016,1.075,1.15,1.06618988795323,0.85,0.000148917022380211,0.512293272169141,0.201170921929993,0.425,1.0118185538767,0.0684984107814919,0.659196675396549,0.425,0.975,0.975,SSP5_v9_130325,0.00417326471250381,0.387371373137462,0.0242651625750109,rcp85,bioenergy_scenario_data.csv,TRUE,0.333333333333333,0.216049382716049,0.0432098765432099,0.407407407407407,FALSE,rcp85,SSP5_RCP85
-shocks/SSP5,s8,0.63656265300707,0.0242793270700347,0.9625,1.075,0.994196843877722,0.875,5.57880317639894e-05,0.548097210546723,0.122911509299956,0.3125,1.01290330152184,0.0625634106275243,0.614178583117231,0.5375,0.9375,1.0375,SSP5_v9_130325,0.00290758694314781,0.318435110768064,0.0495172071217179,rcp85,bioenergy_scenario_data.csv,TRUE,0.284810126582278,0.420886075949367,0.0474683544303797,0.246835443037975,FALSE,rcp85,SSP5_RCP85
-shocks/SSP5,s9,0.912306235156161,0.0275864071203186,1.0625,0.875,0.423152127055958,1.075,0.000198549210969431,0.515617011061736,0.174266075912534,0.4125,1.00394584446383,0.0359763457745679,0.553106230961815,0.4375,1.0375,0.9375,SSP5_v9_130325,0.00406732813461995,0.673867127371789,0.0313602797328327,rcp60,bioenergy_scenario_data.csv,TRUE,0.379120879120879,0.211538461538462,0.0631868131868132,0.346153846153846,FALSE,rcp60,SSP5_RCP60
-shocks/SSP5,s10,1.12908515409343,0.0213497915088738,1.0125,1.175,0.730943888305931,0.975,0.000282646540713303,0.528643312224093,0.14895359730641,0.4625,1.01934438411581,0.0212752105246864,0.646851462001555,0.4875,0.9875,0.9875,SSP5_v9_130325,0.00363366757352137,0.85777615593929,0.0395194273741454,rcp60,bioenergy_scenario_data.csv,TRUE,0.39041095890411,0.35958904109589,0.0650684931506849,0.184931506849315,FALSE,rcp60,SSP5_RCP60
+shocks/SSP1,s1,1.30660468251533,0.1057155643514,1,1,1.95478849592337,1,0.000390070160965327,0.543143007232545,0.273082824305185,0.4,1.01533023412577,0.195035080482664,0.792464749320561,0.5,1,1,SSP1_v9_130325,0.0043697548242007,0.804684232679383,0.0625529531354358,rcp45,bioenergy_scenario_data.csv,TRUE,0.3,0.35,0.05,0.3,FALSE,rcp45,SSP1_RCP45
+shocks/SSP1,s2,1.54790984303127,0.088085880371214,1.05,0.9,2.11331205428652,0.9,0.000439712506444229,0.522883961636984,0.260497349959828,0.45,1.00172299275499,0.219856253222114,0.762938815233838,0.55,0.95,1.05,SSP1_v9_130325,0.00284782774978011,0.892981559287351,0.0534306136855851,rcp60,bioenergy_scenario_data.csv,TRUE,0.340909090909091,0.397727272727273,0.0568181818181818,0.204545454545455,FALSE,rcp60,SSP1_RCP60
+shocks/SSP1,s3,1.03445985509982,0.121793414516185,0.95,1.1,1.77763289140303,1.1,0.000336454765220775,0.560804997269742,0.284824516367045,0.35,1.02739549215156,0.168227382610388,0.818885342381086,0.45,1.05,0.95,SSP1_v9_130325,0.00567673525237017,0.718456680365365,0.0707791804420796,rcp45,bioenergy_scenario_data.csv,TRUE,0.25,0.291666666666667,0.0416666666666667,0.416666666666667,FALSE,rcp45,SSP1_RCP45
+shocks/SSP1,s4,1.18011203692493,0.0974938417494704,1.025,0.85,2.21138114822018,1.15,0.000297658154750587,0.55187750477836,0.251190281847944,0.475,1.00900560184625,0.207081890146159,0.740803236535345,0.475,1.025,0.925,SSP1_v9_130325,0.00366905314915087,0.763628922290554,0.0757348286419711,rcp60,bioenergy_scenario_data.csv,TRUE,0.44,0.326666666666667,0.0333333333333333,0.2,FALSE,rcp60,SSP1_RCP60
+shocks/SSP1,s5,1.68712459733118,0.131554510142596,0.925,1.05,1.87306648304096,0.95,0.000414163780292317,0.507738565320178,0.278743046214026,0.375,1.03435622986656,0.148829077375294,0.805387725330027,0.575,0.925,1.025,SSP1_v9_130325,0.00641323525127281,0.955955002707142,0.0583130649033555,rcp45,bioenergy_scenario_data.csv,TRUE,0.230769230769231,0.423076923076923,0.0494505494505494,0.296703296703297,FALSE,rcp45,SSP1_RCP45
+shocks/SSP1,s6,1.42608431668559,0.0755119303967079,0.975,0.95,1.64481941921207,1.05,0.000471149717022949,0.571197905518257,0.267233889736522,0.325,0.992019633340972,0.182541367124365,0.77884441384016,0.525,1.075,1.075,SSP1_v9_130325,0.00172654612000884,0.846202333458787,0.0665902063269412,rcp45,bioenergy_scenario_data.csv,TRUE,0.205479452054795,0.431506849315068,0.0753424657534247,0.287671232876712,FALSE,rcp45,SSP1_RCP45
+shocks/SSP1,s7,0.840392666819443,0.113586160242677,1.075,1.15,2.03232635198016,0.85,0.000365082734248729,0.533822367498968,0.292533770487903,0.425,1.02130421583428,0.235574858511474,0.83523019137003,0.425,0.975,0.975,SSP1_v9_130325,0.00502166031087259,0.659406330981701,0.0468469071878789,rcp60,bioenergy_scenario_data.csv,TRUE,0.333333333333333,0.216049382716049,0.0432098765432099,0.407407407407407,FALSE,rcp60,SSP1_RCP60
+shocks/SSP1,s8,0.947079413058987,0.0930127538927267,0.9625,1.075,1.99362745293572,0.875,0.000266547291002851,0.578207463425012,0.256377522723662,0.3125,1.02430218052628,0.227088490947081,0.798937908822619,0.5375,0.9375,1.0375,SSP1_v9_130325,0.00083953812772664,0.613112316714834,0.0730918071675773,rcp60,bioenergy_scenario_data.csv,TRUE,0.284810126582278,0.420886075949367,0.0474683544303797,0.246835443037975,FALSE,rcp60,SSP1_RCP60
+shocks/SSP1,s9,1.48604361052557,0.126341681488494,1.0625,0.875,1.53497915088738,1.075,0.000402092805288833,0.538606920741212,0.28168325290689,0.4125,0.997353970652949,0.175733923722865,0.722496525147897,0.4375,1.0375,0.9375,SSP1_v9_130325,0.0046985541914294,0.82513042147288,0.0559918173191546,rcp45,bioenergy_scenario_data.csv,TRUE,0.379120879120879,0.211538461538462,0.0631868131868132,0.346153846153846,FALSE,rcp45,SSP1_RCP45
+shocks/SSP1,s10,1.7775717843041,0.0657033834382265,1.0125,1.175,1.82793270700347,0.975,0.000454176981894161,0.556262112241531,0.270217915435747,0.4625,1.03887858921521,0.133273645501426,0.826440118671977,0.4875,0.9875,0.9875,SSP1_v9_130325,0.00328017089364283,0.921083111431939,0.0645757939740144,rcp45,bioenergy_scenario_data.csv,TRUE,0.39041095890411,0.35958904109589,0.0650684931506849,0.184931506849315,FALSE,rcp45,SSP1_RCP45
+shocks/SSP2,s1,1,0.0982263269645288,1,1,1.4,1,3e-04,0.5,0.2,0.4,1,0.102766896900118,0.7,0.5,1,1,SSP2_v9_130325,0.002,1,0.05,rcp60,bioenergy_scenario_data.csv,TRUE,0.3,0.35,0.05,0.3,FALSE,rcp60,SSP2_RCP60
+shocks/SSP2,s2,1.08270938702243,0.0833894515184969,1.05,0.9,1.52467318969033,0.9,0.000342014778383574,0.491729061297757,0.189688362297416,0.45,0.995864530648878,0.122695883337939,0.679221135051611,0.55,0.95,1.05,SSP2_v9_130325,0.00158753449189663,1.08270938702243,0.0458442270103222,rcp60,bioenergy_scenario_data.csv,TRUE,0.340909090909091,0.397727272727273,0.0568181818181818,0.204545454545455,FALSE,rcp60,SSP2_RCP60
+shocks/SSP2,s3,0.91729061297757,0.112370553190319,0.95,1.1,1.27532681030967,1.1,0.000257985221616426,0.508270938702243,0.210311637702584,0.35,1.00413546935112,0.0840110432944513,0.720778864948389,0.45,1.05,0.95,SSP2_v9_130325,0.00241246550810337,0.91729061297757,0.0541557729896778,rcp60,bioenergy_scenario_data.csv,TRUE,0.25,0.291666666666667,0.0416666666666667,0.416666666666667,FALSE,rcp60,SSP2_RCP60
+shocks/SSP2,s4,0.960874657414893,0.0912509567500133,1.025,0.85,1.61153483560056,1.15,0.000229015531982238,0.503912534258511,0.182453074797474,0.475,0.998043732870745,0.112067534446962,0.664744194066573,0.475,1.025,0.925,SSP2_v9_130325,0.00180496552244993,0.960874657414893,0.0570511611866855,rcp85,bioenergy_scenario_data.csv,TRUE,0.44,0.326666666666667,0.0333333333333333,0.2,FALSE,rcp85,SSP2_RCP85
+shocks/SSP2,s5,1.14060088096457,0.121506519108207,0.925,1.05,1.34097808551165,0.95,0.000319925055308764,0.485939911903543,0.204875861938752,0.375,1.00703004404823,0.0717421347364521,0.709836985748058,0.575,0.925,1.025,SSP2_v9_130325,0.00270187700810103,1.14060088096457,0.0480326028503884,rcp60,bioenergy_scenario_data.csv,TRUE,0.230769230769231,0.423076923076923,0.0494505494505494,0.296703296703297,FALSE,rcp60,SSP2_RCP60
+shocks/SSP2,s6,1.03912534258511,0.0729773842276332,0.975,0.95,1.18846516439944,1.05,0.000370984468017762,0.514060088096457,0.195124138061248,0.325,0.992969955951772,0.0937292467329929,0.690163014251942,0.525,1.075,1.075,SSP2_v9_130325,0.00129812299189897,1.03912534258511,0.0519673971496117,rcp60,bioenergy_scenario_data.csv,TRUE,0.205479452054795,0.431506849315068,0.0753424657534247,0.287671232876712,FALSE,rcp60,SSP2_RCP60
+shocks/SSP2,s7,0.859399119035433,0.105045649776803,1.075,1.15,1.45902191448835,0.85,0.000280074944691236,0.496087465741489,0.217546925202526,0.425,1.00195626712926,0.13716683564989,0.735255805933427,0.425,0.975,0.975,SSP2_v9_130325,0.00219503447755007,0.859399119035433,0.0429488388133145,rcp60,bioenergy_scenario_data.csv,TRUE,0.333333333333333,0.216049382716049,0.0432098765432099,0.407407407407407,FALSE,rcp60,SSP2_RCP60
+shocks/SSP2,s8,0.891349695386158,0.0874942350646003,0.9625,1.075,1.42915219840989,0.875,0.000206379438102187,0.518678231924779,0.186448969904585,0.3125,1.00299925739028,0.129136314317571,0.704858699734982,0.5375,0.9375,1.0375,SSP2_v9_130325,0.00106646891392977,0.813217680752207,0.0554552181300731,rcp85,bioenergy_scenario_data.csv,TRUE,0.284810126582278,0.420886075949367,0.0474683544303797,0.246835443037975,FALSE,rcp85,SSP2_RCP85
+shocks/SSP2,s9,1.05998514780556,0.116557887604929,1.0625,0.875,1.11961312890323,1.075,0.000309845153366947,0.498067840937043,0.207476646078755,0.4125,0.994567484769308,0.0890295783085543,0.653268854817205,0.4375,1.0375,0.9375,SSP2_v9_130325,0.00209630682320497,1.01932159062957,0.0469845885426258,rcp60,bioenergy_scenario_data.csv,TRUE,0.379120879120879,0.211538461538462,0.0631868131868132,0.346153846153846,FALSE,rcp60,SSP2_RCP60
+shocks/SSP2,s10,1.18678231924779,0.0648496563064132,1.0125,1.175,1.30953765627878,0.975,0.00035506220712875,0.505998514780556,0.197592329419876,0.4625,1.00933911596239,0.0625340908685169,0.727276090650366,0.4875,0.9875,0.9875,SSP2_v9_130325,0.00170093415684978,1.10865030461384,0.0509717399469965,rcp60,bioenergy_scenario_data.csv,TRUE,0.39041095890411,0.35958904109589,0.0650684931506849,0.184931506849315,FALSE,rcp60,SSP2_RCP60
+shocks/SSP3,s1,0.52024973082015,0.0642844494453043,1,1,1.24996893009364,1,0.000181512340250704,0.456856935948328,0.2,0.4,1,0.0445126831921568,0.663245104481559,0.5,1,1,SSP3_v9_130325,3.69271604227922e-05,1.43143007232545,0.0426490208963119,rcp60,bioenergy_scenario_data.csv,TRUE,0.3,0.35,0.05,0.3,FALSE,rcp60,SSP3_RCP60
+shocks/SSP3,s2,0.626836319372511,0.048206574819578,1.05,0.9,1.71576868292866,0.9,0.000257608797012638,0.439195017296463,0.178992610808213,0.45,0.991499566495146,0.057952756518755,0.609099799539873,0.55,0.95,1.05,SSP3_v9_130325,-0.000403161804191794,1.60804997269742,0.0318199599079746,rcp85,bioenergy_scenario_data.csv,TRUE,0.340909090909091,0.397727272727273,0.0568181818181818,0.204545454545455,FALSE,rcp85,SSP3_RCP85
+shocks/SSP3,s3,0.42240292862359,0.0819141616637659,0.95,1.1,0.81494452402692,1.1,0.000116163234931558,0.477115892757839,0.221007389191787,0.35,1.00850043350485,0.0330090823549182,0.721568949329571,0.45,1.05,0.95,SSP3_v9_130325,0.000493430076903505,1.22883961636984,0.0543137898659143,rcp60,bioenergy_scenario_data.csv,TRUE,0.25,0.291666666666667,0.0416666666666667,0.416666666666667,FALSE,rcp60,SSP3_RCP60
+shocks/SSP3,s4,0.472828658836114,0.0564138411418265,1.025,0.85,2.00628515703454,1.15,7.93381979158249e-05,0.466177534970001,0.164507765991119,0.475,0.995961271646254,0.0506301059058289,0.576813814608971,0.475,1.025,0.925,SSP3_v9_130325,-0.000173264707884575,1.33822367498968,0.0622443170156101,rcp85,bioenergy_scenario_data.csv,TRUE,0.44,0.326666666666667,0.0333333333333333,0.2,FALSE,rcp85,SSP3_RCP85
+shocks/SSP3,s5,0.706212456808112,0.0944881300624568,0.925,1.05,1.03427294323604,0.95,0.000216547471988307,0.428802142902719,0.209962527654382,0.375,1.01429697586053,0.0261085152314528,0.690726165466602,0.575,0.925,1.025,SSP3_v9_130325,0.000823126072871327,1.71197905518257,0.0373432953175058,rcp60,bioenergy_scenario_data.csv,TRUE,0.230769230769231,0.423076923076923,0.0494505494505494,0.296703296703297,FALSE,rcp60,SSP3_RCP60
+shocks/SSP3,s6,0.569627876199485,0.0384454671496108,0.975,0.95,0.575006888801793,1.05,0.000313672946680845,0.492261225015423,0.190037472345618,0.325,0.985703024139469,0.0388290458435607,0.636716476587529,0.525,1.075,1.075,SSP3_v9_130325,-0.00070170222053337,1.5187750477836,0.0481452330933205,rcp45,bioenergy_scenario_data.csv,TRUE,0.205479452054795,0.431506849315068,0.0753424657534247,0.287671232876712,FALSE,rcp45,SSP3_RCP45
+shocks/SSP3,s7,0.35950033211296,0.0725061853295398,1.075,1.15,1.47281094120852,0.85,0.000148917022380211,0.448122475133549,0.235492234008881,0.425,1.00403872835375,0.0684984107814919,0.761221585078051,0.425,0.975,0.975,SSP3_v9_130325,0.000250787709514898,1.07738565320178,0.0253627629217942,rcp60,bioenergy_scenario_data.csv,TRUE,0.333333333333333,0.216049382716049,0.0432098765432099,0.407407407407407,FALSE,rcp60,SSP3_RCP60
+shocks/SSP3,s8,0.393630352957537,0.0524034141985713,0.9625,1.075,1.35981822722675,0.875,5.57880317639894e-05,0.504575935346175,0.172468896435625,0.3125,1.00618145203469,0.0625634106275243,0.676741762503836,0.5375,0.9375,1.0375,SSP3_v9_130325,-0.000934322350810428,0.95423807573882,0.0579273940735087,rcp85,bioenergy_scenario_data.csv,TRUE,0.284810126582278,0.420886075949367,0.0474683544303797,0.246835443037975,FALSE,rcp85,SSP3_RCP85
+shocks/SSP3,s9,0.596725537287047,0.0875608703480283,1.0625,0.875,0.432703060835255,1.075,0.000198549210969431,0.452464080654622,0.215259115964058,0.4125,0.988879099276111,0.0359763457745679,0.555379009321426,0.4375,1.0375,0.9375,SSP3_v9_130325,0.000142076929961531,1.47535881251776,0.0346392703707599,rcp60,bioenergy_scenario_data.csv,TRUE,0.379120879120879,0.211538461538462,0.0631868131868132,0.346153846153846,FALSE,rcp60,SSP3_RCP60
+shocks/SSP3,s10,0.772118515732619,0.0317336663383125,1.0125,1.175,0.925831345256541,0.975,0.000282646540713303,0.471349162143331,0.195077423316527,0.4625,1.01875730938355,0.0212752105246864,0.739636970367543,0.4875,0.9875,0.9875,SSP3_v9_130325,-0.000283850702175425,1.65677298115535,0.0453483525007672,rcp60,bioenergy_scenario_data.csv,TRUE,0.39041095890411,0.35958904109589,0.0650684931506849,0.184931506849315,FALSE,rcp60,SSP3_RCP60
+shocks/SSP4,s1,0.811640789284124,0.0804739719680198,1,1,1.62052874275472,1,3e-04,0.5,0.223224848256224,0.4,1,0.0617946629980457,0.73675479045912,0.5,1,1,SSP4_v9_130325,0.002,1.18835921530899,0.057350958091824,rcp60,bioenergy_scenario_data.csv,TRUE,0.3,0.35,0.05,0.3,FALSE,rcp60,SSP4_RCP60
+shocks/SSP4,s2,0.950913447119588,0.0673507583594915,1.05,0.9,1.94540176353163,0.9,0.000392219996545916,0.47825814477904,0.200109409407399,0.45,0.991499566495146,0.0721511689357051,0.678430727670076,0.55,0.95,1.05,SSP4_v9_130325,0.00115970443232851,1.32271087533741,0.0456861455340151,rcp60,bioenergy_scenario_data.csv,TRUE,0.340909090909091,0.397727272727273,0.0568181818181818,0.204545454545455,FALSE,rcp60,SSP4_RCP60
+shocks/SSP4,s3,0.677289103652929,0.0937882867642213,0.95,1.1,1.27058436602045,1.1,0.000207780003454084,0.52174185522096,0.245602104047409,0.35,1.00850043350485,0.0522332070850587,0.790900293921938,0.45,1.05,0.95,SSP4_v9_130325,0.00284029556767149,1.04908658487231,0.0681800587843877,rcp45,bioenergy_scenario_data.csv,TRUE,0.25,0.291666666666667,0.0416666666666667,0.416666666666667,FALSE,rcp45,SSP4_RCP45
+shocks/SSP4,s4,0.747317644437761,0.0742121465993357,1.025,0.85,2.13911822036366,1.15,0.000149872893774089,0.510368611745326,0.18380421752541,0.475,0.995961271646254,0.0665930165455536,0.638777971110566,0.475,1.025,0.925,SSP4_v9_130325,0.00160149889382473,1.12293272169141,0.0746372740121221,rcp60,bioenergy_scenario_data.csv,TRUE,0.44,0.326666666666667,0.0333333333333333,0.2,FALSE,rcp60,SSP4_RCP60
+shocks/SSP4,s5,1.04992250232152,0.102955564403432,0.925,1.05,1.45564174279705,0.95,0.000344420554391967,0.463759734884964,0.233937129448582,0.375,1.01429697586053,0.0460025680312655,0.763283519442843,0.575,0.925,1.025,SSP4_v9_130325,0.00341968936035525,1.41248926790519,0.0518547247599017,rcp60,bioenergy_scenario_data.csv,TRUE,0.230769230769231,0.423076923076923,0.0494505494505494,0.296703296703297,FALSE,rcp60,SSP4_RCP60
+shocks/SSP4,s6,0.877067295765406,0.0585380797037056,0.975,0.95,1.0326678266634,1.05,0.000450127106225911,0.536240265115036,0.212346886972287,0.325,0.985703024139469,0.0571740490794656,0.709273623799508,0.525,1.075,1.075,SSP4_v9_130325,0.000580310639644753,1.25268234769637,0.0626567038885685,rcp45,bioenergy_scenario_data.csv,TRUE,0.205479452054795,0.431506849315068,0.0753424657534247,0.287671232876712,FALSE,rcp45,SSP4_RCP45
+shocks/SSP4,s7,0.58751069527749,0.0867787690317004,1.075,1.15,1.77970111665706,0.85,0.000255579445608033,0.489631388254674,0.260527881418834,0.425,1.00403872835375,0.0798896931694546,0.82318637006061,0.425,0.975,0.975,SSP4_v9_130325,0.00239850110617527,0.950077548783454,0.0377555942221132,rcp60,bioenergy_scenario_data.csv,TRUE,0.333333333333333,0.216049382716049,0.0432098765432099,0.407407407407407,FALSE,rcp60,SSP4_RCP60
+shocks/SSP4,s8,0.63656265300707,0.0709091704102985,0.9625,1.075,1.70010973398956,0.875,0.000110146094662154,0.547056058716041,0.192800029046496,0.3125,1.00618145203469,0.075567884872693,0.750018288998261,0.5375,0.9375,1.0375,SSP4_v9_130325,0.00012758876204373,0.870914911636531,0.0712118788776287,rcp85,bioenergy_scenario_data.csv,TRUE,0.284810126582278,0.420886075949367,0.0474683544303797,0.246835443037975,FALSE,rcp85,SSP4_RCP85
+shocks/SSP4,s9,0.912306235156161,0.0979246775845366,1.0625,0.875,0.857329300359078,1.075,0.000322023747407471,0.494870514918668,0.239559992470989,0.4125,0.988879099276111,0.0547823376612273,0.60955488339318,0.4375,1.0375,0.9375,SSP4_v9_130325,0.00219690306733894,1.22027912056015,0.0488966261241963,rcp60,bioenergy_scenario_data.csv,TRUE,0.379120879120879,0.211538461538462,0.0631868131868132,0.346153846153846,FALSE,rcp60,SSP4_RCP60
+shocks/SSP4,s10,1.12908515409343,0.0518479175940364,1.0125,1.175,1.36689878372589,0.975,0.000419131787359978,0.515846543233086,0.217869810476089,0.4625,1.01875730938355,0.0413016340925494,0.806059394388144,0.4875,0.9875,0.9875,SSP4_v9_130325,0.00138963536143769,1.36343731863701,0.0600036577996521,rcp45,bioenergy_scenario_data.csv,TRUE,0.39041095890411,0.35958904109589,0.0650684931506849,0.184931506849315,FALSE,rcp45,SSP4_RCP45
+shocks/SSP5,s1,0.811640789284124,0.105767899605207,1,1,0.926049361002817,1,0.000181512340250704,0.518835921530899,0.154964919394384,0.4,1.00976578836866,0.0445126831921568,0.607535231658141,0.5,1,1,SSP5_v9_130325,0.00396307283703912,0.635905109239572,0.0374470532300597,rcp85,bioenergy_scenario_data.csv,TRUE,0.3,0.35,0.05,0.3,FALSE,rcp85,SSP5_RCP85
+shocks/SSP5,s2,0.950913447119588,0.0791023021039678,1.05,0.9,1.23043518805055,0.9,0.000257608797012638,0.504908658487231,0.130143746947899,0.45,1.00535092206312,0.057952756518755,0.581114670837621,0.55,0.95,1.05,SSP5_v9_130325,0.00350656990464916,0.803172883434773,0.0292208157420578,rcp85,bioenergy_scenario_data.csv,TRUE,0.340909090909091,0.397727272727273,0.0568181818181818,0.204545454545455,FALSE,rcp85,SSP5_RCP85
+shocks/SSP5,s3,0.677289103652929,0.128922236343307,0.95,1.1,0.664652939726232,1.1,0.000116163234931558,0.532271087533741,0.181772616931047,0.35,1.01407716596062,0.0330090823549182,0.637061126457078,0.45,1.05,0.95,SSP5_v9_130325,0.00440316181646114,0.483175490607284,0.0465694046538295,rcp60,bioenergy_scenario_data.csv,TRUE,0.25,0.291666666666667,0.0416666666666667,0.416666666666667,FALSE,rcp60,SSP5_RCP60
+shocks/SSP5,s4,0.747317644437761,0.0933124250911573,1.025,0.85,1.45469178672338,1.15,7.93381979158249e-05,0.525268234769637,0.114425141818419,0.475,1.00768988334135,0.0506301059058289,0.564769838803214,0.475,1.025,0.925,SSP5_v9_130325,0.00374921228054304,0.561543291189036,0.0531531191676086,rcp85,bioenergy_scenario_data.csv,TRUE,0.44,0.326666666666667,0.0333333333333333,0.2,FALSE,rcp85,SSP5_RCP85
+shocks/SSP5,s5,1.04992250232152,0.141201781824654,0.925,1.05,0.795668089520843,0.95,0.000216547471988307,0.495007754878345,0.167458632596606,0.375,1.01702968341419,0.0261085152314528,0.621155549229806,0.575,0.925,1.025,SSP5_v9_130325,0.00470170224237687,0.92597876013111,0.0334097948543317,rcp60,bioenergy_scenario_data.csv,TRUE,0.230769230769231,0.423076923076923,0.0494505494505494,0.296703296703297,FALSE,rcp60,SSP5_RCP60
+shocks/SSP5,s6,0.877067295765406,0.0608934311091408,0.975,0.95,0.5173527916633,1.05,0.000313672946680845,0.541248926790519,0.142918109877283,0.325,1.00220224990988,0.0388290458435607,0.594612271963882,0.525,1.075,1.075,SSP5_v9_130325,0.00317687389702778,0.713535210739204,0.0416869470585662,rcp60,bioenergy_scenario_data.csv,TRUE,0.205479452054795,0.431506849315068,0.0753424657534247,0.287671232876712,FALSE,rcp60,SSP5_RCP60
+shocks/SSP5,s7,0.58751069527749,0.117413869582024,1.075,1.15,1.06618988795323,0.85,0.000148917022380211,0.512293272169141,0.201170921929993,0.425,1.0118185538767,0.0684984107814919,0.659196675396549,0.425,0.975,0.975,SSP5_v9_130325,0.00417326471250381,0.387371373137462,0.0242651625750109,rcp85,bioenergy_scenario_data.csv,TRUE,0.333333333333333,0.216049382716049,0.0432098765432099,0.407407407407407,FALSE,rcp85,SSP5_RCP85
+shocks/SSP5,s8,0.63656265300707,0.086513214713397,0.9625,1.075,0.994196843877722,0.875,5.57880317639894e-05,0.548097210546723,0.122911509299956,0.3125,1.01290330152184,0.0625634106275243,0.614178583117231,0.5375,0.9375,1.0375,SSP5_v9_130325,0.00290758694314781,0.318435110768064,0.0495172071217179,rcp85,bioenergy_scenario_data.csv,TRUE,0.284810126582278,0.420886075949367,0.0474683544303797,0.246835443037975,FALSE,rcp85,SSP5_RCP85
+shocks/SSP5,s9,0.912306235156161,0.134875377572196,1.0625,0.875,0.423152127055958,1.075,0.000198549210969431,0.515617011061736,0.174266075912534,0.4125,1.00394584446383,0.0359763457745679,0.553106230961815,0.4375,1.0375,0.9375,SSP5_v9_130325,0.00406732813461995,0.673867127371789,0.0313602797328327,rcp60,bioenergy_scenario_data.csv,TRUE,0.379120879120879,0.211538461538462,0.0631868131868132,0.346153846153846,FALSE,rcp60,SSP5_RCP60
+shocks/SSP5,s10,1.12908515409343,0.0478448257569313,1.0125,1.175,0.730943888305931,0.975,0.000282646540713303,0.528643312224093,0.14895359730641,0.4625,1.01934438411581,0.0212752105246864,0.646851462001555,0.4875,0.9875,0.9875,SSP5_v9_130325,0.00363366757352137,0.85777615593929,0.0395194273741454,rcp60,bioenergy_scenario_data.csv,TRUE,0.39041095890411,0.35958904109589,0.0650684931506849,0.184931506849315,FALSE,rcp60,SSP5_RCP60
diff --git a/data/sims/ssp_params.csv b/data/sims/ssp_params.csv
index 67450a9c..96e30f32 100644
--- a/data/sims/ssp_params.csv
+++ b/data/sims/ssp_params.csv
@@ -89,11 +89,11 @@ SSP2,TECHNOLOGY_CHANGE_ANNUAL_RATE,beta,-0.004,0.008,0.001,0.002,0.003,
 SSP3,TECHNOLOGY_CHANGE_ANNUAL_RATE,beta,-0.004,0.008,-0.001,0,0.001,
 SSP4,TECHNOLOGY_CHANGE_ANNUAL_RATE,beta,-0.004,0.008,0,0.002,0.005,
 SSP5,TECHNOLOGY_CHANGE_ANNUAL_RATE,beta,-0.004,0.008,0.002,0.004,0.005,
-SSP1,TRADE_BARRIER_ADJ,beta,0,2,0.6,0.8,1,
-SSP2,TRADE_BARRIER_ADJ,beta,0,2,0.8,1,1.2,
-SSP3,TRADE_BARRIER_ADJ,beta,0,2,1.2,1.5,1.8,
-SSP4,TRADE_BARRIER_ADJ,beta,0,2,1,1.2,1.5,
-SSP5,TRADE_BARRIER_ADJ,beta,0,2,0.3,0.6,0.8,
+SSP1,TRADE_BARRIER_MULTIPLIER,beta,0,2,0.6,0.8,1,
+SSP2,TRADE_BARRIER_MULTIPLIER,beta,0,2,0.8,1,1.2,
+SSP3,TRADE_BARRIER_MULTIPLIER,beta,0,2,1.2,1.5,1.8,
+SSP4,TRADE_BARRIER_MULTIPLIER,beta,0,2,1,1.2,1.5,
+SSP5,TRADE_BARRIER_MULTIPLIER,beta,0,2,0.3,0.6,0.8,
 SSP1,TRANSPORT_COST,beta,0.01,0.09,0.05,0.065,0.08,
 SSP2,TRANSPORT_COST,beta,0.01,0.09,0.04,0.05,0.06,
 SSP3,TRANSPORT_COST,beta,0.01,0.09,0.02,0.04,0.06,
@@ -118,4 +118,4 @@ SSP1,BIOENERGY_FUTURE_DEMAND_FILENAME,value,,,,,,bioenergy_scenario_data.csv
 SSP2,BIOENERGY_FUTURE_DEMAND_FILENAME,value,,,,,,bioenergy_scenario_data.csv
 SSP3,BIOENERGY_FUTURE_DEMAND_FILENAME,value,,,,,,bioenergy_scenario_data.csv
 SSP4,BIOENERGY_FUTURE_DEMAND_FILENAME,value,,,,,,bioenergy_scenario_data.csv
-SSP5,BIOENERGY_FUTURE_DEMAND_FILENAME,value,,,,,,bioenergy_scenario_data.csv
\ No newline at end of file
+SSP5,BIOENERGY_FUTURE_DEMAND_FILENAME,value,,,,,,bioenergy_scenario_data.csv
diff --git a/scripts/createShockFiles.R b/scripts/createShockFiles.R
index a831a341..f330388e 100644
--- a/scripts/createShockFiles.R
+++ b/scripts/createShockFiles.R
@@ -112,7 +112,7 @@ drawValue <- function(shockType, paramName){
 	randomValue
 }
 
-baseDataDir = "/exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/data"
+baseDataDir = "/exports/csce/eddie/geos/groups/LURG/models/PLUM"
 baseOutputDir="/exports/csce/eddie/geos/groups/LURG/models/PLUM/output" # "~/Downloads"
 
 shockDistFile = fread(file.path(baseDataDir, "shockDistributions.csv"))
diff --git a/src/ac/ed/lurg/InternationalMarket.java b/src/ac/ed/lurg/InternationalMarket.java
index 5b2d8477..ea0d14fe 100644
--- a/src/ac/ed/lurg/InternationalMarket.java
+++ b/src/ac/ed/lurg/InternationalMarket.java
@@ -95,7 +95,7 @@ public class InternationalMarket {
 			GlobalPrice priceQuantity = worldPrices.get(crop);
 			sbData.append(String.format("%d,%s", timestep.getYear(), crop.getGamsName()));
 			sbData.append(String.format(",%.1f,%.1f", priceQuantity.getImportAmount(), priceQuantity.getExportsAfterTransportLosses()));
-			sbData.append(String.format(",%.3f,%.3f", priceQuantity.getExportPrice(), stockLevel.get(crop)));
+			sbData.append(String.format(",%.8f,%.3f", priceQuantity.getExportPrice(), stockLevel.get(crop)));
 
 			outputFile.write(sbData.toString());
 			outputFile.newLine();
diff --git a/src/ac/ed/lurg/ModelMain.java b/src/ac/ed/lurg/ModelMain.java
index 43368a70..6f9355a9 100644
--- a/src/ac/ed/lurg/ModelMain.java
+++ b/src/ac/ed/lurg/ModelMain.java
@@ -315,7 +315,7 @@ public class ModelMain {
 	
 private void writeDomesticProductionFile(Timestep timestep) {
 		try {
-			StringBuffer sbHeadings = new StringBuffer("Year, Country, Crop, Area, Production, Production_cost, Import_price, Export_price, Net_imports, Net_import_cost, Rum_feed_amount, Mon_feed_amount");
+			StringBuffer sbHeadings = new StringBuffer("Year, Country, Crop, Area, Production, Production_cost, Import_price, Export_price, Net_imports, Rum_feed_amount, Mon_feed_amount");
 			BufferedWriter outputFile = getFileWriter(timestep, ModelConfig.DOMESTIC_OUTPUT_FILE, sbHeadings.toString());
 
 			for (CropType crop : CropType.getAllItems()) {
@@ -335,20 +335,18 @@ private void writeDomesticProductionFile(Timestep timestep) {
 					
 					Double importPrice = null;
 					Double exportPrice = null;
-					Double netImportCost = null;
 					Double netImports = null;
 
 					if (crop.isImportedCrop()) {
 						CountryPrice px = country.getCurrentCountryPrices().get(crop);
-						importPrice = px.getImportPrice();
+						importPrice = px.getImportPrice(); 
 						exportPrice = px.getExportPrice();
-						netImportCost = cropUsage.getNetImportCost();
-						netImports = cropUsage.getNetImports();	
+						netImports = cropUsage.getNetImports();	//this isn't accounting for transport losses in exports 
 					}
 	
 					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,%.3f,%.3f,%.3f", area, prod, prodCosts, importPrice, exportPrice, netImports, netImportCost, rumFeedAmount, monFeedAmount));
+					sbData.append(String.format(",%.3f,%.3f,%.3f,%.3f,%.3f,%.3f,%.3f,%.3f", area, prod, prodCosts, importPrice, exportPrice, netImports, rumFeedAmount, monFeedAmount));
 
 					outputFile.write(sbData.toString());
 					outputFile.newLine();
diff --git a/src/ac/ed/lurg/country/GlobalPrice.java b/src/ac/ed/lurg/country/GlobalPrice.java
index 47d4b519..b7c134e8 100644
--- a/src/ac/ed/lurg/country/GlobalPrice.java
+++ b/src/ac/ed/lurg/country/GlobalPrice.java
@@ -21,9 +21,8 @@ public class GlobalPrice {
 	public static GlobalPrice createInitial(double exportPrice) {
 		return new GlobalPrice(exportPrice, Double.NaN, Double.NaN, Double.NaN);
 	}
-
-	public double getExportPrice() {
-		
+	
+	public double getExportPrice(){
 		return exportPrice;
 	}
 	
@@ -35,7 +34,7 @@ public class GlobalPrice {
 		double transportLosses =(!ModelConfig.SHOCKS_POSSIBLE) ? ModelConfig.TRANSPORT_LOSSES : ModelConfig.getParameter(Parameter.TRANSPORT_LOSSES, currentYear);
 		double transportCosts = (!ModelConfig.SHOCKS_POSSIBLE) ? ModelConfig.TRANSPORT_COST : ModelConfig.getParameter(Parameter.TRANSPORT_COST, currentYear);
 		
-		double importPrice = (getExportPrice() * (1.0 + countryTradeBarrier*tradeBarrierMultiplier) 
+		double importPrice = (exportPrice * (1.0 + countryTradeBarrier*tradeBarrierMultiplier) 
 								/ (1.0 - transportLosses)) + transportCosts;
 		return importPrice;
 	}
@@ -68,19 +67,14 @@ public class GlobalPrice {
 
 			double adjustment = adjustPrice ? Math.exp(ratio * ModelConfig.MARKET_LAMBA) : 1.0;
 			//adjustment = Math.min(adjustment, 2.0);  // can only double in a time step
-			//adjustment = Math.max(adjustment, 0.5); // can only half in a time step
-			
-			if(getExportPrice() == 0 ){
-				LogWriter.println("Price is zero: adjustment " + adjustment + " ratio " + ratio + " imports " + imports + " exportsAfterTransportLosses " + exportsAfterTransportLosses);
-			}
-			
+			//adjustment = Math.max(adjustment, 0.5); // can only half in a time step	
 			double financialSpeculationMultiplier = (!ModelConfig.SHOCKS_POSSIBLE)? 1.0 : ModelConfig.getParameter(Parameter.FINANCIAL_SPECULATION_MULTIPLIER,timestep.getYear());
 			
-			return new GlobalPrice(getExportPrice() * adjustment *financialSpeculationMultiplier, imports, exportsBeforeTransportLosses, transportLosses);
+			return new GlobalPrice(exportPrice * adjustment *financialSpeculationMultiplier, imports, exportsBeforeTransportLosses, transportLosses);
 			
 		}
 		else {
-			LogWriter.printlnError(String.format("Price for not updated (still %s), as no imports and no exports for it", getExportPrice()));
+			LogWriter.printlnError(String.format("Price for not updated (still %s), as no imports and no exports for it", exportPrice));
 			return this;
 		}
 	}
diff --git a/src/ac/ed/lurg/landuse/CropUsageData.java b/src/ac/ed/lurg/landuse/CropUsageData.java
index a1ba8519..45d3e1b9 100644
--- a/src/ac/ed/lurg/landuse/CropUsageData.java
+++ b/src/ac/ed/lurg/landuse/CropUsageData.java
@@ -32,10 +32,6 @@ public class CropUsageData {
 	public double getNetImports() {
 		return netImports;
 	}
-
-	public double getNetImportCost() {
-		return netImportCost;
-	}
 	
 	public double getProduction() {
 		return prod;
-- 
GitLab