defaults

magpiemodel · May 17, 2024 · cae41c4 · cae41c4
1 parent 0c8311f
commit cae41c4
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 12 deletions.
diff --git a/config/default.cfg b/config/default.cfg
@@ -25,7 +25,7 @@ cfg$model <- "main.gms"   #def = "main.gms"
 cfg$input <- c(regional    = "rev4.105_h12_magpie.tgz",
                cellular    = "rev4.105_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz",
                validation  = "rev4.105_h12_validation.tgz",
-               additional  = "additional_data_rev4.51.tgz",
+               additional  = "additional_data_rev4.50.tgz",
                calibration = "calibration_H12_26Mar24.tgz")
 
 # NOTE: It is recommended to recalibrate the model when changing cellular input data

diff --git a/config/scenario_fsec.csv b/config/scenario_fsec.csv
@@ -77,6 +77,6 @@ gms$c73_build_demand;;;;;;;;;;;;;;;;;;;;;;;;50pc;;;;;;;;;;;;;;;;;;;;;;;;;;;
 input['cellular'];rev4.105_FSEC_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;rev4.105_FSEC_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.105_FSEC_6819938d_cellularmagpie_c200_MRI-ESM2-0-ssp126_lpjml-8e6c5eb1.tgz;;rev4.105_FSEC_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;rev4.105_FSEC_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;rev4.105_FSEC_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz;rev4.105_FSEC_09a63995_cellularmagpie_c200_MRI-ESM2-0-ssp585_lpjml-8e6c5eb1.tgz;;;
 input['regional'];rev4.105_FSEC_magpie.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 input['validation'];rev4.105_FSEC_validation.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-input['additional'];additional_data_rev4.51.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+input['additional'];additional_data_rev4.50.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 input['calibration'];calibration_FSEC_26Mar24.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 magicc_emis_scen;bjoernAR6_C_SSP2-NDC.mif;;;bjoernAR6_C_SSP2-PkBudg900.mif;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;bjoernAR6_C_SSP1-NDC.mif;;;;;;;;;;;;bjoernAR6_C_RemSDP-900-MagSSP1.mif;;
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)  / 1000000 /
+ s44_cost_bii_missing     Technical costs for missing BII increase (USD per unit of BII)  / 1e+06 /
 ;
 
 

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)  / 1000000 /
+ s44_cost_bii_missing     Technical costs for missing BII increase (USD per unit of BII)  / 1e+06 /
 ;
 
 

diff --git a/modules/56_ghg_policy/price_aug22/sets.gms b/modules/56_ghg_policy/price_aug22/sets.gms
@@ -102,19 +102,15 @@ sets
       all,
       all_nosoil,
       redd_nosoil,
-      redd_nosoil_CH4GWP20,
       redd_nosoil_nopeat,
       redd_nosoil_peatCO2only,
       reddnatveg_nosoil,
-      reddnatveg_nosoil_CH4GWP20,
       reddnatveg_nosoil_nopeat,
       reddnatveg_nosoil_peatCO2only,
       redd+_nosoil,
-      redd+_nosoil_CH4GWP20,
       redd+_nosoil_nopeat,
       redd+_nosoil_peatCO2only,
       redd+natveg_nosoil,
-      redd+natveg_nosoil_CH4GWP20,
       redd+natveg_nosoil_nopeat,
       redd+natveg_nosoil_peatCO2only,
       all_vegc,

diff --git a/modules/58_peatland/v2/input.gms b/modules/58_peatland/v2/input.gms
@@ -13,7 +13,7 @@ scalars
   s58_cost_drain_rewet_onetime One-time costs for drainage of rewetted peatland (USD05MER per ha) / 0 /
   s58_rewetting_switch Peatland rewetting on (Inf) or off (0) / Inf /
   s58_fix_peatland Year indicating until when peatland area should be fixed (year) / 2020 /
-  s58_balance_penalty Penalty for technical peatland balance term (USD05MER) / 1000000 /
+  s58_balance_penalty Penalty for technical peatland balance term (USD05MER) / 1e+06 /
 ;
 
 *Peatland area based on Global Peatland Map 2.0 and Global Peatland Database

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  exp
-$setglobal c60_2ndgen_biodem  R21M42-SSP2-Npi-PhaseOut50
-$setglobal c60_2ndgen_biodem_noselect  R21M42-SSP2-NPi
+$setglobal c60_price_implementation  lin
+$setglobal c60_2ndgen_biodem  R32M46-SSP2EU-NPi
+$setglobal c60_2ndgen_biodem_noselect  R32M46-SSP2EU-NPi
 
 
 $if "%c60_2ndgen_biodem%" == "coupling" table f60_bioenergy_dem_coupling(t_all,i) Bioenergy demand (regional) (mio. GJ per yr)