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

change to scripts

parent cd0644e5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
data/bioenergy_futures_BAU.csv
+ 10
− 10
View file @ 434713d1
...@@ -31,13 +31,13 @@ PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2035 ...@@ -31,13 +31,13 @@ PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2035
PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2040,1300 PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2040,1300
PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2045,1700 PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2045,1700
PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2050,2000 PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2050,2000
PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2055,2000 PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2055,2200
PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2060,2000 PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2060,2400
PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2065,2000 PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2065,2600
PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2070,2000 PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2070,2800
PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2075,2000 PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2075,3000
PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2080,2000 PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2080,3200
PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2085,2000 PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2085,3400
PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2090,2000 PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2090,3600
PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2095,2000 PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2095,3800
PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2100,2000 PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2100,4000
\ No newline at end of file
scripts/concatOutputLc.sh
+ 1
− 1
View file @ 434713d1
...@@ -7,7 +7,7 @@ fi ...@@ -7,7 +7,7 @@ fi
cd $1 cd $1
concatLcFile=lc_concat.txt concatLcFile=lc_concat.txt
concatPriceFile=price_concat.txt concatPriceFile=price_concat.txt
echo "Scenario,Year,Cropland,Pasture,ManForest,UnmanForest,Natural,FertCrop,FertPasture,IrrigCrop,IrrigPasture" > $concatLcFile echo "Scenario,Year,Cropland,Pasture,ManForest,UnmanForest,Natural,EnergyCrop,FertCrop,IrrigCrop" > $concatLcFile
echo "Scenario,Year,Crop,Imports,Exports,Price,Stocks" > $concatPriceFile echo "Scenario,Year,Crop,Imports,Exports,Price,Stocks" > $concatPriceFile
find . -name "*lc.txt"|while read fname; do find . -name "*lc.txt"|while read fname; do
......
scripts/createHindScenarios.sh
+ 2
− 2
View file @ 434713d1
...@@ -52,8 +52,8 @@ do ...@@ -52,8 +52,8 @@ do
run_config_file=$scenario_dir/config.properties run_config_file=$scenario_dir/config.properties
cp $common_run_file $run_config_file cp $common_run_file $run_config_file
echo "OUTPUT_DIR=$scenario_dir" >> $run_config_file echo "OUTPUT_DIR=$scenario_dir" >> $run_config_file
echo "SERIALIZED_LAND_USE_FILE=$scenario_dir/calib/landUseRaster.ser" >> $run_config_file # echo "SERIALIZED_LAND_USE_FILE=$scenario_dir/calib/landUseRaster.ser" >> $run_config_file
echo "CLUSTERED_YIELD_FILE=$scenario_dir/calib/cluster.asc" >> $run_config_file # echo "CLUSTERED_YIELD_FILE=$scenario_dir/calib/cluster.asc" >> $run_config_file
for index in "${!array[@]}" for index in "${!array[@]}"
do do
......
scripts/scheduleHindScenarios.sh
+ 4
− 2
View file @ 434713d1
...@@ -27,8 +27,10 @@ do ...@@ -27,8 +27,10 @@ do
continue; continue;
fi fi
echo "/exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/runCalibAndPlum.sh hind1970/$ensemble/$scenario" echo "qsub -N ${ensemble}_$scenario /exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/runPlum.sh hind1970/$ensemble/$scenario"
/exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/runCalibAndPlum.sh hind1970/$ensemble/$scenario qsub -N ${ensemble}_$scenario /exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/runPlum.sh hind1970/$ensemble/$scenario
# echo "/exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/runCalibAndPlum.sh hind1970/$ensemble/$scenario"
# /exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/runCalibAndPlum.sh hind1970/$ensemble/$scenario
fi fi
done < $filename done < $filename
src/ac/ed/lurg/ModelMain.java
+ 1
− 1
View file @ 434713d1
...@@ -103,7 +103,7 @@ public class ModelMain { ...@@ -103,7 +103,7 @@ public class ModelMain {
prevWorldPrices.put(CropType.STARCHY_ROOTS, GlobalPrice.createInitial(0.1)); prevWorldPrices.put(CropType.STARCHY_ROOTS, GlobalPrice.createInitial(0.1));
prevWorldPrices.put(CropType.MONOGASTRICS, GlobalPrice.createInitial(0.4 * 0.5)); // quantities is in feed equivalent term (0.4 is weighted average price per feed, and 0.5 accounts for mark-up for additional processing) prevWorldPrices.put(CropType.MONOGASTRICS, GlobalPrice.createInitial(0.4 * 0.5)); // quantities is in feed equivalent term (0.4 is weighted average price per feed, and 0.5 accounts for mark-up for additional processing)
prevWorldPrices.put(CropType.RUMINANTS, GlobalPrice.createInitial(0.2 * 0.6)); // quantities is in feed equivalent term prevWorldPrices.put(CropType.RUMINANTS, GlobalPrice.createInitial(0.2 * 0.6)); // quantities is in feed equivalent term
prevWorldPrices.put(CropType.ENERGY_CROPS, GlobalPrice.createInitial(0.02)); prevWorldPrices.put(CropType.ENERGY_CROPS, GlobalPrice.createInitial(0.04));
prevStockLevel = getInitialStockLevels(); prevStockLevel = getInitialStockLevels();
} }
......
src/ac/ed/lurg/country/GlobalPrice.java
+ 2
− 0
View file @ 434713d1
...@@ -44,6 +44,8 @@ public class GlobalPrice { ...@@ -44,6 +44,8 @@ public class GlobalPrice {
ratio = (imports-exports)/exports; ratio = (imports-exports)/exports;
double adjustment = adjustPrice ? Math.exp(ratio * ModelConfig.MARKET_LAMBA) : 1.0; 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
return new GlobalPrice(exportPrice * adjustment, imports, exports); return new GlobalPrice(exportPrice * adjustment, imports, exports);
} }
else { else {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment