Skip to content

Wrap large includes in offlisting #2490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
simonkrogmann merged 1 commit into from
Oct 6, 2026
Merged

Wrap large includes in offlisting #2490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions core/datainput.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,16 +592,20 @@ $include "./core/input/generisdata_varying_eta.prn"
*** Read in mac historical emissions to calibrate MAC reference emissions
parameter p_histEmiMac(tall,all_regi,all_enty) "historical emissions per MAC"
/
$offlisting
$ondelim
$include "./core/input/p_histEmiMac.cs4r"
$offdelim
$onlisting
/;
*** Read in historical emissions per sector to calibrate MAC reference emissions
parameter p_histEmiSector(tall,all_regi,all_enty,emi_sectors,sector_types) "historical emissions per sector"
/
$offlisting
$ondelim
$include "./core/input/p_histEmiSector.cs4r"
$offdelim
$onlisting
/;

***---------------------------------------------------------------------------
Expand Down Expand Up @@ -639,9 +643,11 @@ display pm_emifac;
*NB* include data and parameters for upper bounds on fossil fuel transport
parameter f_IO_trade(tall,all_regi,all_enty,char) "Energy trade bounds based on IEA data"
/
$offlisting
$ondelim
$include "./core/input/f_IO_trade.cs4r"
$offdelim
$onlisting
/;
pm_IO_trade(ttot,regi,enty,char) = f_IO_trade(ttot,regi,enty,char) * sm_EJ_2_TWa;

Expand Down Expand Up @@ -946,9 +952,11 @@ $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"
/
$offlisting
$ondelim
$include "./core/input/f_emiFgas.cs4r"
$offdelim
$onlisting
/;


Expand Down Expand Up @@ -977,18 +985,22 @@ $ELSEIF.MaccVersion %c_nonco2_macc_version% == "PBL_2022"
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"
/
$offlisting
$ondelim
$include "./core/input/p_abatparam_SSP22022_CH4.cs4r"
$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"
/
$offlisting
$ondelim
$include "./core/input/p_abatparam_SSP22022_N2O.cs4r"
$offdelim
$onlisting
/;
parameter p_abatparam_N2O(tall,all_regi,all_enty,steps) "MAC costs for N2O by source";
*** Pick MACC scenario
Expand All @@ -998,9 +1010,11 @@ $ENDIF.MaccVersion

parameter p_abatparam_CO2(tall,all_enty,steps) "MAC costs for CO2 by source"
/
$offlisting
$ondelim
$include "./core/input/p_abatparam_CO2.cs4r"
$offdelim
$onlisting
/;
p_abatparam_CH4(tall,all_regi,all_enty,steps)$(ord(steps) gt 201) = p_abatparam_CH4(tall,all_regi,all_enty,"201");
p_abatparam_N2O(tall,all_regi,all_enty,steps)$(ord(steps) gt 201) = p_abatparam_N2O(tall,all_regi,all_enty,"201");
Expand Down Expand Up @@ -1496,18 +1510,22 @@ $offdelim

parameter f_macBaseExo(tall,all_regi,all_enty,all_LU_emi_scen) "baseline emissions of N2O and CH4 from landuse based on exogenous data"
/
$offlisting
$ondelim
$include "./core/input/f_macBaseExo.cs4r"
$offdelim
$onlisting
/;
p_macBaseExo(ttot,regi,emiMacExo(enty))$(ttot.val ge 2005) = f_macBaseExo(ttot,regi,emiMacExo,"%cm_LU_emi_scen%");


parameter f_macBaseMagpie(tall,all_regi,all_enty,all_LU_emi_scen,all_rcp_scen) "baseline emissions of N2O and CH4 from landuse based on data from Magpie"
/
$offlisting
$ondelim
$include "./core/input/f_macBaseMagpie.cs4r"
$offdelim
$onlisting
/;
pm_macBaseMagpie(ttot,regi,emiMacMagpie(enty))$(ttot.val ge 2005) = f_macBaseMagpie(ttot,regi,emiMacMagpie,"%cm_LU_emi_scen%","%cm_rcp_scen%");

Expand Down Expand Up @@ -1630,9 +1648,11 @@ loop(te,
Parameter
f_fedemandInd(tall,all_regi,all_demScen,all_in) "final energy demand in industry"
/
$offlisting
$ondelim
$include "./core/input/f_fedemandInd.cs4r"
$offdelim
$onlisting
/;

pm_fedemandInd(t,regi,in) = f_fedemandInd(t,regi,"%cm_demScen%",in);
Expand All @@ -1644,9 +1664,11 @@ pm_fedemandInd(t,regi,ppfen_no_ces_use) = f_fedemandInd(t,regi,"%cm_demScen%",pp
Parameter
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"
$offdelim
$onlisting
/;

pm_fedemandBuild(t,regi,cal_ppf_buildings_dyn36) = f_fedemandBuild(t,regi,"%cm_demScen%","%cm_rcp_scen_build%",cal_ppf_buildings_dyn36);
Expand Down
4 changes: 4 additions & 0 deletions modules/04_PE_FE_parameters/iea2014/datainput.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@

parameter f04_IO_input(tall,all_regi,all_enty,all_enty,all_te) "Energy input based on IEA data"
/
$offlisting
$ondelim
$include "./modules/04_PE_FE_parameters/iea2014/input/f04_IO_input.cs4r"
$offdelim
$onlisting
/
;

Expand Down Expand Up @@ -40,9 +42,11 @@ f04_IO_input(tall,regi,entyPe,entySe,te)$(f04_IO_input(tall,regi,entyPe,entySe,t
*** This facilitates comparison with other sources which usually report gross electricity generation as well as gross capacity factors
parameter f04_IO_output(tall,all_regi,all_enty,all_enty,all_te) "Energy output based on IEA data"
/
$offlisting
$ondelim
$include "./modules/04_PE_FE_parameters/iea2014/input/f04_IO_output.cs4r"
$offdelim
$onlisting
/
;

Expand Down
4 changes: 4 additions & 0 deletions modules/11_aerosols/exoGAINS2025/datainput.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,20 @@ p11_share_trans("2150",regi) = 0.872;
*** GAINS2025 emission factors --------------------------------------------------------------------------
parameter f11_emifacs_sectREMIND_sourceCEDS(tall,all_regi,all_enty,all_enty,all_te,all_sectorEmi11,emisForEmiFac11,all_APscen,all_APssp) "GAINS2025 emission factors weighted by CEDS emissions"
/
$offlisting
$ondelim
$include "./modules/11_aerosols/exoGAINS2025/input/f11_emifacs_sectREMIND_sourceCEDS.cs4r"
$offdelim
$onlisting
/
;
parameter f11_emifacs_sectREMIND_sourceGAINS(tall,all_regi,all_enty,all_enty,all_te,all_sectorEmi11,emisForEmiFac11,all_APscen,all_APssp) "GAINS2025 emission factors weighted by GAINS emissions"
/
$offlisting
$ondelim
$include "./modules/11_aerosols/exoGAINS2025/input/f11_emifacs_sectREMIND_sourceGAINS.cs4r"
$offdelim
$onlisting
/
;
p11_emiFacAP(ttot,regi,enty,enty2,te,sectorEndoEmi11,emisForEmiFac11)$(ttot.val ge 2005) = 0.0;
Expand Down
8 changes: 8 additions & 0 deletions modules/21_tax/on/datainput.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,32 +10,40 @@

Parameter f21_tau_fe_tax(tall,all_regi,all_fetaxscen,emi_sectors,all_enty) "2005 final energy tax [T$/TWa]"
/
$offlisting
$ondelim
$include "./modules/21_tax/on/input/f21_tau_fe_tax.cs4r"
$offdelim
$onlisting
/
;
***gl 20110817 load paths for final energy subsidies and inconvenience costs (read in in $/GJ, get rescaled further down to T$ / TWa, subsidies also get constrained to avoid negative prices(in preloop.gms))
Parameter f21_tau_fe_sub(tall,all_regi,emi_sectors,all_enty) "2005 final energy subsidy"
/
$offlisting
$ondelim
$include "./modules/21_tax/on/input/f21_tau_fe_sub.cs4r"
$offdelim
$onlisting
/
;
Parameter f21_tau_fuEx_sub(tall,all_regi,all_enty) "2005 subsidy for fuel extraction"
/
$offlisting
$ondelim
$include "./modules/21_tax/on/input/f21_tau_pe_sub.cs4r"
$offdelim
$onlisting
/
;

Parameter f21_sub_convergence_rollback(tall,all_regi,emi_sectors,all_enty) "Subsidy convergence level for specific regions, year and final energy type in rollback scenario"
/
$offlisting
$ondelim
$include "./modules/21_tax/on/input/f21_sub_convergence_rollback.cs4r"
$offdelim
$onlisting
/
;

Expand Down
4 changes: 4 additions & 0 deletions modules/26_agCosts/costs/datainput.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@ pm_NXagr(tall,all_regi) = 0;

parameter p26_totLUcostLookup(tall,all_regi,all_LU_emi_scen,all_rcp_scen) "regional total landuse cost"
/
$offlisting
$ondelim
$include "./modules/26_agCosts/costs/input/p26_totLUcostLookup.cs4r"
$offdelim
$onlisting
/
;

Expand All @@ -37,9 +39,11 @@ p26_totLUcosts_withMAC(ttot,regi) = p26_totLUcostLookup(ttot,regi,"%cm_LU_emi_sc

parameter p26_macCostLuLookup(tall,all_regi,all_LU_emi_scen,all_rcp_scen) "land use emissions MAC cost from MAgPIE"
/
$offlisting
$ondelim
$include "./modules/26_agCosts/costs/input/p26_macCostLuLookup.cs4r"
$offdelim
$onlisting
/
;

Expand Down
4 changes: 4 additions & 0 deletions modules/30_biomass/magpie/datainput.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,11 @@ p30_pebiolc_pricemag(ttot,regi) = 0;
*** Read production of ligno-cellulosic purpose grown bioenergy from look-up table (used to calculate bioenergy costs in standalone runs and substract them from budget equation)
parameter p30_biolcProductionLookup(tall,all_regi,all_LU_emi_scen,all_rcp_scen) "regional production of pebiolc purpose grown"
/
$offlisting
$ondelim
$include "./modules/30_biomass/magpie/input/p30_biolcProductionLookup.cs4r"
$offdelim
$onlisting
/
;

Expand All @@ -54,9 +56,11 @@ pm_pebiolc_demandmag(ttot,regi) = p30_biolcProductionLookup(ttot,regi,"%cm_LU_em
*** Read parameters for bioenergy supply curve
parameter f30_bioen_price(tall,all_regi,all_LU_emi_scen,all_rcp_scen,all_charScen) "time dependent fit coefficients for bioenergy price formula"
/
$offlisting
$ondelim
$include "./modules/30_biomass/magpie/input/f30_bioen_price.cs4r"
$offdelim
$onlisting
/
;

Expand Down
6 changes: 6 additions & 0 deletions modules/35_transport/edge_esm/datainput.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,29 @@ pm_cesdata_sigma(ttot,in)$p35_cesdata_sigma(in) = p35_cesdata_sigma(in);
parameters
p35_esCapCost(tall,all_regi,all_GDPpopScen,all_demScen,EDGE_scenario_all,all_teEs) "Capital costs for the transport system [$/pkm or $/tkm]"
/
$offlisting
$ondelim
$include "./modules/35_transport/edge_esm/input/f35_esCapCost.cs4r"

@robertpietzcker robertpietzcker Oct 17, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@simonkrogmann @LaviniaBaumstark I think it would be better to undo the offlisting of the f35 parameters here.

If I am not mistaken, these are the inputs from edge-T, which get updated every 5 iterations, so the gdx will only contain the very last values. This will make debugging the interactions with EDGE-T very difficult.

@simonkrogmann simonkrogmann Oct 19, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This spot only controls one the one-time printing before any iterations to full.lst. Updated values between iterations are printed neither before nor after merging this PR.

Also before my change this one-time printing happened both in full.lst and in full.gms. Now it only happens in full.gms. As far as I understand, no debugging functionality has been removed.

$offdelim
$onlisting
/

p35_fe2es(tall,all_regi,all_GDPpopScen,all_demScen,EDGE_scenario_all,all_teEs) "Aggregate energy efficiency of transport fuel technologies [trn pkm/Twa or trn tkm/Twa]"
/
$offlisting
$ondelim
$include "./modules/35_transport/edge_esm/input/f35_fe2es.cs4r"
$offdelim
$onlisting
/

p35_demByTech(tall,all_regi,all_GDPpopScen,all_demScen,EDGE_scenario_all,all_enty,all_in,all_teEs) "Aggregate FE Demand per transport fuel technology [TWa]"
/
$offlisting
$ondelim
$include "./modules/35_transport/edge_esm/input/f35_demByTech.cs4r"
$offdelim
$onlisting
/


Expand Down
4 changes: 4 additions & 0 deletions modules/36_buildings/simple/datainput.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,11 @@ pm_cesdata_sigma(ttot,"enhgab")$ (ttot.val eq 2040) = 3;
Parameter
p36_floorspace_scen(tall, all_regi, all_demScen, secBuild36) "floorspace, in buildings simple realization only used for reporting at the moment, not in optimization itself"
/
$offlisting
$ondelim
$include "./modules/36_buildings/simple/input/f36_floorspace_scen.cs4r"
$offdelim
$onlisting
/
;
p36_floorspace(ttot,regi,secBuild36) =
Expand All @@ -52,9 +54,11 @@ p36_floorspace(ttot,regi,secBuild36) =
Parameter
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"
$offdelim
$onlisting
/
;

Expand Down
Loading