Merge pull request #28 from magpiemodel/develop

Develop update
magpiemodel · Sep 4, 2023 · 2b2c6f2 · 2b2c6f2
2 parents 4e49574 + 1aff049
commit 2b2c6f2
Show file tree

Hide file tree

Showing 30 changed files with 286 additions and 174 deletions.
diff --git a/.github/workflows/test-code.yaml b/.github/workflows/test-code.yaml
@@ -18,20 +18,15 @@ jobs:
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Remove .Rprofile
         run: rm .Rprofile
 
       - uses: r-lib/actions/setup-r@v2
         with:
-          extra-repositories: https://cloud.r-project.org https://rse.pik-potsdam.de/r/packages/
-
-      - name: Install R dependencies
-        uses: r-lib/actions/setup-r-dependencies@v2
-        with:
-          packages: gms
-          extra-packages: gms
+          use-public-rspm: true
+          extra-repositories: "https://rse.pik-potsdam.de/r/packages"
 
       - name: pre-commit Hook
         run: source(".githooks/pre-commit")

diff --git a/.zenodo.json b/.zenodo.json
@@ -1,6 +1,6 @@
 {
   "title": "MAgPIE - An Open Source land-use modeling framework",
-  "version": "4.6.8dev",
+  "version": "4.6.10dev",
   "creators": [
     {
       "name": "Dietrich, Jan Philipp",
@@ -109,5 +109,5 @@
   "license": {
     "id": "AGPL-3.0-or-later"
   },
-  "publication_date": "2023-07-17"
+  "publication_date": "2023-08-16"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,7 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [Unreleased]
 
 ### changed
--
+- **scripts** All time steps between 2015 and 2050 are now reported to SEALS
 
 ### added
 -
@@ -17,14 +17,35 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 -
 
 ### fixed
--
+- **70_livestock** fixed division by zero that could occur depending on the scenario set-up
+
+
+## [4.6.10] - 2023-08-16
+
+### changed
+- **config**  update preprocessing to newest input data v4.88 with new transport costs
+- **GitHub action** the github action is now faster, because it installs binary packages from Posit Package Manager
+- **scenario_config.csv** update preprocessing to newest input data v4.88
+- **scripts** output.R is now faster, because it no longer searches runfolder renvs for full.gms files
+
+### fixed
+- **scripts** check_config does not warn about c_input_gdx_path anymore while running empty model
+- **scripts** fixed erronoeous if clause in output.R
+- **scripts** fixed output/extra/disaggregation_LUH2.R. The script was not working any more because magpie4::protectedArea was changed to return protected area for all land types. Moreover, the script now also works for runs without dynamic forestry (default run) but with a warning message.
+
+
+## [4.6.9] - 2023-07-27
+
+### fixed
+- **70_livestock** consideration of milk demand in the calculation of the pasture management factor
+- **scripts** Fixed inaccuracies and inconsistent application of SNV policies during disaggregation in luscale::interpolateAvlCroplandWeighted(), which is called in extra/disaggregation.R
 
 
 ## [4.6.8] - 2023-07-17
 
 ### changed
 - **41_area_equipped_for_irrigation** new AEI data (Mehta2022) replacing old Siebert data
-- **80_optimization** printing of solprint when solver status is 7 re-activated 
+- **80_optimization** printing of solprint when solver status is 7 re-activated
 - **scripts** start_functions.R can now handle clusters per region flexibly
 - **scripts** the REMIND-MAgPIE coupling now uses renv
 - **41_area_equipped_for_irrigation** new AEI data (Mehta2022) replacing old Siebert data
@@ -50,6 +71,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - **config** corrected wrong names of parameters for peatland costs
 - **config** updated scenario configs to newest preprocessing (4.87)
 
+
 ## [4.6.7] - 2023-05-10
 
 ### changed
@@ -746,7 +768,9 @@ 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.8...develop
+[Unreleased]: https://github.com/magpiemodel/magpie/compare/v4.6.10...develop
+[4.6.10]: https://github.com/magpiemodel/magpie/compare/v4.6.9...v4.6.10
+[4.6.9]: https://github.com/magpiemodel/magpie/compare/v4.6.8...v4.6.9
 [4.6.8]: https://github.com/magpiemodel/magpie/compare/v4.6.7...v4.6.8
 [4.6.7]: https://github.com/magpiemodel/magpie/compare/v4.6.6...v4.6.7
 [4.6.6]: https://github.com/magpiemodel/magpie/compare/v4.6.5...v4.6.6

diff --git a/CITATION.cff b/CITATION.cff
@@ -125,8 +125,8 @@ authors:
     email: [email protected]
 
 title: MAgPIE - An Open Source land-use modeling framework
-version: 4.6.8dev
-date-released: 2023-07-17
+version: 4.6.10dev
+date-released: 2023-08-16
 repository-code: https://github.com/magpiemodel/magpie
 keywords:
   - landuse

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -17,7 +17,7 @@ Imports:
     iamc,
     lucode2 (>= 0.36.0),
     luplot,
-    luscale,
+    luscale (>= 2.27.9),
     lusweave,
     m4fsdp,
     madrat,

diff --git a/README.md b/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.8 can be found at
-https://rse.pik-potsdam.de/doc/magpie/4.6.8/
+The model documentation for version 4.6.10 can be found at
+https://rse.pik-potsdam.de/doc/magpie/4.6.10/
 
 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.8/#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.10/#how-to-cite) in the model documentation for information how to cite the model.
 
 ## AUTHORS
 See list of authors in CITATION.cff

diff --git a/config/default.cfg b/config/default.cfg
@@ -22,11 +22,11 @@ cfg$model <- "main.gms"   #def = "main.gms"
 #### input settings ####
 
 # which input data sets should be used?
-cfg$input <- c(regional    = "rev4.87_h12_magpie.tgz",
-               cellular    = "rev4.87_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz",
-               validation  = "rev4.87_h12_validation.tgz",
+cfg$input <- c(regional    = "rev4.88_h12_magpie.tgz",
+               cellular    = "rev4.88_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz",
+               validation  = "rev4.88_h12_validation.tgz",
                additional  = "additional_data_rev4.43.tgz",
-               calibration = "calibration_H12_per_ton_fao_may22_glo_08Jul23.tgz")
+               calibration = "calibration_H12_per_ton_fao_may22_glo_08Aug23.tgz")
 
 # NOTE: It is recommended to recalibrate the model when changing cellular input data
 #       as well as for any other setting that would affect initial values in the model,
@@ -95,7 +95,7 @@ cfg$restart_landconversion_cost <- FALSE           # def = FALSE
 # calibration factor in each calibration iteration (0-1)
 cfg$damping_factor_landconversion_cost <- 0.96        # def= 0.96
 # Set upper limit for cropland calibration factor
-cfg$cost_calib_max_landconversion_cost <- 3            # def= 3
+cfg$cost_calib_max_landconversion_cost <- 3         # def= 3
 # Set lower limit for cropland calibration factor
 cfg$cost_calib_min_landconversion_cost <- 0.05            # def= 0.05
 # Selection type of calibration factors.

diff --git a/config/scenario_config.csv b/config/scenario_config.csv
@@ -78,7 +78,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.87_h12_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.87_h12_6819938d_cellularmagpie_c200_MRI-ESM2-0-ssp126_lpjml-8e6c5eb1.tgz;rev4.87_h12_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;rev4.87_h12_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;rev4.87_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz;rev4.87_h12_09a63995_cellularmagpie_c200_MRI-ESM2-0-ssp585_lpjml-8e6c5eb1.tgz;
+input['cellular'];;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;rev4.88_h12_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.88_h12_6819938d_cellularmagpie_c200_MRI-ESM2-0-ssp126_lpjml-8e6c5eb1.tgz;rev4.88_h12_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;rev4.88_h12_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;rev4.88_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz;rev4.88_h12_09a63995_cellularmagpie_c200_MRI-ESM2-0-ssp585_lpjml-8e6c5eb1.tgz;
 gms$c52_land_carbon_sink_rcp;;nocc;nocc_hist;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;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;;;;;;;;;;;;;;;

diff --git a/modules/15_food/anthro_iso_jun22/declarations.gms b/modules/15_food/anthro_iso_jun22/declarations.gms
@@ -125,8 +125,7 @@ parameters
 
 * before shock
  o15_kcal_regr_initial(t,iso,kfo)             Uncalibrated per capita demand before price shock (kcal per capita per day)
- p15_kcal_pc_initial(t,i,kfo)                 Per capita consumption in food demand model before price shock on regional level (kcal per capita per day)
- pm_kcal_pc_initial(t,i,kfo)                  Per capita consumption in food demand model before price shock (kcal per capita per day)
+ pm_kcal_pc_initial(t,i,kall)                  Per capita consumption in food demand model before price shock (kcal per capita per day)
  p15_kcal_pc_initial_iso(t,iso,kfo)           Per capita consumption in food demand model before price shock on country level (kcal per capita per day)
 
 * after price shock

diff --git a/modules/15_food/anthro_iso_jun22/equations.gms b/modules/15_food/anthro_iso_jun22/equations.gms
@@ -9,7 +9,7 @@
 
 q15_food_demand(i2,kfo) ..
                 (vm_dem_food(i2,kfo) + sum(ct, f15_household_balanceflow(ct,i2,kfo,"dm")))
-                * sum(ct,(f15_nutrition_attributes(ct,kfo,"kcal") * 10**6)) =g=
+                * sum(ct,(fm_nutrition_attributes(ct,kfo,"kcal") * 10**6)) =g=
                 sum(ct,im_pop(ct,i2) * p15_kcal_pc_calibrated(ct,i2,kfo)) * 365
                 ;
 

diff --git a/modules/15_food/anthro_iso_jun22/exodietmacro.gms b/modules/15_food/anthro_iso_jun22/exodietmacro.gms
@@ -28,8 +28,7 @@ if (s15_run_diet_postprocessing = 1,
   p15_bmi_shr_regr(t,iso,sex,age,bmi_group15) = v15_bmi_shr_regr.l(iso,sex,age,bmi_group15);
 
   p15_bmi_shr_calibrated(t,iso,sex,age,bmi_group15) =
-         p15_bmi_shr_regr(t,iso,sex,age,bmi_group15)+
-         i15_bmi_shr_calib(t,iso,sex,age,bmi_group15);
+          p15_bmi_shr_regr(t,iso,sex,age,bmi_group15) + i15_bmi_shr_calib(t,iso,sex,age,bmi_group15) * s15_calibrate;
 
 * The BMI shares are not allowed to exceed the bounds 0 and 1. Values are corrected to the bounds.
   p15_bmi_shr_calibrated(t,iso,sex,age,bmi_group15)$(p15_bmi_shr_calibrated(t,iso,sex,age,bmi_group15)<0) = 0;
@@ -108,7 +107,7 @@ if (s15_run_diet_postprocessing = 1,
                  + p15_kcal_pc_iso_rumdairy_orig(t,iso) * (1- i15_rumdairy_fadeout(t,iso)));
 
 *** Substitution of ruminant meat and dairy products (kfo_rd) with single-cell protein (SCP) based on protein/cap/day
-  i15_protein_to_kcal_ratio(t,kfo) =  f15_nutrition_attributes(t,kfo,"protein")/f15_nutrition_attributes(t,kfo,"kcal");
+  i15_protein_to_kcal_ratio(t,kfo) =  fm_nutrition_attributes(t,kfo,"protein")/fm_nutrition_attributes(t,kfo,"kcal");
 * Before the substitution, kfo_rd is converted from kcal/cap/day to g protein/cap/day
 * using i15_protein_to_kcal_ratio(t,kfo_rd).
 * After the substitution of kfo_rd with SCP (1-i15_rumdairy_scp_fadeout), SCP is converted

diff --git a/modules/15_food/anthro_iso_jun22/input.gms b/modules/15_food/anthro_iso_jun22/input.gms
@@ -124,7 +124,7 @@ $ondelim
 $include "./modules/15_food/input/f15_household_balanceflow.cs3"
 $offdelim;
 
-table f15_nutrition_attributes(t_all,kall,nutrition) Nutrition attributes of food items dedicated for fooduse (mio. kcal per tDM | t Protein per tDM)
+table fm_nutrition_attributes(t_all,kall,nutrition) Nutrition attributes of food items dedicated for fooduse (mio. kcal per tDM | t Protein per tDM)
 $ondelim
 $include "./modules/15_food/input/f15_nutrition_attributes.cs3"
 $offdelim;

diff --git a/modules/15_food/anthro_iso_jun22/preloop.gms b/modules/15_food/anthro_iso_jun22/preloop.gms
@@ -92,7 +92,7 @@ $else
 $endif
 
 * initial prices in $US per Kcal
-i15_prices_initial_kcal(iso,kfo)$(f15_nutrition_attributes("y1995",kfo,"kcal")>0) = f15_prices_initial(kfo)
-                                                                                  / (f15_nutrition_attributes("y1995",kfo,"kcal")*10**6);
+i15_prices_initial_kcal(iso,kfo)$(fm_nutrition_attributes("y1995",kfo,"kcal")>0) = f15_prices_initial(kfo)
+                                                                                  / (fm_nutrition_attributes("y1995",kfo,"kcal")*10**6);
 p15_prices_kcal(t,iso,kfo,"iter1")=i15_prices_initial_kcal(iso,kfo);
 p15_convergence_measure(t,iter15)=NA;
diff --git a/modules/15_food/anthro_iso_jun22/sets.gms b/modules/15_food/anthro_iso_jun22/sets.gms
@@ -102,9 +102,6 @@ sets
    kfo_lp(kfo) Livestock food products
    / livst_rum,livst_pig,livst_chick, livst_egg, livst_milk /
 
-   kfo_rd(kfo) Ruminant meat and dairy food products
-   / livst_rum,livst_milk /
-
    kfo_st(kfo) Staple products
    / tece,maiz,trce,rice_pro,soybean,rapeseed,groundnut,sunflower,puls_pro,
    potato,cassav_sp,sugr_cane,sugr_beet,molasses,brans,scp /
@@ -148,6 +145,10 @@ sets
   livst_fadeoutscen15 Scenarios for changed composition of livestock products
        / halving2050, constant /
 
+* The set kfo_rd can be defined in default.cfg and is used in the food substitution scenarios c15_rumdairy_scp_scen and c15_rumdairyscen
+  kfo_rd(kfo) Ruminant meat and dairy food products
+       / livst_rum,livst_milk /
+
   fadeoutscen15  Food substitution scenarios including functional forms with targets and transition periods
        / constant,
          lin_zero_10_50, lin_zero_20_50, lin_zero_20_30, lin_zero_20_70, lin_50pc_20_50, lin_50pc_20_50_extend65, lin_50pc_20_50_extend80,

diff --git a/modules/15_food/anthropometrics_jan18/declarations.gms b/modules/15_food/anthropometrics_jan18/declarations.gms
@@ -126,8 +126,7 @@ parameters
 
 * before shock
  o15_kcal_regr_initial(t,iso,kfo)             Uncalibrated per capita demand before price shock (kcal per capita per day)
- p15_kcal_pc_initial(t,i,kfo)                 Per capita consumption in food demand model before price shock on regional level (kcal per capita per day)
- pm_kcal_pc_initial(t,i,kfo)                  Per capita consumption in food demand model before price shock (kcal per capita per day)
+ pm_kcal_pc_initial(t,i,kall)                  Per capita consumption in food demand model before price shock (kcal per capita per day)
  p15_kcal_pc_initial_iso(t,iso,kfo)           Per capita consumption in food demand model before price shock on country level (kcal per capita per day)
 
 * after price shock

diff --git a/modules/15_food/anthropometrics_jan18/equations.gms b/modules/15_food/anthropometrics_jan18/equations.gms
@@ -9,7 +9,7 @@
 
 q15_food_demand(i2,kfo) ..
                 (vm_dem_food(i2,kfo) + sum(ct, f15_household_balanceflow(ct,i2,kfo,"dm")))
-                * sum(ct,(f15_nutrition_attributes(ct,kfo,"kcal") * 10**6)) =g=
+                * sum(ct,(fm_nutrition_attributes(ct,kfo,"kcal") * 10**6)) =g=
                 sum(ct,im_pop(ct,i2) * p15_kcal_pc_calibrated(ct,i2,kfo)) * 365
                 ;
 

diff --git a/modules/15_food/anthropometrics_jan18/input.gms b/modules/15_food/anthropometrics_jan18/input.gms
@@ -105,7 +105,7 @@ $ondelim
 $include "./modules/15_food/input/f15_household_balanceflow.cs3"
 $offdelim;
 
-table f15_nutrition_attributes(t_all,kall,nutrition) Nutrition attributes of food items dedicated for fooduse (mio. kcal per tDM | t Protein per tDM)
+table fm_nutrition_attributes(t_all,kall,nutrition) Nutrition attributes of food items dedicated for fooduse (mio. kcal per tDM | t Protein per tDM)
 $ondelim
 $include "./modules/15_food/input/f15_nutrition_attributes.cs3"
 $offdelim;

diff --git a/modules/15_food/anthropometrics_jan18/intersolve.gms b/modules/15_food/anthropometrics_jan18/intersolve.gms
@@ -222,7 +222,7 @@ p15_kcal_pc_calibrated(t,i,kfo_pp) = p15_plant_kcal_structure_orig(t,i,kfo_pp)
                + p15_kcal_pc_calibrated_rumdairy_orig(t,i) * (1-i15_rumdairy_fadeout(t,i)));
 
 *** Substitution of ruminant meat and dairy products (kfo_rd) with single-cell protein (SCP) based on protein/cap/day
-i15_protein_to_kcal_ratio(t,kfo) =  f15_nutrition_attributes(t,kfo,"protein")/f15_nutrition_attributes(t,kfo,"kcal");
+i15_protein_to_kcal_ratio(t,kfo) =  fm_nutrition_attributes(t,kfo,"protein")/fm_nutrition_attributes(t,kfo,"kcal");
 * Before the substitution, kfo_rd is converted from kcal/cap/day to g protein/cap/day 
 * using i15_protein_to_kcal_ratio(t,kfo_rd).
 * After the substitution of kfo_rd with SCP (1-i15_rumdairy_scp_fadeout), SCP is converted

diff --git a/modules/15_food/anthropometrics_jan18/preloop.gms b/modules/15_food/anthropometrics_jan18/preloop.gms
@@ -98,7 +98,7 @@ i15_exo_foodscen_fader(t,i) = (1-f15_food_substitution_fader(t,"%c15_exo_foodsce
 
 
 * initial prices in $US per Kcal
-i15_prices_initial_kcal(iso,kfo)$(f15_nutrition_attributes("y1995",kfo,"kcal")>0) = f15_prices_initial(kfo)
-                                                                                  / (f15_nutrition_attributes("y1995",kfo,"kcal")*10**6);
+i15_prices_initial_kcal(iso,kfo)$(fm_nutrition_attributes("y1995",kfo,"kcal")>0) = f15_prices_initial(kfo)
+                                                                                  / (fm_nutrition_attributes("y1995",kfo,"kcal")*10**6);
 p15_prices_kcal(t,iso,kfo,"iter1")=i15_prices_initial_kcal(iso,kfo);
 p15_convergence_measure(t,iter15)=NA;
diff --git a/modules/15_food/anthropometrics_jan18/presolve.gms b/modules/15_food/anthropometrics_jan18/presolve.gms
@@ -429,7 +429,7 @@ p15_kcal_pc_calibrated(t,i,kfo_pp) = p15_plant_kcal_structure_orig(t,i,kfo_pp)
                + p15_kcal_pc_calibrated_rumdairy_orig(t,i) * (1-i15_rumdairy_fadeout(t,i)));
 
 *** Substitution of ruminant meat and dairy products (kfo_rd) with single-cell protein (SCP) based on protein/cap/day
-i15_protein_to_kcal_ratio(t,kfo) =  f15_nutrition_attributes(t,kfo,"protein")/f15_nutrition_attributes(t,kfo,"kcal");
+i15_protein_to_kcal_ratio(t,kfo) =  fm_nutrition_attributes(t,kfo,"protein")/fm_nutrition_attributes(t,kfo,"kcal");
 * Before the substitution, kfo_rd is converted from kcal/cap/day to g protein/cap/day
 * using i15_protein_to_kcal_ratio(t,kfo_rd).
 * After the substitution of kfo_rd with SCP (1-i15_rumdairy_scp_fadeout), SCP is converted

diff --git a/modules/15_food/anthropometrics_jan18/sets.gms b/modules/15_food/anthropometrics_jan18/sets.gms
@@ -102,9 +102,6 @@ sets
    kfo_lp(kfo) Livestock food products
    / livst_rum,livst_pig,livst_chick, livst_egg, livst_milk /
 
-   kfo_rd(kfo) Ruminant meat and dairy food products
-   / livst_rum,livst_milk /
-
    kfo_st(kfo) Staple products
    / tece,maiz,trce,rice_pro,soybean,rapeseed,groundnut,sunflower,puls_pro,
    potato,cassav_sp,sugr_cane,sugr_beet,molasses,brans,scp /
@@ -148,6 +145,10 @@ sets
   livst_fadeoutscen15 Scenarios for changed composition of livestock products
        / halving2050, constant /
 
+* The set kfo_rd can be defined in default.cfg and is used in the food substitution scenarios c15_rumdairy_scp_scen and c15_rumdairyscen
+  kfo_rd(kfo) Ruminant meat and dairy food products
+       / livst_rum,livst_milk /
+
   fadeoutscen15  Food substitution scenarios including functional forms with targets and transition periods
        / constant,
          lin_zero_10_50, lin_zero_20_50, lin_zero_20_30, lin_zero_20_70, lin_50pc_20_50, lin_50pc_20_50_extend65, lin_50pc_20_50_extend80,

diff --git a/modules/15_food/module.gms b/modules/15_food/module.gms
@@ -15,7 +15,9 @@
 *' agricultural commodities q15_food_demand.m to change food demand and iterates
 *' with MAgPIE until a common solution is found. Outputs include next to food
 *' demand also projections of anthropometric parameters such as body height and
-*' weight distribution, as well as phyiscal activity levels.
+*' weight distribution, as well as phyiscal activity levels. In addition, this
+*' module also provides information about nutrition attributes of foods that can
+*' be used in other modules via the interface fm_nutrition_attributes.
 *' @authors Benjamin Leon Bodirsky, Isabelle Weindl, Jan Philipp Dietrich
 
 *###################### R SECTION START (MODULETYPES) ##########################

diff --git a/modules/16_demand/sector_may15/sets.gms b/modules/16_demand/sector_may15/sets.gms
@@ -21,6 +21,9 @@ sets
    kli(kap) Livestock products
    / livst_rum, livst_pig, livst_chick, livst_egg, livst_milk  /
 
+   kli_rd(kap) Ruminant meat and dairy products
+   / livst_rum,livst_milk /
+
    kforestry(k) forestry products
         / wood, woodfuel /