Revert last commit

jansteinhauser · Apr 17, 2024 · 2b433dd · 2b433dd
1 parent 2bae7ad
commit 2b433dd
Show file tree

Hide file tree

Showing 8 changed files with 316 additions and 157 deletions.
diff --git a/.RData b/.RData
diff --git a/main.gms b/main.gms
@@ -147,40 +147,44 @@ $title magpie
 *'  * Always try to access model outputs through the corresponding magpie package instead of accessing them directly with readGDX. It cannot be guaranteed that your script will work in the future if you do otherwise (as only the corresponding magpie package will be continuously adapted to changes in the GAMS code).
 
 *##################### R SECTION START (VERSION INFO) ##########################
-* 
-* Used data set: rev4.104_h12_magpie.tgz
+*
+* Used data set: rev4.99_h12_magpie.tgz
 * md5sum: NA
-* Repository: https://rse.pik-potsdam.de/data/magpie/public
-* 
-* Used data set: rev4.104_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz
+* Repository: scp://cluster.pik-potsdam.de/p/projects/rd3mod/inputdata/output
+*
+* Used data set: rev4.99_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz
 * md5sum: NA
-* Repository: https://rse.pik-potsdam.de/data/magpie/public
-* 
-* Used data set: rev4.104_h12_validation.tgz
+* Repository: scp://cluster.pik-potsdam.de/p/projects/rd3mod/inputdata/output
+*
+* Used data set: rev4.99_h12_validation.tgz
 * md5sum: NA
-* Repository: https://rse.pik-potsdam.de/data/magpie/public
-* 
-* Used data set: calibration_H12_26Mar24.tgz
+* Repository: scp://cluster.pik-potsdam.de/p/projects/rd3mod/inputdata/output
+*
+* Used data set: additional_data_rev4.47.tgz
+* md5sum: NA
+* Repository: scp://cluster.pik-potsdam.de/p/projects/landuse/data/input/archive
+*
+* Used data set: calibration_H12_per_ton_fao_may22_glo_08Aug23.tgz
 * md5sum: NA
 * Repository: https://rse.pik-potsdam.de/data/magpie/public
-* 
+*
 * Low resolution: c200
 * High resolution: 0.5
-* 
+*
 * Total number of cells: 200
-* 
+*
 * Number of cells per region:
 *   CAZ  CHA  EUR  IND  JPN  LAM  MEA  NEU  OAS  REF  SSA  USA
 *    14   23   10    7    4   26   21    9   16   23   32   15
-* 
+*
 * Regionscode: 62eff8f7
-* 
-* Regions data revision: 4.104
-* 
+*
+* Regions data revision: 4.99
+*
 * lpj2magpie settings:
 * * LPJmL data: MRI-ESM2-0:ssp370
-* * Revision: 4.104
-* 
+* * Revision: 4.99
+*
 * aggregation settings:
 * * Input resolution: 0.5
 * * Output resolution: c200
@@ -189,10 +193,10 @@ $title magpie
 *   CAZ  CHA  EUR  IND  JPN  LAM  MEA  NEU  OAS  REF  SSA  USA
 *    14   23   10    7    4   26   21    9   16   23   32   15
 * * Call: withCallingHandlers(expr, message = messageHandler, warning = warningHandler,     error = errorHandler)
-* 
-* 
-* Last modification (input data): Wed Apr 17 11:38:33 2024
-* 
+*
+*
+* Last modification (input data): Wed Feb  7 15:35:14 2024
+*
 *###################### R SECTION END (VERSION INFO) ###########################
 
 $offupper
@@ -262,7 +266,7 @@ $setglobal transport  gtap_nov12
 $setglobal area_equipped_for_irrigation  endo_apr13
 $setglobal water_demand  all_sectors_aug13
 $setglobal water_availability  total_water_aug13
-$setglobal biodiversity  bii_target_apr24
+$setglobal biodiversity  bii_target
 $setglobal climate  static
 
 $setglobal nr_soil_budget  macceff_aug22

diff --git a/modules/44_biodiversity/bii_target/input.gms b/modules/44_biodiversity/bii_target/input.gms
@@ -10,7 +10,7 @@ scalars
  c44_bii_decrease       Implementation of lower bound for BII (binary)          / 1 /
  s44_target_year        Year in which the BII lower bound is reached  (1)       / 2100 /
  s44_start_year         Start year for interpolation towards BII lower bound (1)    / 2025 /
- s44_cost_bii_missing     Technical costs for missing BII increase (USD per unit of BII)  / 1e+06 /
+ s44_cost_bii_missing     Technical costs for missing BII increase (USD per unit of BII)  / 1000000 /
 ;
 
 

diff --git a/modules/44_biodiversity/bii_target_apr24/input.gms b/modules/44_biodiversity/bii_target_apr24/input.gms
@@ -10,7 +10,7 @@ scalars
  c44_bii_decrease       Implementation of lower bound for BII (binary)          / 1 /
  s44_target_year        Year in which the BII lower bound is reached  (1)       / 2100 /
  s44_start_year         Start year for interpolation towards BII lower bound (1)    / 2025 /
- s44_cost_bii_missing     Technical costs for missing BII increase (USD per unit of BII)  / 1e+06 /
+ s44_cost_bii_missing     Technical costs for missing BII increase (USD per unit of BII)  / 1000000 /
 ;
 
 

diff --git a/modules/60_bioenergy/1st2ndgen_priced_feb24/input.gms b/modules/60_bioenergy/1st2ndgen_priced_feb24/input.gms
@@ -43,9 +43,9 @@ scalars
   s60_2ndgen_bioenergy_dem_min_post_fix Minimum dedicated 2nd generation bioenergy demand assumed in each region after SSP2-fix  (mio. GJ per yr) / 1 /
 ;
 
-$setglobal c60_price_implementation  lin
-$setglobal c60_2ndgen_biodem  R32M46-SSP2EU-NPi
-$setglobal c60_2ndgen_biodem_noselect  R32M46-SSP2EU-NPi
+$setglobal c60_price_implementation  exp
+$setglobal c60_2ndgen_biodem  R21M42-SSP2-Npi-PhaseOut50
+$setglobal c60_2ndgen_biodem_noselect  R21M42-SSP2-NPi
 
 
 $if "%c60_2ndgen_biodem%" == "coupling" table f60_bioenergy_dem_coupling(t_all,i) Bioenergy demand (regional) (mio. GJ per yr)

diff --git a/patch_input/MMEmuR12_rev4.87.tgz b/patch_input/MMEmuR12_rev4.87.tgz
diff --git a/patch_input/MMEmuR12_rev4.96.tgz b/patch_input/MMEmuR12_rev4.96.tgz