Merge pull request magpiemodel#510 from pfuehrlich-pik/develop

magpie release 4.6.3

.zenodo.json

@@ -1,6 +1,6 @@
 {
   "title": "MAgPIE - An Open Source land-use modeling framework",
-  "version": "4.6.2",
+  "version": "4.6.3",
   "creators": [
     {
       "name": "Dietrich, Jan Philipp",
@@ -109,5 +109,5 @@
   "license": {
     "id": "AGPL-3.0-or-later"
   },
-  "publication_date": "2023-01-12"
+  "publication_date": "2023-01-19"
 }

CHANGELOG.md

@@ -6,6 +6,27 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## [4.6.3] - 2023-01-19
+
+### changed
+- **15_food** changed `anthro_iso_jun22` realisation such that results in case of `exo_diet = 1/0` and `exo_waste = 1/0` are identical until 2020
+- **30_crop** identical assumptions for bioenergy until 2020
+- **38_factor_costs** changed name of set `req` to `factors` (also used in 11_costs, 57_maccs, 70_livestock)
+- **38_factos_costs** sticky_labor realization: included option to set a labor share target
+- **62_material** Bioplastic demand identical in all scenarios until 2020
+- **config** added `s38_target_labor_share`, `s38_targetyear_labor_share` and `s38_target_fulfillment` to define labor share target scnarios
+- **config** and **38_factor_costs** changed name of `s38_fix_capital_need` to `s38_startyear_labor_substitution`
+- **config** update input data to rev4.79
+
+### added
+- **31_past** added additional limitation (single climate scenario input) for **grasslands_apr22**
+- **59_som** added new **cellpool_jan23** realization with updated 2019 IPCC guidelines values
+- **scripts** added start script which starts an empty model just regenerating a previous run
+
+### fixed
+- **scripts** make sure that `c_title` in the GAMS code is not containing dots which otherwise could lead to compilation errors
+
+
 ## [4.6.2] - 2023-01-12
 
 ### changed
@@ -591,7 +612,8 @@ This release version is focussed on consistency between the MAgPIE setup and the
 First open source release of the framework. See [MAgPIE 4.0 paper](https://doi.org/10.5194/gmd-12-1299-2019) for more information.
 
 
-[Unreleased]: https://github.com/magpiemodel/magpie/compare/v4.6.2...develop
+[Unreleased]: https://github.com/magpiemodel/magpie/compare/v4.6.3...develop
+[4.6.3]: https://github.com/magpiemodel/magpie/compare/v4.6.2...v4.6.3
 [4.6.2]: https://github.com/magpiemodel/magpie/compare/v4.6.1...v4.6.2
 [4.6.1]: https://github.com/magpiemodel/magpie/compare/v4.6.0...v4.6.1
 [4.6.0]: https://github.com/magpiemodel/magpie/compare/v4.5.0...v4.6.0

CITATION.cff

@@ -125,8 +125,8 @@ authors:
     email: [email protected]
 
 title: MAgPIE - An Open Source land-use modeling framework
-version: 4.6.2
-date-released: 2023-01-12
+version: 4.6.3
+date-released: 2023-01-19
 repository-code: https://github.com/magpiemodel/magpie
 keywords:
   - landuse

README.md

@@ -24,8 +24,8 @@ https://www.pik-potsdam.de/research/projects/activities/land-use-modelling/magpi
 A framework description paper has been published in
 Geoscientific Model Development (GMD): https://doi.org/10.5194/gmd-12-1299-2019
 
-The model documentation for version 4.6.2 can be found at
-https://rse.pik-potsdam.de/doc/magpie/4.6.2/
+The model documentation for version 4.6.3 can be found at
+https://rse.pik-potsdam.de/doc/magpie/4.6.3/
 
 A most recent version of the documentation can also be extracted from the
 model source code via the R package goxygen
@@ -188,7 +188,7 @@ [email protected]
 Please contact [email protected]
 
 ## CITATION
-See file CITATION.cff or the [How-to-Cite section](https://rse.pik-potsdam.de/doc/magpie/4.6.2/#how-to-cite) in the model documentation for information how to cite the model.
+See file CITATION.cff or the [How-to-Cite section](https://rse.pik-potsdam.de/doc/magpie/4.6.3/#how-to-cite) in the model documentation for information how to cite the model.
 
 ## AUTHORS
 See list of authors in CITATION.cff

config/default.cfg

@@ -22,9 +22,9 @@ cfg$model <- "main.gms"   #def = "main.gms"
 #### input settings ####
 
 # which input data sets should be used?
-cfg$input <- c(regional    = "rev4.77_h12_magpie.tgz",
-               cellular    = "rev4.77_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz",
-               validation  = "rev4.77_h12_validation.tgz",
+cfg$input <- c(regional    = "rev4.79_h12_magpie.tgz",
+               cellular    = "rev4.79_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz",
+               validation  = "rev4.79_h12_validation.tgz",
                additional  = "additional_data_rev4.36.tgz",
                calibration = "calibration_H12_09Jan23.tgz")
 
@@ -935,11 +935,25 @@ cfg$gms$factor_costs <- "per_ton_fao_may22"        # default = per_ton_fao_may22
 # NOTE: It is recommended to recalibrate the model when changing this setting!
 cfg$gms$c38_fac_req <- "glo"        # default "glo"
 
-# * Only relevant for sticky_labor implementation: scalar to determine until which year
-# * the capital need (per unit of output) should be fixed to start value (i.e. not
-# * allowing for substitution between labor and capital).
 
-cfg$gms$s38_fix_capital_need <- 2020    # default 2020
+# * Only relevant for sticky_labor implementation: 
+
+# * Year until which the capital share should be fixed to the historical values, not allowing for endogenous
+# * substitution between labor and capital.
+cfg$gms$s38_startyear_labor_substitution <- 2020    # default 2020
+
+# * The following two settings are to create exogenous scenarios in which capital is substituted by labor to increase 
+# * employment:
+# * The taget labor share defins a global target for labor share out of labor + capital needed per unit
+# * of output. If 0, no target is set.
+cfg$gms$s38_target_labor_share <- 0        # default 0
+
+# * The target year defines the year for which the global target labor share should be set.
+cfg$gms$s38_targetyear_labor_share <- 2050
+
+# * The target fulfillment share indicates the share by which a region moves from its baseline
+# * labor share towards the target value
+cfg$gms$s38_target_fulfillment <- 0.5   # default 0.5
 
 # ***---------------------    39_landconversion    -----------------------------
 # * (calib):    Costs for cropland expansion are scaled with a regional calibration factor
@@ -1488,6 +1502,8 @@ cfg$gms$s58_fix_peatland  <- 2015   # def = 2015
 # ***-------------------------    59_som   -------------------------------------
 # * (static_jan19): static soil carbon loss for cropland
 # * (cellpool_aug16): dynamic soil organic matter pool on cellular level
+# * (cellpool_jan23): dynamic soil organic matter pool on cellular level 
+# *                   with updated, regionalized stock change factors (IPCC guidelines 2019)
 cfg$gms$som <- "static_jan19"    # def = static_jan19
 
 # * static realization switch

config/scenario_config.csv

@@ -77,7 +77,7 @@ gms$s73_timber_demand_switch;;;;;;;;;;;;;;;;;;;;;1;1;1;1;1;;;;;1;1;0;;;;;;;;;;;
 gms$s35_forest_damage;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4;4;4;4;4;;;;;;
 gms$c32_shock_scenario;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;none;002lin2030;004lin2030;008lin2030;016lin2030;;;;;;
 gms$c35_shock_scenario;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;none;002lin2030;004lin2030;008lin2030;016lin2030;;;;;;
-input['cellular'];;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;rev4.77_h12_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.77_h12_6819938d_cellularmagpie_c200_MRI-ESM2-0-ssp126_lpjml-8e6c5eb1.tgz;rev4.77_h12_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;rev4.77_h12_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;rev4.77_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz;rev4.77_h12_09a63995_cellularmagpie_c200_MRI-ESM2-0-ssp585_lpjml-8e6c5eb1.tgz
+input['cellular'];;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;rev4.79_h12_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.79_h12_6819938d_cellularmagpie_c200_MRI-ESM2-0-ssp126_lpjml-8e6c5eb1.tgz;rev4.79_h12_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;rev4.79_h12_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;rev4.79_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz;rev4.79_h12_09a63995_cellularmagpie_c200_MRI-ESM2-0-ssp585_lpjml-8e6c5eb1.tgz
 gms$c52_land_carbon_sink_rcp;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;RCP19;RCP26;RCP45;RCP60;RCPBU;RCPBU
 gms$c57_macc_version;;;;;;;;;;;;;;;;;;;;;;;;;;PBL_2022;PBL_2022;PBL_2022;PBL_2022;;;;;;;;;;;;;;
 gms$c57_macc_scenario;;;;;;;;;;;;;;;;;;;;;;;;;;Default;Optimistic;Default;Optimistic;;;;;;;;;;;;;;

config/scenario_fsec.csv

@@ -58,9 +58,9 @@ gms$s62_max_dem_bioplastic;0;;;;400;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$c70_fac_req_regr;reg;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$c70_feed_scen;;;;;;;;;;;;;;;;;ssp1;;;;;;;;;;;;;;;;;;;;;;;
 gms$c73_build_demand;;;;;;;;;;;;;;;;;;;;;;;50pc;;;;;;;;;;;;;;;;;
-input['cellular'];rev4.78FSEC_e2bdb6cd_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;rev4.78FSEC_e2bdb6cd_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.78FSEC_e2bdb6cd_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.78FSEC_e2bdb6cd_6819938d_cellularmagpie_c200_MRI-ESM2-0-ssp126_lpjml-8e6c5eb1.tgz;rev4.78FSEC_e2bdb6cd_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;rev4.78FSEC_e2bdb6cd_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz;rev4.78FSEC_e2bdb6cd_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;rev4.78FSEC_e2bdb6cd_09a63995_cellularmagpie_c200_MRI-ESM2-0-ssp585_lpjml-8e6c5eb1.tgz
-input['regional'];rev4.78FSEC_e2bdb6cd_magpie.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-input['validation'];rev4.78FSEC_e2bdb6cd_validation.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+input['cellular'];rev4.79FSEC_e2bdb6cd_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;rev4.79FSEC_e2bdb6cd_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.79FSEC_e2bdb6cd_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.79FSEC_e2bdb6cd_6819938d_cellularmagpie_c200_MRI-ESM2-0-ssp126_lpjml-8e6c5eb1.tgz;rev4.79FSEC_e2bdb6cd_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;rev4.79FSEC_e2bdb6cd_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz;rev4.79FSEC_e2bdb6cd_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;rev4.79FSEC_e2bdb6cd_09a63995_cellularmagpie_c200_MRI-ESM2-0-ssp585_lpjml-8e6c5eb1.tgz
+input['regional'];rev4.79FSEC_e2bdb6cd_magpie.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+input['validation'];rev4.79FSEC_e2bdb6cd_validation.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 input['additional'];additional_data_rev4.36.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 input['calibration'];calibration_FSEC_28Nov22.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 magicc_emis_scen;bjoernAR6_C_SSP2-NDC.mif;;;bjoernAR6_C_SSP2-PkBudg900.mif;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;bjoernAR6_C_SSP1-NDC.mif;;;;

literature.bib

@@ -1115,6 +1115,12 @@ @techreport{ipcc_2006_2006
 	year = {2006}
 }
 
+@misc{calvo_buendia_ipcc_2019,
+  title     = {{{IPCC}} 2019, 2019 {{Refinement}} to the 2006 {{IPCC Guidelines}} for {{National Greenhouse Gas Inventories}},},
+  publisher = {Published: IPCC, Switzerland},
+  year      = {2019},
+  editor    = {E. {Calvo Buendia} and K. Tanabe and A. Kranjc and J. Baasansuren and M. Fukuda and S. Ngarize and A.Osako and Y. Pyrozhenko and P. Shermanau and S. Federici (eds)},
+}
 
 @article{lal_world_2005,
 	title = {World crop residues production and implications of its use as a biofuel},

main.gms

@@ -146,25 +146,25 @@ $title magpie
 
 *##################### R SECTION START (VERSION INFO) ##########################
 * 
-* Used data set: rev4.77_h12_magpie.tgz
-* md5sum: NA
-* Repository: https://rse.pik-potsdam.de/data/magpie/public
+* Used data set: rev4.79_h12_magpie.tgz
+* md5sum: 4f3f5fd72716fe371d646c69c30e6fd3
+* Repository: /p/projects/rd3mod/inputdata/output
 * 
-* Used data set: rev4.77_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.79_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz
+* md5sum: a18af444eb4a3d24956f66e31e8634d8
+* Repository: /p/projects/rd3mod/inputdata/output
 * 
-* Used data set: rev4.77_h12_validation.tgz
-* md5sum: NA
-* Repository: https://rse.pik-potsdam.de/data/magpie/public
+* Used data set: rev4.79_h12_validation.tgz
+* md5sum: 0a617c2999127a50146ac106cd6ee4bf
+* Repository: /p/projects/rd3mod/inputdata/output
 * 
-* Used data set: additional_data_rev4.33.tgz
-* md5sum: NA
-* Repository: https://rse.pik-potsdam.de/data/magpie/public
+* Used data set: additional_data_rev4.36.tgz
+* md5sum: e24c46872f77dc15ad8603bdac1e6065
+* Repository: /p/projects/rd3mod/mirror/rse.pik-potsdam.de/data/magpie/public
 * 
-* Used data set: calibration_H12_per_ton_fao_may22_glo_23Nov22.tgz
-* md5sum: NA
-* Repository: https://rse.pik-potsdam.de/data/magpie/public
+* Used data set: calibration_H12_09Jan23.tgz
+* md5sum: 0fd18901ec047862918bf598ac126411
+* Repository: /p/projects/rd3mod/mirror/rse.pik-potsdam.de/data/magpie/public
 * 
 * Low resolution: c200
 * High resolution: 0.5
@@ -177,11 +177,11 @@ $title magpie
 * 
 * Regionscode: 62eff8f7
 * 
-* Regions data revision: 4.77
+* Regions data revision: 4.79
 * 
 * lpj2magpie settings:
 * * LPJmL data: MRI-ESM2-0:ssp370
-* * Revision: 4.77
+* * Revision: 4.79
 * 
 * aggregation settings:
 * * Input resolution: 0.5
@@ -193,7 +193,7 @@ $title magpie
 * * Call: withCallingHandlers(expr, message = messageHandler, warning = warningHandler,     error = errorHandler)
 * 
 * 
-* Last modification (input data): Thu Dec 08 10:40:17 2022
+* Last modification (input data): Tue Jan 17 11:25:32 2023
 * 
 *###################### R SECTION END (VERSION INFO) ###########################
 

modules/11_costs/default/equations.gms

@@ -12,11 +12,11 @@
 *' The global costs of production are represented by the sum of regional
 *' production costs of different production activities.
 
- q11_cost_reg(i2) .. v11_cost_reg(i2) =e= sum(req,vm_cost_prod_crop(i2,req))
+ q11_cost_reg(i2) .. v11_cost_reg(i2) =e= sum(factors,vm_cost_prod_crop(i2,factors))
                    + sum(kres,vm_cost_prod_kres(i2,kres))
                    + vm_cost_prod_past(i2)
                    + vm_cost_prod_fish(i2)
-                   + sum(req,vm_cost_prod_livst(i2,req))
+                   + sum(factors,vm_cost_prod_livst(i2,factors))
                    + sum((cell(i2,j2),land), vm_cost_landcon(j2,land))
                    + sum((cell(i2,j2),k), vm_cost_transp(j2,k))
                    + vm_tech_cost(i2)
@@ -25,7 +25,7 @@
                    + vm_p_fert_costs(i2)
                    + vm_emission_costs(i2)
                    - vm_reward_cdr_aff(i2)
-                   + sum(req,vm_maccs_costs(i2,req))
+                   + sum(factors,vm_maccs_costs(i2,factors))
                    + vm_cost_AEI(i2)
                    + vm_cost_trade(i2)
                    + vm_cost_fore(i2)

modules/15_food/anthro_iso_jun22/exodietmacro.gms

@@ -336,6 +336,11 @@ $endif
   p15_bmi_shr_calibrated(t,iso,sex,age,bmi_group15) = p15_bmi_shr_calibrated(t,iso,sex,age,bmi_group15) * (1-i15_exo_foodscen_fader(t,iso))
                       + p15_bmi_shr_target(t,iso,sex,age,bmi_group15) * i15_exo_foodscen_fader(t,iso);
 
+
+);
+*' End of special postprocessing food demand scenarios.
+
+
 *' 4.) The fourth step estimates the calorie supply at household level by multiplying
 *' daily per capita calorie intake with the demand2intake ratio that was estimated
 *' previously. It assures that if commodities with higher food waste ratio are
@@ -352,14 +357,6 @@ $endif
          (sum(kfo,p15_kcal_pc_iso(t,iso,kfo)) / p15_intake_total(t,iso))$(
            p15_intake_total(t,iso) > 0);
 
-  p15_demand2intake_ratio_detail(t,iso,kfo)=1$(p15_intake_detail(t,iso,kfo) = 0) +
-  (p15_kcal_pc_iso(t,iso,kfo) / p15_intake_detail(t,iso,kfo))$(p15_intake_detail(t,iso,kfo) > 0);
-
-);
-*' End of special postprocessing food demand scenarios.
-
-
-
 
 * ###### Exogenous food waste scenario
 
@@ -372,6 +369,8 @@ $endif
                       = p15_demand2intake_ratio(t,iso)*(1-i15_exo_foodscen_fader(t,iso))
                         + s15_waste_scen*i15_exo_foodscen_fader(t,iso);
 
+);
+
 *' waste calculation by crop type
 
     p15_waste_pc(t,iso,kfo)$(sum(kfo2, p15_waste_pc(t,iso,kfo2))<>0) = p15_waste_pc(t,iso,kfo) / sum(kfo2, p15_waste_pc(t,iso,kfo2))*
@@ -380,13 +379,10 @@ $endif
 *' Waste ratio is applied
     p15_kcal_pc_iso(t,iso,kfo) = p15_intake_detail(t,iso,kfo) + p15_waste_pc(t,iso,kfo);
 
+*' Demand intake detail
     p15_demand2intake_ratio_detail(t,iso,kfo)=1$(p15_intake_detail(t,iso,kfo) = 0) +
                   (p15_kcal_pc_iso(t,iso,kfo) / p15_intake_detail(t,iso,kfo))$(p15_intake_detail(t,iso,kfo) > 0);
 
-);
-
-
-
 
 *' The country-level parameter p15_kcal_pc_iso is aggregated to the
 *' regional level. After removing estimates from countries that are not included

modules/30_crop/endo_apr21/input.gms

@@ -11,7 +11,7 @@ $setglobal c30_bioen_type  all
 $setglobal c30_bioen_water  rainfed
 * options: rainfed, irrigated, all
 
-$setglobal c30_marginal_land  all_marginal
+$setglobal c30_marginal_land  q33_marginal
 * options: all_marginal, q33_marginal, no_marginal
 
 $setglobal c30_snv_target  none
@@ -61,6 +61,14 @@ sets
 land_snv(land) land types allowed in the SNV policy / secdforest, forestry, past, other /
 ;
 
+$ifthen "%c30_bioen_type%" == "all" bioen_type_30(kbe30) = yes;
+$else bioen_type_30("%c30_bioen_type%") = yes;
+$endif
+
+$ifthen "%c30_bioen_water%" == "all" bioen_water_30(w) = yes;
+$else bioen_water_30("%c30_bioen_water%") = yes;
+$endif
+
 ********* CROPAREA INITIALISATION **********************************************
 
 table fm_croparea(t_all,j,w,kcr) Different croparea type areas (mio. ha)

modules/30_crop/endo_apr21/presolve.gms

@@ -5,21 +5,19 @@
 *** |  MAgPIE License Exception, version 1.0 (see LICENSE file).
 *** |  Contact: [email protected]
 
-$ifthen "%c30_bioen_type%" == "all" bioen_type_30(kbe30) = yes;
-$else bioen_type_30("%c30_bioen_type%") = yes;
-$endif
-
-$ifthen "%c30_bioen_water%" == "all" bioen_water_30(w) = yes;
-$else bioen_water_30("%c30_bioen_water%") = yes;
-$endif
-
 *' @code
 *' First, all 2nd generation bioenergy area is fixed to zero, irrespective of type and
 *' rainfed/irrigation.
 vm_area.fx(j,kbe30,w)=0;
 *' Second, the bounds for 2nd generation bioenergy area are released depending on
 *' the dynamic sets bioen_type_30 and bioen_water_30.
-vm_area.up(j,bioen_type_30,bioen_water_30)=Inf;
+*' SSP2 default settings are used for the historic period.
+if(m_year(t) <= sm_fix_SSP2,
+	vm_area.up(j,kbe30,"rainfed") = Inf;
+else
+	vm_area.up(j,bioen_type_30,bioen_water_30) = Inf;
+);
+
 *' @stop
 
 *' No penalties or fallows exist in this realization

modules/30_crop/penalty_apr22/input.gms

@@ -67,6 +67,14 @@ sets
 land_snv(land) land types allowed in the SNV policy / secdforest, forestry, past, other /
 ;
 
+$ifthen "%c30_bioen_type%" == "all" bioen_type_30(kbe30) = yes;
+$else bioen_type_30("%c30_bioen_type%") = yes;
+$endif
+
+$ifthen "%c30_bioen_water%" == "all" bioen_water_30(w) = yes;
+$else bioen_water_30("%c30_bioen_water%") = yes;
+$endif
+
 ********* CROPAREA INITIALISATION **********************************************
 
 table fm_croparea(t_all,j,w,kcr) Different croparea type areas (mio. ha)