From cf6d4866895ee37a16e3b2af5b82db57ce42c9ea Mon Sep 17 00:00:00 2001
From: R0slyn <roslyn.henry.08@aberdeen.ac.uk>
Date: Thu, 26 Sep 2019 15:17:52 +0100
Subject: [PATCH] Some cluster script changes and HE data files

---
 data/nutritionestimates.csv |  2 +-
 data/sims/halfEarth.csv     | 11 +++++++
 data/sims/he_params.csv     | 65 +++++++++++++++++++++++++++++++++++++
 scripts/concatOutputLc.sh   | 30 ++++++++++++++++-
 scripts/createScenarios.sh  |  5 ++-
 5 files changed, 110 insertions(+), 3 deletions(-)
 create mode 100644 data/sims/halfEarth.csv
 create mode 100644 data/sims/he_params.csv

diff --git a/data/nutritionestimates.csv b/data/nutritionestimates.csv
index 4b359b04..75554d1e 100644
--- a/data/nutritionestimates.csv
+++ b/data/nutritionestimates.csv
@@ -1,4 +1,4 @@
-"Region","country","intercept","totalKcalpc_cf","totalKcalpc2_cf","shareanimal_cf","shareanmial2_cf","countryCoef"
+"Region","Country","intercept","totalKcalpc_cf","totalKcalpc2_cf","shareanimal_cf","shareanmial2_cf","countryCoef"
 "East Asia & Pacific","Australia",11.5917100186322,0.00377045078527761,-2.18493293365176e-07,0.248337293635106,-0.00489378460162954,2.17730004224001
 "East Asia & Pacific","Solomon Islands",11.5917100186322,0.00377045078527761,-2.18493293365176e-07,0.248337293635106,-0.00489378460162954,4.0426496512688
 "East Asia & Pacific","Brunei Darussalam",11.5917100186322,0.00377045078527761,-2.18493293365176e-07,0.248337293635106,-0.00489378460162954,1.91618736576066
diff --git a/data/sims/halfEarth.csv b/data/sims/halfEarth.csv
new file mode 100644
index 00000000..6f46d867
--- /dev/null
+++ b/data/sims/halfEarth.csv
@@ -0,0 +1,11 @@
+Ensemble,Scenario,AGRI_LAND_EXPANSION_COST_FACTOR,MIN_NATURAL_RATE,ANNUAL_MAX_IMPORT_CHANGE,BIOENERGY_DEMAND_SHIFT,FERTILISER_COST_PER_T,INITIAL_PRICE_SHIFT,IRRIG_COST_SCALE_FACTOR,IRRIGATION_EFFICIENCY,LAND_CHANGE_COST,MARKET_LAMBA,MEAT_EFFICIENCY,OTHER_INTENSITY_COST,PASTURE_HARVEST_FRACTION,SSP_GDP_PC_FACTOR,SSP_POPULATION_FACTOR,SSP_SCENARIO,TECHNOLOGY_CHANGE_ANNUAL_RATE,TRADE_BARRIER_MULTIPLIER,TRANSPORT_COST,MAX_PRICE_DECREASE,MAX_PRICE_INCREASE,RCP,BIOENERGY_FUTURE_DEMAND_FILENAME,ORIG_LEAST_COST_MIN,PRICE_ELASTIC_DEMAND,FORCE_PROTECTED_AREAS,FORCE_PROTECTED_AREAS_START_YEAR,FORCE_PROTECTED_AREAS_END_YEAR,HALFEARTH,PRICE_UPDATE_BY_MARKET_IMBALANCE,YIELD_DIR_TOP,BIOENERGY_DEMAND_SCENARIO
+HE_ensemble/baseline,s1,0.9,0.15,0.15,1,1.25,1,3e-04,0.5,0.1,0.2,1,0.7,0.5,1,1,SSP2_v9_130325,0.002,1,0.05,0.75,1.5,rcp60,bioenergy_scenario_data.csv,TRUE,TRUE,FALSE,2020,2040,FALSE,FALSE,rcp60,SSP2_RCP60
+HE_ensemble/baseline,s2,0.95,0.125,0.175,0.95,1.375,0.9,0.00045,0.45,0.0875,0.25,0.975,0.8,0.45,1.05,0.95,SSP2_v9_130325,0.0025,0.5,0.0625,0.75,1.5,rcp60,bioenergy_scenario_data.csv,TRUE,TRUE,FALSE,2020,2040,FALSE,FALSE,rcp60,SSP2_RCP60
+HE_ensemble/baseline,s3,0.85,0.175,0.125,1.05,1.125,1.1,0.00015,0.55,0.1125,0.15,1.025,0.6,0.55,0.95,1.05,SSP2_v9_130325,0.0015,1.5,0.0375,0.75,1.5,rcp60,bioenergy_scenario_data.csv,TRUE,TRUE,FALSE,2020,2040,FALSE,FALSE,rcp60,SSP2_RCP60
+HE_ensemble/baseline,s4,0.875,0.1375,0.1625,0.925,1.4375,1.15,7.5e-05,0.525,0.08125,0.275,0.9875,0.75,0.425,0.975,1.025,SSP2_v9_130325,0.00225,0.75,0.04375,0.75,1.5,rcp60,bioenergy_scenario_data.csv,TRUE,TRUE,FALSE,2020,2040,FALSE,FALSE,rcp60,SSP2_RCP60
+HE_ensemble/baseline,s5,0.975,0.1875,0.1125,1.025,1.1875,0.95,0.000375,0.425,0.10625,0.175,1.0375,0.55,0.525,1.075,0.925,SSP2_v9_130325,0.00125,1.75,0.06875,0.75,1.5,rcp60,bioenergy_scenario_data.csv,TRUE,TRUE,FALSE,2020,2040,FALSE,FALSE,rcp60,SSP2_RCP60
+HE_ensemble/halfearth,s1,0.9,0.15,0.15,1,1.25,1,3e-04,0.5,0.1,0.2,1,0.7,0.5,1,1,SSP2_v9_130325,0.002,1,0.05,0.75,1.5,rcp60,bioenergy_scenario_data.csv,TRUE,TRUE,TRUE,2020,2040,TRUE,FALSE,rcp60,SSP2_RCP60
+HE_ensemble/halfearth,s2,0.95,0.125,0.175,0.95,1.375,0.9,0.00045,0.45,0.0875,0.25,0.975,0.8,0.45,1.05,0.95,SSP2_v9_130325,0.0025,0.5,0.0625,0.75,1.5,rcp60,bioenergy_scenario_data.csv,TRUE,TRUE,TRUE,2020,2040,TRUE,FALSE,rcp60,SSP2_RCP60
+HE_ensemble/halfearth,s3,0.85,0.175,0.125,1.05,1.125,1.1,0.00015,0.55,0.1125,0.15,1.025,0.6,0.55,0.95,1.05,SSP2_v9_130325,0.0015,1.5,0.0375,0.75,1.5,rcp60,bioenergy_scenario_data.csv,TRUE,TRUE,TRUE,2020,2040,TRUE,FALSE,rcp60,SSP2_RCP60
+HE_ensemble/halfearth,s4,0.875,0.1375,0.1625,0.925,1.4375,1.15,7.5e-05,0.525,0.08125,0.275,0.9875,0.75,0.425,0.975,1.025,SSP2_v9_130325,0.00225,0.75,0.04375,0.75,1.5,rcp60,bioenergy_scenario_data.csv,TRUE,TRUE,TRUE,2020,2040,TRUE,FALSE,rcp60,SSP2_RCP60
+HE_ensemble/halfearth,s5,0.975,0.1875,0.1125,1.025,1.1875,0.95,0.000375,0.425,0.10625,0.175,1.0375,0.55,0.525,1.075,0.925,SSP2_v9_130325,0.00125,1.75,0.06875,0.75,1.5,rcp60,bioenergy_scenario_data.csv,TRUE,TRUE,TRUE,2020,2040,TRUE,FALSE,rcp60,SSP2_RCP60
diff --git a/data/sims/he_params.csv b/data/sims/he_params.csv
new file mode 100644
index 00000000..b848391c
--- /dev/null
+++ b/data/sims/he_params.csv
@@ -0,0 +1,65 @@
+Ensemble,pname,dist,xmin,xmax,x05,xmode,x95,value
+baseline,AGRI_LAND_EXPANSION_COST_FACTOR,unif,0.8,1,,,,
+baseline,MIN_NATURAL_RATE,unif,0.1,0.2,,,,
+baseline,ANNUAL_MAX_IMPORT_CHANGE,unif,0.1,0.2,,,,
+baseline,BIOENERGY_DEMAND_SHIFT,unif,0.9,1.1,,,,
+baseline,FERTILISER_COST_PER_T,unif,1,1.5,,,,
+baseline,INITIAL_PRICE_SHIFT,unif,0.8,1.2,,,,
+baseline,IRRIG_COST_SCALE_FACTOR,unif,0,0.0006,,,,
+baseline,IRRIGATION_EFFICIENCY,unif,0.4,0.6,,,,
+baseline,LAND_CHANGE_COST,unif,0.075,0.125,,,,
+baseline,MARKET_LAMBA,unif,0.1,0.3,,,,
+baseline,MEAT_EFFICIENCY,unif,0.95,1.05,,,,
+baseline,OTHER_INTENSITY_COST,unif,0.5,0.9,,,,
+baseline,PASTURE_HARVEST_FRACTION,unif,0.4,0.6,,,,
+baseline,SSP_GDP_PC_FACTOR,unif,0.9,1.1,,,,
+baseline,SSP_POPULATION_FACTOR,unif,0.9,1.1,,,,
+baseline,SSP_SCENARIO,value,,,,,,SSP2_v9_130325
+baseline,TECHNOLOGY_CHANGE_ANNUAL_RATE,unif,0.001,0.003,,,,
+baseline,TRADE_BARRIER_MULTIPLIER,unif,0,2,,,,
+baseline,TRANSPORT_COST,unif,0.025,0.075,,,,
+baseline,MAX_PRICE_DECREASE,unif,0.75,0.75,,,,
+baseline,MAX_PRICE_INCREASE,unif,1.5,1.5,,,,
+baseline,RCP,rcp,,,,,,ssp2
+baseline,BIOENERGY_DEMAND_SCENARIO,value,,,,,,ssp2
+baseline,YIELD_DIR_TOP,value,,,,,,ssp2
+baseline,BIOENERGY_FUTURE_DEMAND_FILENAME,value,,,,,,bioenergy_scenario_data.csv
+baseline,ORIG_LEAST_COST_MIN,value,,,,,,TRUE
+baseline,PRICE_ELASTIC_DEMAND,value,,,,,,TRUE
+baseline,FORCE_PROTECTED_AREAS,value,,,,,,FALSE
+baseline,FORCE_PROTECTED_AREAS_START_YEAR,value,,,,,,2020
+baseline,FORCE_PROTECTED_AREAS_END_YEAR,value,,,,,,2040
+baseline,HALFEARTH,value,,,,,,FALSE
+baseline,PRICE_UPDATE_BY_MARKET_IMBALANCE,value,,,,,,FALSE
+halfearth,AGRI_LAND_EXPANSION_COST_FACTOR,unif,0.8,1,,,,
+halfearth,MIN_NATURAL_RATE,unif,0.1,0.2,,,,
+halfearth,ANNUAL_MAX_IMPORT_CHANGE,unif,0.1,0.2,,,,
+halfearth,BIOENERGY_DEMAND_SHIFT,unif,0.9,1.1,,,,
+halfearth,FERTILISER_COST_PER_T,unif,1,1.5,,,,
+halfearth,INITIAL_PRICE_SHIFT,unif,0.8,1.2,,,,
+halfearth,IRRIG_COST_SCALE_FACTOR,unif,0,0.0006,,,,
+halfearth,IRRIGATION_EFFICIENCY,unif,0.4,0.6,,,,
+halfearth,LAND_CHANGE_COST,unif,0.075,0.125,,,,
+halfearth,MARKET_LAMBA,unif,0.1,0.3,,,,
+halfearth,MEAT_EFFICIENCY,unif,0.95,1.05,,,,
+halfearth,OTHER_INTENSITY_COST,unif,0.5,0.9,,,,
+halfearth,PASTURE_HARVEST_FRACTION,unif,0.4,0.6,,,,
+halfearth,SSP_GDP_PC_FACTOR,unif,0.9,1.1,,,,
+halfearth,SSP_POPULATION_FACTOR,unif,0.9,1.1,,,,
+halfearth,SSP_SCENARIO,value,,,,,,SSP2_v9_130325
+halfearth,TECHNOLOGY_CHANGE_ANNUAL_RATE,unif,0.001,0.003,,,,
+halfearth,TRADE_BARRIER_MULTIPLIER,unif,0,2,,,,
+halfearth,TRANSPORT_COST,unif,0.025,0.075,,,,
+halfearth,MAX_PRICE_DECREASE,unif,0.75,0.75,,,,
+halfearth,MAX_PRICE_INCREASE,unif,1.5,1.5,,,,
+halfearth,RCP,rcp,,,,,,ssp2
+halfearth,BIOENERGY_DEMAND_SCENARIO,value,,,,,,ssp2
+halfearth,YIELD_DIR_TOP,value,,,,,,ssp2
+halfearth,BIOENERGY_FUTURE_DEMAND_FILENAME,value,,,,,,bioenergy_scenario_data.csv
+halfearth,ORIG_LEAST_COST_MIN,value,,,,,,TRUE
+halfearth,PRICE_ELASTIC_DEMAND,value,,,,,,TRUE
+halfearth,FORCE_PROTECTED_AREAS,value,,,,,,TRUE
+halfearth,FORCE_PROTECTED_AREAS_START_YEAR,value,,,,,,2020
+halfearth,FORCE_PROTECTED_AREAS_END_YEAR,value,,,,,,2040
+halfearth,HALFEARTH,value,,,,,,TRUE
+halfearth,PRICE_UPDATE_BY_MARKET_IMBALANCE,value,,,,,,FALSE
diff --git a/scripts/concatOutputLc.sh b/scripts/concatOutputLc.sh
index e3d1bf12..af4ad5d3 100755
--- a/scripts/concatOutputLc.sh
+++ b/scripts/concatOutputLc.sh
@@ -8,9 +8,15 @@ cd $1
 concatLcFile=lc_concat.txt
 concatPriceFile=price_concat.txt
 concatLUFile=LandUseSummary.csv
-echo "Scenario,Year,Cropland,Pasture,ManForest,UnmanForest,Natural,AbPasture,EnergyCrop,FertCrop,IrrigCrop" > $concatLcFile
+concatDomesticFile=domestic_concat.txt
+concatCountryDemandFile=country_demand_concat.txt
+concatCountryOptFile=country_opt_concat.txt
+echo "Scenario,Year,Cropland,Pasture,ManForest,UnmanForest,Natural,AbPasture,Suitable,EnergyCrop,FertCrop,IrrigCrop" > $concatLcFile
 echo "Scenario,Year,Crop,Imports,Exports,Price,Stocks" > $concatPriceFile
 echo "Scenario,cropType,yield,irrig,fert,otherint,area,Year,dryMatter" > $concatLUFile
+echo "Scenario,Year,Country,Crop,Area,Production,Production_cost,Import_price,Export_price,Net_imports,Net_import_cost,Prod_shock,Rum_feed_amount,Mon_feed_amount" > $concatDomesticFile
+echo "Scenario,Year,Country,Commodity,Demand,BioenergyDemand" > $concatCountryDemandFile
+echo "Scenario,Country,Year,gdpPc,population,status,utility,hungerFactor,commodity,price,subsistence,discretionary,plumNotRebase,plumRebased,rebasedKcal" > $concatCountryOptFile
 
 find . -name "*lc.txt"|while read fname; do
         scenarioDir="$(dirname $fname)"
@@ -38,4 +44,26 @@ find . -name "*lc.txt"|while read fname; do
 		test $k -eq 1 && ((k=k+1)) && continue
 		echo "${scenario},$line" >> $concatLUFile
 	done < $scenarioDir/LandUseSummary.csv
+	
+	l=1
+	while read -r line
+	do
+		test $l -eq 1 && ((l=l+1)) && continue
+		echo "${scenario},$line" >> $concatDomesticFile
+	done < $scenarioDir/domestic.txt
+ 
+ 	m=1
+	while read -r line
+	do
+		test $m -eq 1 && ((m=m+1)) && continue
+		echo "${scenario},$line" >> $concatCountryDemandFile
+	done < $scenarioDir/countryDemand.txt
+	 
+	 n=1
+	while read -r line
+	do
+		test $n -eq 1 && ((n=n+1)) && continue
+		echo "${scenario},$line" >> $concatCountryOptFile
+	done < $scenarioDir/countryDemandOpt.txt
+
 done
diff --git a/scripts/createScenarios.sh b/scripts/createScenarios.sh
index 711b946e..c3d78cf8 100755
--- a/scripts/createScenarios.sh
+++ b/scripts/createScenarios.sh
@@ -59,9 +59,12 @@ done < $filename
 source /etc/profile
 
 if [[ $* == *-ys* ]]; then
+   if [[ $* == *-ys1* ]]; then singleYieldShockFile=1
+   else singleYieldShockFile=0
+   fi
    echo "Running R yield shock script"
    module load R
-   R < /exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/CreateYieldShockMaps.R  --no-save --args $1
+   R < /exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/CreateYieldShockMaps.R  --no-save --args $1 $singleYieldShockFile
 else
    echo "Not running R yield shock script"
 fi
-- 
GitLab