Skip to content

split pm_fedem into industry and buildings#2329

Open
fbenke-pik wants to merge 16 commits into
remindmodel:developfrom
fbenke-pik:buildings
Open

split pm_fedem into industry and buildings#2329
fbenke-pik wants to merge 16 commits into
remindmodel:developfrom
fbenke-pik:buildings

Conversation

@fbenke-pik
Copy link
Copy Markdown
Contributor

@fbenke-pik fbenke-pik commented Apr 14, 2026

Purpose of this PR

  • Read in FE demands for industry and buildings files separately. Instead of one FE demand file with industry and buildings demands for all SPPs and an additional redundant buildings FE demand file containing an additional RCP dimension (and overlapping with FE demand for RCP = none), read in two separate files and treat the FE demands for the two sectors separately just like for transport.
  • Related mrremind PR: resolve calcFEdemand pik-piam/mrremind#803
  • Related remind2 PR: adjust gdx variable in reportFE pik-piam/remind2#793
  • The FE demand for transport gets a parameter name according to naming conventions.
  • if-conditions checking for the right realization for buildings/transport/industry are dropped, because each of them currently has only one realization.
  • Data should not change with this PR.

Type of change

Indicate the items relevant for your PR by replacing ◻️ with ☑️.
Do not delete any lines. This makes it easier to understand which areas are affected by your changes and which are not.

Parts concerned

  • ☑️ GAMS Code
  • ◻️ R-scripts
  • ◻️ Documentation (GAMS incode documentation, comments, tutorials)
  • ☑️ Input data / CES parameters
  • ◻️ Tests, CI/CD (continuous integration/deployment)
  • ◻️ Configuration (switches in main.gms, default.cfg, and scenario_config*.csv files)
  • ◻️ Other (please give a description)

Impact

  • ◻️ Bug fix
  • ☑️ Refactoring
  • ◻️ New feature
  • ◻️ Change of parameter values or input data (including CES parameters)
  • ◻️ Minor change (default scenarios show only small differences)
  • ◻️ Fundamental change of results of default scenarios

Checklist

Do not delete any line. Leave unfinished elements unchecked so others know how far along you are.
In the end all checkboxes must be ticked before you can merge
.

  • I executed the automated model tests (make test) after my final commit and all tests pass (FAIL 0)
  • I adjusted the reporting in remind2 if and where it was needed
  • I adjusted the madrat packages (mrremind and other packages involved) for input data generation if and where it was needed
  • My code follows the coding etiquette
  • I explained my changes within the PR, particularly in hard-to-understand areas
  • I checked that the in-code documentation is up-to-date
  • I adjusted forbiddenColumnNames in readCheckScenarioConfig.R in case the PR leads to deprecated switches
  • I updated the CHANGELOG.md correctly (added, changed, fixed, removed, input data/calibration)

Further information (optional)

  • Runs with these changes are here: /p/tmp/benke/model/remind_buildings
  • Comparison of results (what changes by this PR?): see attached pdfs
    /p/tmp/benke/model/remind_buildings/compScen-calib-2026-05-28_11.46.18-H12.pdf
    /p/tmp/benke/model/remind_buildings/compScen-infes-2026-05-26_11.58.57-H12.pdf
    /p/tmp/benke/model/remind_buildings/compScen-ssp2-eu21-2026-05-22_14.16.24-H12.pdf

Comment thread modules/37_industry/subsectors/datainput.gms Outdated
Comment thread core/declarations.gms Outdated
Comment thread core/datainput.gms Outdated
Comment thread core/datainput.gms Outdated
Comment thread core/datainput.gms Outdated
Comment thread core/datainput.gms
Comment thread modules/29_CES_parameters/calibrate/datainput.gms Outdated
Comment thread modules/29_CES_parameters/calibrate/datainput.gms Outdated
Comment thread core/datainput.gms
@fbenke-pik fbenke-pik force-pushed the buildings branch 2 times, most recently from 1b883e2 to c971989 Compare April 16, 2026 10:34
@fbenke-pik fbenke-pik marked this pull request as ready for review May 28, 2026 11:47
Comment thread config/default.cfg

#### Current input data revision (<mainrevision>.<subrevision>) ####
cfg$inputRevision <- "7.91"
cfg$inputRevision <- "7.90fedem"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

could we use an input data rev. number which has no extention?

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.

Yes, once this is approved, I will make a new input data version without the dev extension

Comment thread core/datainput.gms
f_fedemandBuild(tall,all_regi,all_demScen,all_rcp_scen,all_in) "RCP-dependent final energy demand in buildings"
/
$ondelim
$include "./core/input/f_fedemand_build.cs4r"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

same names for the parameter and the files would be better

Comment thread core/datainput.gms
/
$ondelim
$include "./core/input/f_fedemand.cs4r"
$include "./core/input/f_fedemand_ind.cs4r"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

same name for the parameter and the file would be bestter, always f_fedemandInd

@@ -1,3 +1,2 @@
f36_floorspace_scen.cs4r
f36_uedemand_build.cs4r
f_fedemand_build.cs4r
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

this file is not subsituted by another file in teh buildings module?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants