Refactor buildings ces tree#2331
Conversation
ricardarosemann
left a comment
There was a problem hiding this comment.
Thanks, looks good - I only think that we can probably delete/skip some of the things that you have added or modified. I'm happy to help if you have questions on this.
| 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" |
There was a problem hiding this comment.
I'm wondering if we still need these set elements in all_enty - buildings final energy quantities are to my knowledge mostly handled via fegas, fehos, feels and so on. There is one mapping that maps fegas in buildings to fegab etc., but it actually only includes feelb as far as electricity demand is concerned.
| 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" |
There was a problem hiding this comment.
I'm pretty certain we don't need this here. The dimension of the object that the buildings input data is read into is all_in not all_enty. So if we only need these entries for reporting, they should only exist in all_in.
| feelb . (feelcb,feelhpb,feelrhb) | ||
| feelb . (feelrhcob, feelhpb, feelalb, feelictb, feelscb) |
There was a problem hiding this comment.
I don't think we need this anymore: As far as I can see the set fe_tax_sub_sbi which is derived from fe_tax_sub36 is only called with "fehos" as first entry, which we do not have here. So fe_tax_sub36 can most likely be removed.
There was a problem hiding this comment.
I checked with Laurin, we can remove fe_tax_sub36; we might want to do this in a separate PR.
Purpose of this PR
This PR refactors REMIND's buildings CES tree structure to provide more granular representation of electricity end-uses and removes unnecessary calibration bounds.
Type of change
Key changes:
feelalb,feelictb,feelscb) to be direct children ofenbrather than aggregated infeelcb.space_heating_elecHP_fe,water_heating_natgas_fe) to support future post-processing.New Buildings CES Structure
graph TD en["en (total energy)"] enb["enb (buildings energy)"] enhb["enhb (buildings heating energy)"] enhgab["enhgab (gases)"] fesob["fesob (solids)"] fehob["fehob (liquids)"] feheb["feheb (district heat)"] feelhpb["feelhpb (electricity for heat pumps)"] feelrhcob["feelrhcob (electricity for resistive heating and cooking)\n[RENAMED from feelrhb]"] fegab["fegab (natural gas)"] feh2b["feh2b (hydrogen)"] feelalb["feelalb (electricity for appliances and lighting)\n[NEW - was part of feelcb]"] feelictb["feelictb (electricity for ICT)\n[NEW - was part of feelcb]"] feelscb["feelscb (electricity for space cooling)\n[NEW - was part of feelcb]"] en --> enb enb --> enhb enb --> feelalb enb --> feelictb enb --> feelscb enhb --> fesob enhb --> fehob enhb --> feheb enhb --> feelhpb enhb --> feelrhcob enhb --> enhgab enhgab --> fegab enhgab --> feh2bChanges from previous structure:
feelcb(conventional electricity) → split intofeelalb,feelictb,feelscbfeelrhb(resistive heating electricity) → renamed tofeelrhcobsince it also includes electric cookingParts concerned
Impact
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.
make test) after my final commit and all tests pass (FAIL 0)remind2if and where it was neededforbiddenColumnNamesin readCheckScenarioConfig.R in case the PR leads to deprecated switchesCHANGELOG.mdcorrectly (added, changed, fixed, removed, input data/calibration)Further information (optional)
I will provide further information, update the inputRevision, etc. as soon as all the runs are completed.