From 8f829ad68ea17bfe28c3a008d1f859ff9408c8b7 Mon Sep 17 00:00:00 2001 From: Alexandre Koberle Date: Sat, 25 Nov 2023 23:20:13 +0100 Subject: [PATCH] Bugfix to 31_past module grasslands_apr22 realization. --- CITATION.cff | 2 +- config/default.cfg | 6 +++--- modules/31_past/grasslands_apr22/input.gms | 7 +++++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index 46043bc0eb..a152dd2299 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -118,7 +118,7 @@ authors: affiliation: "Potsdam Institute for Climate Impact Research" email: alexkob@pik-potsdam.de -- family-names: Lotze-Campen + - family-names: Lotze-Campen given-names: Hermann orcid: https://orcid.org/0000-0002-0003-5508 affiliation: "Potsdam Institute for Climate Impact Research" diff --git a/config/default.cfg b/config/default.cfg index e8e69f27c3..6e162ca449 100644 --- a/config/default.cfg +++ b/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.94_h12_magpie.tgz", - cellular = "rev4.94_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz", - validation = "rev4.94_h12_validation.tgz", +cfg$input <- c(regional = "rev4.95_h12_magpie.tgz", + cellular = "rev4.95_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz", + validation = "rev4.95_h12_validation.tgz", additional = "additional_data_rev4.46.tgz", calibration = "calibration_H12_per_ton_fao_may22_glo_08Aug23.tgz") diff --git a/modules/31_past/grasslands_apr22/input.gms b/modules/31_past/grasslands_apr22/input.gms index 5c96e90de6..dcb0bca3bf 100644 --- a/modules/31_past/grasslands_apr22/input.gms +++ b/modules/31_past/grasslands_apr22/input.gms @@ -46,3 +46,10 @@ table f31_grass_bio(t_all,i, grassland) Estimated regional grass biomass consump $ondelim $include "./modules/31_past/input/f31_grass_bio_hist.cs3" $offdelim; + + + +table f31_LUH2v2(t_all,j, f31_luh) LUH2v2 land classes separating rangelands from managed pastures +$ondelim +$include "./modules/31_past/input/f31_LUH2v2.cs3" +$offdelim;