Reduce parameter sizes by using cs3r instead of cs4r

config/default.cfg

@@ -28,7 +28,7 @@ cfg$regionmapping <- "config/regionmappingH12.csv"
 cfg$extramappings_historic <- ""
 
 #### Current input data revision (<mainrevision>.<subrevision>) ####
-cfg$inputRevision <- "8.26"
+cfg$inputRevision <- "8.27"
 
 #### Current CES parameter and GDX revision (commit hash) ####
 cfg$CESandGDXversion <- "3d8a0d0a3d49c4bb3535cc13ea0b96c5d831ba16"

core/datainput.gms

@@ -950,14 +950,13 @@ $include "./core/input/p_boundEmi.cs4r"
 $offdelim
 /;
 *** read in F-Gas emissions
-parameter f_emiFgas(tall,all_regi,all_SSP_forcing_adjust,all_rcp_scen,all_delayPolicy,all_enty)        "F-gas emissions by single gases from IMAGE"
-/
+table f_emiFgas(tall,all_regi,all_SSP_forcing_adjust,all_rcp_scen,all_delayPolicy,all_enty)        "F-gas emissions by single gases from IMAGE"
 $offlisting
 $ondelim
-$include "./core/input/f_emiFgas.cs4r"
+$include "./core/input/f_emiFgas.cs3r"
 $offdelim
 $onlisting
-/;
+;
 
 
 * GA Read choice of non-CO2 MACs version
@@ -966,42 +965,38 @@ $onlisting
 $IFTHEN.MaccVersion %c_nonco2_macc_version% == "PBL_2007"
 * PBL_2007 MACs are discretized in steps of 5 $/tC
 sm_dmac = 5 ;
-parameter p_abatparam_CH4(tall,all_regi,all_enty,steps)        "MAC costs for CH4 by source"
-/
+table p_abatparam_CH4(tall,all_regi,all_enty,steps)        "MAC costs for CH4 by source"
 $ondelim
-$include "./core/input/p_abatparam_CH4.cs4r"
+$include "./core/input/p_abatparam_CH4.cs3r"
 $offdelim
-/;
-parameter p_abatparam_N2O(tall,all_regi,all_enty,steps)        "MAC costs for N2O by source"
-/
+;
+table p_abatparam_N2O(tall,all_regi,all_enty,steps)        "MAC costs for N2O by source"
 $ondelim
-$include "./core/input/p_abatparam_N2O.cs4r"
+$include "./core/input/p_abatparam_N2O.cs3r"
 $offdelim
-/;
+;
 $ELSEIF.MaccVersion %c_nonco2_macc_version% == "PBL_2022"
 *** PBL_2022 MACs are discretized in steps of 20 $/tC
 *** PBL_2022 includes three scenarios, read the big file into p_all_abatparam_CH4 and subset based on c_nonco2_macc_scenario
 *** Create the set here, as it's not really used anywhere else
 set macc_scens "MAC scenarios for PBL_SSP2_2022 MACCs" /Default, Optimistic, Pessimistic/;
-parameter p_all_abatparam_CH4(tall,all_regi,all_enty,macc_scens,steps)        "MAC costs for CH4 by source for different scenarios, c_nonco2_macc_scenario is chosen for p_abatparam_CH4"
-/
+table p_all_abatparam_CH4(tall,all_regi,all_enty,macc_scens,steps)        "MAC costs for CH4 by source for different scenarios, c_nonco2_macc_scenario is chosen for p_abatparam_CH4"
 $offlisting
 $ondelim
-$include "./core/input/p_abatparam_SSP22022_CH4.cs4r"
+$include "./core/input/p_abatparam_SSP22022_CH4.cs3r"
 $offdelim
 $onlisting
-/;
+;
 parameter p_abatparam_CH4(tall,all_regi,all_enty,steps) "MAC costs for CH4 by source";
 *** Pick MACC scenario
 p_abatparam_CH4(tall,all_regi,all_enty,steps) = p_all_abatparam_CH4(tall,all_regi,all_enty,"%c_nonco2_macc_scenario%",steps)
-parameter p_all_abatparam_N2O(tall,all_regi,all_enty,macc_scens,steps)        "MAC costs for N2O by source for different scenarios, c_nonco2_macc_scenario is chosen for p_abatparam_N2O"
-/
+table p_all_abatparam_N2O(tall,all_regi,all_enty,macc_scens,steps)        "MAC costs for N2O by source for different scenarios, c_nonco2_macc_scenario is chosen for p_abatparam_N2O"
 $offlisting
 $ondelim
-$include "./core/input/p_abatparam_SSP22022_N2O.cs4r"
+$include "./core/input/p_abatparam_SSP22022_N2O.cs3r"
 $offdelim
 $onlisting
-/;
+;
 parameter p_abatparam_N2O(tall,all_regi,all_enty,steps) "MAC costs for N2O by source";
 *** Pick MACC scenario
 p_abatparam_N2O(tall,all_regi,all_enty,steps) = p_all_abatparam_N2O(tall,all_regi,all_enty,"%c_nonco2_macc_scenario%",steps)
@@ -1645,31 +1640,29 @@ loop(te,
 
 *** ---- FE demand trajectories for calibration -------------------------------
 
-Parameter
+Table
 f_fedemandInd(tall,all_regi,all_demScen,all_in) "final energy demand in industry"
-/
 $offlisting
 $ondelim
-$include "./core/input/f_fedemandInd.cs4r"
+$include "./core/input/f_fedemandInd.cs3r"
 $offdelim
 $onlisting
-/;
+;
 
 pm_fedemandInd(t,regi,in) = f_fedemandInd(t,regi,"%cm_demScen%",in);
 *** data input for industry FE that is no part of the CES tree 
 *** needed for process-based steel implementation, where these items are not part of "in"
 pm_fedemandInd(t,regi,ppfen_no_ces_use) = f_fedemandInd(t,regi,"%cm_demScen%",ppfen_no_ces_use);
 
 *** RCP-dependent demands in buildings (climate impact)
-Parameter 
+Table
 f_fedemandBuild(tall,all_regi,all_demScen,all_rcp_scen,all_in) "RCP-dependent final energy demand in buildings"
-/
 $offlisting
 $ondelim
-$include "./core/input/f_fedemandBuild.cs4r"
+$include "./core/input/f_fedemandBuild.cs3r"
 $offdelim
 $onlisting
-/;
+;
 
 pm_fedemandBuild(t,regi,cal_ppf_buildings_dyn36) = f_fedemandBuild(t,regi,"%cm_demScen%","%cm_rcp_scen_build%",cal_ppf_buildings_dyn36);
 

core/declarations.gms

@@ -143,7 +143,7 @@ vm_emiMacSector(ttot,all_regi,all_enty)              "total emissions subject to
 
 vm_emiCdr(ttot,all_regi,all_enty)                    "total (negative) CO2 emissions from CDR technologies that are calculated in the CDR module. Note that it includes all atmospheric CO2 entering the CCUS chain (i.e. CO2 stored (CDR) AND used (not CDR)) [GtC]"
 vm_emiMac(ttot,all_regi,all_enty)                    "total non-energy-related emission of each region. [GtC, Mt CH4, Mt N]"
-vm_emiFgas(ttot,all_regi,all_enty)                   "F-gas emissions by single gases from IMAGE [emiFgasTotal in MtCO2eq, for other units see f_emiFgas.cs4r]"
+vm_emiFgas(ttot,all_regi,all_enty)                   "F-gas emissions by single gases from IMAGE [emiFgasTotal in MtCO2eq, for other units see f_emiFgas.cs3r]"
 
 *** emissions per emissions market
 vm_emiTeDetailMkt(tall,all_regi,all_enty,all_enty,all_te,all_enty,all_emiMkt) "emissions from energy technologies on supply-side (pm_emifac * PE) and demand-side (pm_emifac * FE) per emissions market, note: not equivalent to Emi|CO2|Energy in reporting [GtC, Mt CH4, Mt N, Mt SO2, Mt BC, Mt OC]"

core/input/files

@@ -1,7 +1,7 @@
 f_cf.cs3r
 f_dataRegiSolar.cs3r
 f_developmentState.cs3r
-f_emiFgas.cs4r
+f_emiFgas.cs3r
 f_gdp.cs3r
 f_IO_trade.cs4r
 f_lab.cs3r
@@ -12,11 +12,11 @@ f_maxProdGradeRegiHydro.cs3r
 f_maxProdGradeRegiWindOn.cs3r
 f_maxProdGradeRegiWindOff.cs3r
 f_pop.cs3r
-p_abatparam_CH4.cs4r
+p_abatparam_CH4.cs3r
 p_abatparam_CO2.cs4r
-p_abatparam_N2O.cs4r
-p_abatparam_SSP22022_CH4.cs4r
-p_abatparam_SSP22022_N2O.cs4r
+p_abatparam_N2O.cs3r
+p_abatparam_SSP22022_CH4.cs3r
+p_abatparam_SSP22022_N2O.cs3r
 p_adj_deltacapoffset.cs4r
 p_boundCapCCSindicator.cs4r
 p_boundEmi.cs4r
@@ -41,8 +41,8 @@ p_boundCapCCS.cs4r
 p_CapacityBounds.cs4r
 p_boundCapBiochar.cs4r
 f_geoStorPot.cs3r
-f_fedemandBuild.cs4r
-f_fedemandInd.cs4r
+f_fedemandBuild.cs3r
+f_fedemandInd.cs3r
 pm_NuclearConstraint.cs4r
 pm_risk_premium.cs4r
 pm_shPPPMER.cs4r

modules/36_buildings/simple/datainput.gms

@@ -51,15 +51,13 @@ p36_floorspace(ttot,regi,secBuild36) =
 
 
 *** UE demand for reporting
-Parameter
+Table
 f36_uedemand_build(tall,all_regi,all_demScen,all_rcp_scen,all_in)   "useful energy demand in buildings"
-/
 $offlisting
 $ondelim
-$include "./modules/36_buildings/simple/input/f36_uedemand_build.cs4r"
+$include "./modules/36_buildings/simple/input/f36_uedemand_build.cs3r"
 $offdelim
 $onlisting
-/
 ;
 
 *** load UE demand for reporting from input_ref.gdx cm_startyear

modules/36_buildings/simple/input/files

@@ -1,2 +1,2 @@
 f36_floorspace_scen.cs4r
-f36_uedemand_build.cs4r
+f36_uedemand_build.cs3r