From b1bcaa25170aec3b739d0df134b51f7424ee7f7a Mon Sep 17 00:00:00 2001 From: Debbora Leip Date: Thu, 4 Sep 2025 11:43:16 +0200 Subject: [PATCH 1/4] bioplastic fix --- modules/62_material/exo_flexreg_apr16/presolve.gms | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/62_material/exo_flexreg_apr16/presolve.gms b/modules/62_material/exo_flexreg_apr16/presolve.gms index 5219eaa90b..6547a20bba 100644 --- a/modules/62_material/exo_flexreg_apr16/presolve.gms +++ b/modules/62_material/exo_flexreg_apr16/presolve.gms @@ -28,7 +28,7 @@ p62_scaling_factor(i)$(p62_dem_food_lastcalibyear(i) > 0) = sum(kfo, vm_dem_food * it in the final biomass demand equation. if (sum(sameas(t_past,t),1) = 1, p62_bioplastic_substrate_double_counted(t,i,kall) = p62_bioplastic_substrate(t,i,kall); - p62_bioplastic_substrate_lastcalibyear(i,kall) = p62_bioplastic_substrate(t,i,kall); + p62_bioplastic_substrate_lastcalibyear(i,kall) = max(p62_bioplastic_substrate(t,i,kall), f62_dem_material(t,i,kall)); else if (s62_include_bioplastic = 0, p62_bioplastic_substrate_double_counted(t,i,kall) = 0; From e466a241113eacf73f503e4ee81b84986b6524c4 Mon Sep 17 00:00:00 2001 From: Debbora Leip Date: Thu, 4 Sep 2025 13:23:00 +0200 Subject: [PATCH 2/4] updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8707f4adcb..ff80200e25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - ### fixed +- **62_material** fixed inconsistency for historical bioplastic substrate demand - **21_trade** included trade costs into exo realization - **default.cfg** input data upgraded to rev4.120 to use corrected clusters using aligned population data From 58196efa6bd0551039163c45e134e6f4ff57f3e2 Mon Sep 17 00:00:00 2001 From: Debbora Leip Date: Thu, 4 Sep 2025 13:59:09 +0200 Subject: [PATCH 3/4] fix --- modules/62_material/exo_flexreg_apr16/presolve.gms | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/62_material/exo_flexreg_apr16/presolve.gms b/modules/62_material/exo_flexreg_apr16/presolve.gms index 6547a20bba..526c3af713 100644 --- a/modules/62_material/exo_flexreg_apr16/presolve.gms +++ b/modules/62_material/exo_flexreg_apr16/presolve.gms @@ -28,7 +28,7 @@ p62_scaling_factor(i)$(p62_dem_food_lastcalibyear(i) > 0) = sum(kfo, vm_dem_food * it in the final biomass demand equation. if (sum(sameas(t_past,t),1) = 1, p62_bioplastic_substrate_double_counted(t,i,kall) = p62_bioplastic_substrate(t,i,kall); - p62_bioplastic_substrate_lastcalibyear(i,kall) = max(p62_bioplastic_substrate(t,i,kall), f62_dem_material(t,i,kall)); + p62_bioplastic_substrate_lastcalibyear(i,kall) = min(p62_bioplastic_substrate(t,i,kall), f62_dem_material(t,i,kall)); else if (s62_include_bioplastic = 0, p62_bioplastic_substrate_double_counted(t,i,kall) = 0; From fcbce50da679b40bf8f252a49939f757036f9fb2 Mon Sep 17 00:00:00 2001 From: Patrick Rein Date: Fri, 5 Sep 2025 13:32:38 +0200 Subject: [PATCH 4/4] Changes default cellular input data back to ssp245 --- config/default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/default.cfg b/config/default.cfg index 73653cf936..ce6b29bc36 100644 --- a/config/default.cfg +++ b/config/default.cfg @@ -23,7 +23,7 @@ cfg$model <- "main.gms" #def = "main.gms" # which input data sets should be used? cfg$input <- c(regional = "rev4.121_h12_magpie.tgz", - cellular = "rev4.121_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz", + cellular = "rev4.121_h12_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz", validation = "rev4.121_h12_validation.tgz", additional = "additional_data_rev4.63.tgz", calibration = "calibration_H12_FAO_13Aug25.tgz")