Skip to content

Refactor buildings ces tree #2331

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

Open
hagento wants to merge 4 commits into
base: develop
Choose a base branch
from
+66 −43
Open

Refactor buildings ces tree #2331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0784a50
refactor buildings ces tree
Apr 13, 2026
c58ae95
remove buildings bound relaxations
Apr 13, 2026
8813912
change inputRevision and CESandGDXversion
May 27, 2026
1ff2517
changed CHANGELOG
Jun 1, 2026
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### changed
- **33_CDR** Rename module to `33_carbonRemoval`
[[#2332](https://github.com/remindmodel/remind/pull/2332)]
- **36_buildings** Refactor buildings CES tree structure and remove bound relaxations for improved model performance
[[#2331](https://github.com/remindmodel/remind/pull/2331)]
- **37_industry** Rename set item `pri` to `prim`
[[#2332](https://github.com/remindmodel/remind/pull/2332)]
- **39_CCU** Rename module to `39_carbonUtilization`
Expand Down
4 changes: 2 additions & 2 deletions config/default.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ cfg$regionmapping <- "config/regionmappingH12.csv"
cfg$extramappings_historic <- ""

#### Current input data revision (<mainrevision>.<subrevision>) ####
cfg$inputRevision <- "7.95"
cfg$inputRevision <- "7.91ces"

#### Current CES parameter and GDX revision (commit hash) ####
cfg$CESandGDXversion <- "dec24b712ce59db95bb4385ba71ec9a4cd921041"
Comment on lines -31 to -34
Copy link
Copy Markdown
Contributor

@ricardarosemann ricardarosemann Jun 1, 2026

Choose a reason for hiding this comment

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

For the final merge you still need to put an up to date revision without a development suffix and make sure that the CES commit hash lies in the group-wide calibration repo and not in a local one (which I haven't checked). This means in my view you'd need to regenerate input data and recalibrate - if you want to skip this, please check with Lavinia first.

cfg$CESandGDXversion <- "a6de9bc6148022856f78943dc52e39337c291df4"

#### Path to a renv.lock file to restore a project's dependencies from. If NULL, all R packages in their currently installed version will be used.
cfg$UseThisRenvLock <- NULL
Expand Down
57 changes: 42 additions & 15 deletions core/sets.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,9 +366,6 @@ all_enty "all types of quantities"
feel
feels "FE electricity stationary"
feelb
feelcb "buildings use of conventional electricity (all but space heating)"
feelhpb "buildings use of electricity for space heating with heat pumps"
feelrhb "buildings use of electricity for space heating with resistive heating"
feelt "final energy electricity for transport"
fepet "FE petrol transport"
fedie "FE diesel transport"
Expand Down Expand Up @@ -511,18 +508,48 @@ all_in "all inputs and outputs of the CES function"
fehes "stationary use of district heat"
feels "stationary use of electricity"

enb "buildings energy use"
enhb "buildings heat energy use"
enhgab "buildings heat gaseous energy use (fegab and feh2b)"
fesob "buildings use of solid energy carriers"
fehob "buildings use of liquid energy carriers"
fegab "buildings use of gaseous energy carriers"
feh2b "buildings use of hydrogen"
feheb "buildings use of district heat"
feelb "buildings use of electricity"
feelcb "buildings use of conventional electricity (all but space heating)"
feelhpb "buildings use of electricity for space heating with heat pumps"
feelrhb "buildings use of electricity for space heating with resistive heating"
enb "buildings energy use"
enhb "buildings heat energy use"
enhgab "buildings heat gaseous energy use (fegab and feh2b)"
fesob "buildings use of solid energy carriers"
fehob "buildings use of liquid energy carriers"
fegab "buildings use of gaseous energy carriers"
feh2b "buildings use of hydrogen"
feheb "buildings use of district heat"
feelb "buildings use of electricity"
feelhpb "buildings use of electricity for heat pumps"
feelrhcob "buildings use of electricity for resistive heating and cooking"
feelalb "buildings use of electricity for appliances and lighting"
feelictb "buildings use of electricity for information and communication technology"
feelscb "buildings use of electricity for space cooling"
appliances_light_elec_fe "buildings appliances and lighting electricity"
appliances_light_natgas_fe "buildings appliances and lighting natural gas"
appliances_light_petrol_fe "buildings appliances and lighting petrol"
cooking_biomod_fe "buildings cooking modern biomass"
cooking_biotrad_fe "buildings cooking traditional biomass"
cooking_coal_fe "buildings cooking coal"
cooking_elec_fe "buildings cooking electricity"
cooking_natgas_fe "buildings cooking natural gas"
cooking_petrol_fe "buildings cooking petrol"
ict_elec_fe "buildings information communication technology electricity"
space_cooling_elec_fe "buildings space cooling electricity"
space_cooling_heat_fe "buildings space cooling district heat"
space_heating_biomod_fe "buildings space heating modern biomass"
space_heating_biotrad_fe "buildings space heating traditional biomass"
space_heating_coal_fe "buildings space heating coal"
space_heating_elecHP_fe "buildings space heating electricity heat pump"
space_heating_elecRH_fe "buildings space heating electricity resistive heating"
space_heating_heat_fe "buildings space heating district heat"
space_heating_natgas_fe "buildings space heating natural gas"
space_heating_petrol_fe "buildings space heating petrol"
water_heating_biomod_fe "buildings water heating modern biomass"
water_heating_biotrad_fe "buildings water heating traditional biomass"
water_heating_coal_fe "buildings water heating coal"
water_heating_elecHP_fe "buildings water heating electricity heat pump"
water_heating_elecRH_fe "buildings water heating electricity resistive heating"
water_heating_heat_fe "buildings water heating district heat"
water_heating_natgas_fe "buildings water heating natural gas"
water_heating_petrol_fe "buildings water heating petrol"

eni "industry energy use"
enhi "industry heat energy use"
Expand Down
8 changes: 0 additions & 8 deletions modules/29_CES_parameters/calibrate/bounds.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,5 @@ loop (pf_industry_relaxed_bounds_dyn37(in),
+ INF$( sm_CES_calibration_iteration gt sm_tmp );
);

loop(p29_building_relaxed_bounds_dyn(in),
vm_cesIO.lo(t,regi_dyn29(regi),in)$(t.val gt 2020 AND SAMEAS(regi, "MEA"))
= pm_cesdata(t,regi,in,"quantity") * 0.95 ;

vm_cesIO.up(t,regi_dyn29(regi),in)$(t.val gt 2020 AND SAMEAS(regi, "MEA"))
= pm_cesdata(t,regi,in,"quantity")* 1.05;
);


*** EOF ./modules/29_CES_parameters/calibrate/bounds.gms
1 change: 0 additions & 1 deletion modules/29_CES_parameters/calibrate/sets.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ t_29(ttot) "time steps considered in the calibration"

pf_eff_target_dyn29(all_in) "production factors with efficiency target" / /
pf_quan_target_dyn29(all_in) "production factors with quantity target" / /
p29_building_relaxed_bounds_dyn(all_in) "quantity calibration in the building sector" /feelrhb, feelcb, fesob, fegab, feh2b/

capUnitType "Type of technological data: for investments or for the standing capital"
/
Expand Down
1 change: 0 additions & 1 deletion modules/29_CES_parameters/load/not_used.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,3 @@ pm_fedemandBuild,parameter,not needed
pm_energy_limit,,
sm_CES_calibration_iteration,scalar,only applicable during calibration
cm_H2InBuildOnlyAfter,parameter,???
p29_building_relaxed_bounds_dyn,set,not needed
36 changes: 20 additions & 16 deletions modules/36_buildings/simple/sets.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,19 @@
Sets
in_buildings_dyn36(all_in) "all inputs and outputs of the CES function - buildings"
/
enb "buildings energy use"
enhb "buildings heat energy use"
enhgab "buildings heat gaseous energy use (fegab and feh2b)"
fesob "buildings use of solid energy carriers"
fehob "buildings use of liquid energy carriers"
fegab "buildings use of gaseous energy carriers"
feh2b "buildings use of hydrogen"
feheb "buildings use of district heat"
feelcb "buildings use of conventional electricity (all but space heating)"
feelhpb "buildings use of electricity for space heating with heat pumps"
feelrhb "buildings use of electricity for space heating with resistive heating"
enb "buildings energy use"
enhb "buildings heat energy use"
enhgab "buildings heat gaseous energy use (fegab and feh2b)"
fesob "buildings use of solid energy carriers"
fehob "buildings use of liquid energy carriers"
fegab "buildings use of gaseous energy carriers"
feh2b "buildings use of hydrogen"
feheb "buildings use of district heat"
feelhpb "buildings use of electricity for heat pumps"
feelrhcob "buildings use of electricity for resistive heating and cooking"
feelalb "buildings use of electricity for appliances and lighting"
feelictb "buildings use of electricity for information and communication technology"
feelscb "buildings use of electricity for space cooling"
/

ppfen_buildings_dyn36(all_in) "primary production factors energy - buildings"
Expand All @@ -28,18 +30,20 @@ Sets
fegab
feh2b
feheb
feelcb
feelhpb
feelrhb
feelrhcob
feelalb
feelictb
feelscb
/

cal_ppf_buildings_dyn36(all_in) "primary production factors for calibration - buildings"

ces_buildings_dyn36(all_in,all_in) "CES tree structure - buildings"
/
en . enb
enb . (enhb, feelcb)
enhb . (fesob, fehob, feheb, feelhpb, feelrhb, enhgab)
enb . (enhb, feelalb, feelictb, feelscb)
enhb . (fesob, fehob, feheb, feelhpb, feelrhcob, enhgab)
enhgab . (fegab, feh2b)
/

Expand All @@ -60,7 +64,7 @@ Sets
fegas . fegab
feh2s . feh2b
fehes . feheb
feels . (feelcb,feelhpb,feelrhb)
feels . (feelrhcob, feelhpb, feelalb, feelictb, feelscb)
/

ue_dyn36(all_in) "useful energy items"
Expand Down
Loading