Update branch

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
 

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")

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) = 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;