In CHANGELOG, moved switch removal in default.cfg from changes to rem…

…ovals.

CHANGELOG.md

@@ -12,8 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - **14_yields_and_config** The new default is to not use yield calibration factors from a calibration run. The switch s14_use_yield_calib can optionally reenable the use of yield calibration factors.
 - **scripts** LUH2_disaggregation output script was modified. Specifically, flooded area was made compatible with the LUH definition, cropland and grazing land were added to the states.nc file, and specific naming/details (datatype,  zname, xname, and yname) were added when creating the .nc files.
 - **scripts** For the emulator scripts select a different bioenergy demand variable that excludes bioenergy sources other than second generation bioenergy crops. Set the minimal bioenergy demand to zero. Both avoid artificial clustering of data points and allow for better fits.
-- **default.cfg** Removed description of cfg$gms$c31_past_suit_scen since no longer needed due to changes in 31_past described below. Its function is now done by cfg$gms$c31_grassl_yld_scenario.
-- **31_past** in grasslands_apr22 realization: changed structure of f31_pastr_suitability to align with ssp-rcp specific input data formulation. Changed input filename from cs3 to cs2. Added `cc`, `nocc` and `nocc_hist` options for `i31_manpast_suit` and `i31_manpast_suit` and changed input gams code from table to parameter. Climate scenario assignment moved from preloop.gms to input.gms. Removed pastSuit set in sets.gms as not needed anymore. Adjusted not_used.txt in both grasslands_apr22 and static realizations.
+- **31_past** in grasslands_apr22 realization: changed structure of f31_pastr_suitability to align with ssp-rcp specific input data formulation. Changed input filename from cs3 to cs2. Added `cc`, `nocc` and `nocc_hist` options for `i31_manpast_suit` and changed input gams code from table to parameter. Climate scenario assignment moved from preloop.gms to input.gms. Removed pastSuit set in sets.gms as not needed anymore. Adjusted not_used.txt in both grasslands_apr22 and static realizations.
 - **36_employment** regression between hourly labor regression and GDP pc changed from linear to log-log
 
 ### added
@@ -23,7 +22,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - **32_forestry** new interface `vm_land_forestry`
 
 ### removed
--
+- **default.cfg** Removed description of cfg$gms$c31_past_suit_scen since no longer needed due to changes in 31_past described below. Its function is now done by cfg$gms$c31_grassl_yld_scenario.
 
 ### fixed
 - **inputdata** There was another bug (terra default na.rm changed) in the inputdata that was fixed with rev4.93

core/sets.gms

@@ -55,31 +55,31 @@ sets
       VEN, VGB, VIR, VNM, VUT, WLF, WSM, YEM, ZAF, ZMB, ZWE /
 
   j number of LPJ cells
-    / CAZ_1*CAZ_6,
-      CHA_7*CHA_23,
-      EUR_24*EUR_32,
-      IND_33*IND_40,
-      JPN_41*JPN_41,
-      LAM_42*LAM_85,
-      MEA_86*MEA_111,
-      NEU_112*NEU_118,
-      OAS_119*OAS_128,
-      REF_129*REF_141,
-      SSA_142*SSA_179,
+    / CAZ_1*CAZ_5,
+      CHA_6*CHA_21,
+      EUR_22*EUR_29,
+      IND_30*IND_36,
+      JPN_37*JPN_38,
+      LAM_39*LAM_79,
+      MEA_80*MEA_109,
+      NEU_110*NEU_117,
+      OAS_118*OAS_128,
+      REF_129*REF_140,
+      SSA_141*SSA_179,
       USA_180*USA_200 /
 
   cell(i,j) number of LPJ cells per region i
-    / CAZ . (CAZ_1*CAZ_6)
-      CHA . (CHA_7*CHA_23)
-      EUR . (EUR_24*EUR_32)
-      IND . (IND_33*IND_40)
-      JPN . (JPN_41*JPN_41)
-      LAM . (LAM_42*LAM_85)
-      MEA . (MEA_86*MEA_111)
-      NEU . (NEU_112*NEU_118)
-      OAS . (OAS_119*OAS_128)
-      REF . (REF_129*REF_141)
-      SSA . (SSA_142*SSA_179)
+    / CAZ . (CAZ_1*CAZ_5)
+      CHA . (CHA_6*CHA_21)
+      EUR . (EUR_22*EUR_29)
+      IND . (IND_30*IND_36)
+      JPN . (JPN_37*JPN_38)
+      LAM . (LAM_39*LAM_79)
+      MEA . (MEA_80*MEA_109)
+      NEU . (NEU_110*NEU_117)
+      OAS . (OAS_118*OAS_128)
+      REF . (REF_129*REF_140)
+      SSA . (SSA_141*SSA_179)
       USA . (USA_180*USA_200) /
 
   i_to_iso(i,iso) mapping regions to iso countries

main.gms

@@ -148,25 +148,25 @@ $title magpie
 
 *##################### R SECTION START (VERSION INFO) ##########################
 * 
-* Used data set: rev4.88_h12_magpie.tgz
-* md5sum: 740da40ceda04850eb374df215837c1b
-* Repository: /p/projects/rd3mod/mirror/rse.pik-potsdam.de/data/magpie/public
+* Used data set: rev4.94_h12_magpie.tgz
+* md5sum: 25623b5ad3e8b72bd3008da9b69adfe0
+* Repository: /p/projects/rd3mod/inputdata/output
 * 
-* Used data set: rev4.88_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz
-* md5sum: 9edbcc62e75b663eada84524402bccbf
-* Repository: /p/projects/rd3mod/mirror/rse.pik-potsdam.de/data/magpie/public
+* Used data set: rev4.94_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz
+* md5sum: d7800a0ffe271483116a8f00a939a89a
+* Repository: /p/projects/rd3mod/inputdata/output
 * 
-* Used data set: rev4.88_h12_validation.tgz
-* md5sum: d42abd58de683506a807b411d7fe87cb
-* Repository: /p/projects/rd3mod/mirror/rse.pik-potsdam.de/data/magpie/public
+* Used data set: rev4.94_h12_validation.tgz
+* md5sum: 4b4128910822cf45603cab46f45ccf78
+* Repository: /p/projects/rd3mod/inputdata/output
 * 
-* Used data set: additional_data_rev4.45.tgz
-* md5sum: bb51c8c8608b8b9363582eb4aa220754
-* Repository: /p/projects/landuse/data/input/archive
+* Used data set: additional_data_rev4.46.tgz
+* md5sum: NA
+* Repository: https://rse.pik-potsdam.de/data/magpie/public
 * 
 * Used data set: calibration_H12_per_ton_fao_may22_glo_08Aug23.tgz
-* md5sum: 5d34e4b54112db10f330f1e59dd60cc9
-* Repository: /p/projects/rd3mod/mirror/rse.pik-potsdam.de/data/magpie/public
+* md5sum: NA
+* Repository: https://rse.pik-potsdam.de/data/magpie/public
 * 
 * Low resolution: c200
 * High resolution: 0.5
@@ -175,27 +175,27 @@ $title magpie
 * 
 * Number of cells per region:
 *   CAZ  CHA  EUR  IND  JPN  LAM  MEA  NEU  OAS  REF  SSA  USA
-*     6   17    9    8    1   44   26    7   10   13   38   21
+*     5   16    8    7    2   41   30    8   11   12   39   21
 * 
 * Regionscode: 62eff8f7
 * 
-* Regions data revision: 4.88
+* Regions data revision: 4.94
 * 
 * lpj2magpie settings:
 * * LPJmL data: MRI-ESM2-0:ssp370
-* * Revision: 4.88
+* * Revision: 4.94
 * 
 * aggregation settings:
 * * Input resolution: 0.5
 * * Output resolution: c200
 * * Regionscode: 62eff8f7
 * * Number of clusters per region:
 *   CAZ  CHA  EUR  IND  JPN  LAM  MEA  NEU  OAS  REF  SSA  USA
-*     6   17    9    8    1   44   26    7   10   13   38   21
+*     5   16    8    7    2   41   30    8   11   12   39   21
 * * Call: withCallingHandlers(expr, message = messageHandler, warning = warningHandler,     error = errorHandler)
 * 
 * 
-* Last modification (input data): Fri Sep 22 15:20:24 2023
+* Last modification (input data): Fri Nov 17 19:42:06 2023
 * 
 *###################### R SECTION END (VERSION INFO) ###########################