diff --git a/data/bioenergy_futures_BAU.csv b/data/bioenergy_futures_BAU.csv index 4cd3452e2cfc08d9cad9c995619a28240c7bce23..c70877e7cef14ccd5275b4b87ba6c0ebc1400c76 100644 --- a/data/bioenergy_futures_BAU.csv +++ b/data/bioenergy_futures_BAU.csv @@ -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,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,2055,2000 -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,2065,2000 -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,2075,2000 -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,2085,2000 -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,2095,2000 -PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2100,2000 \ No newline at end of file +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,2400 +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,2800 +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,3200 +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,3600 +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,4000 diff --git a/scripts/concatOutputLc.sh b/scripts/concatOutputLc.sh index fedaac5db39701d24660528ddad63b07af21a02b..c40ea7a7355b1a6b584870f54ae9b25cbf94ef10 100755 --- a/scripts/concatOutputLc.sh +++ b/scripts/concatOutputLc.sh @@ -7,7 +7,7 @@ fi cd $1 concatLcFile=lc_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 find . -name "*lc.txt"|while read fname; do diff --git a/scripts/createHindScenarios.sh b/scripts/createHindScenarios.sh index 3507479fdef4d1deef527b3669164a54fa5498cd..2b284af9eabcc0cb9d898ca507c8b26a3dbf7423 100755 --- a/scripts/createHindScenarios.sh +++ b/scripts/createHindScenarios.sh @@ -52,8 +52,8 @@ do run_config_file=$scenario_dir/config.properties cp $common_run_file $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 "CLUSTERED_YIELD_FILE=$scenario_dir/calib/cluster.asc" >> $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 for index in "${!array[@]}" do diff --git a/scripts/scheduleHindScenarios.sh b/scripts/scheduleHindScenarios.sh index 2e3138c50f31674d0b007827d415ecf37ad82ad7..85db45324149f298fe806989fde0a3bb261e629f 100755 --- a/scripts/scheduleHindScenarios.sh +++ b/scripts/scheduleHindScenarios.sh @@ -27,8 +27,10 @@ do continue; fi - 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 + echo "qsub -N ${ensemble}_$scenario /exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/runPlum.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 done < $filename diff --git a/src/ac/ed/lurg/ModelMain.java b/src/ac/ed/lurg/ModelMain.java index a91ebfc086cf6fad619ce920947bdd2534d31ca6..4a6ef5fff1d867bc2847d5b97bf4f7188d6eb473 100644 --- a/src/ac/ed/lurg/ModelMain.java +++ b/src/ac/ed/lurg/ModelMain.java @@ -103,7 +103,7 @@ public class ModelMain { 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.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(); } diff --git a/src/ac/ed/lurg/country/GlobalPrice.java b/src/ac/ed/lurg/country/GlobalPrice.java index 3a8658376d00efc04363c6f2e5a05ff8f67557da..76894a67b918de459b8d8e36ab18cabfe66af7b7 100644 --- a/src/ac/ed/lurg/country/GlobalPrice.java +++ b/src/ac/ed/lurg/country/GlobalPrice.java @@ -44,6 +44,8 @@ public class GlobalPrice { ratio = (imports-exports)/exports; 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); } else {