diff --git a/CHANGELOG.md b/CHANGELOG.md index fc5ddd12d..808d7438a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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` diff --git a/config/default.cfg b/config/default.cfg index 7c22af40e..59cac4c80 100644 --- a/config/default.cfg +++ b/config/default.cfg @@ -28,10 +28,10 @@ cfg$regionmapping <- "config/regionmappingH12.csv" cfg$extramappings_historic <- "" #### Current input data revision (.) #### -cfg$inputRevision <- "7.95" +cfg$inputRevision <- "7.91ces" #### Current CES parameter and GDX revision (commit hash) #### -cfg$CESandGDXversion <- "dec24b712ce59db95bb4385ba71ec9a4cd921041" +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 diff --git a/core/sets.gms b/core/sets.gms index 06c56998a..70df2c6f8 100755 --- a/core/sets.gms +++ b/core/sets.gms @@ -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" @@ -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" diff --git a/modules/29_CES_parameters/calibrate/bounds.gms b/modules/29_CES_parameters/calibrate/bounds.gms index bad3b9754..379c33a00 100644 --- a/modules/29_CES_parameters/calibrate/bounds.gms +++ b/modules/29_CES_parameters/calibrate/bounds.gms @@ -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 diff --git a/modules/29_CES_parameters/calibrate/sets.gms b/modules/29_CES_parameters/calibrate/sets.gms index d68f86579..b075b51a7 100644 --- a/modules/29_CES_parameters/calibrate/sets.gms +++ b/modules/29_CES_parameters/calibrate/sets.gms @@ -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" / diff --git a/modules/29_CES_parameters/load/not_used.txt b/modules/29_CES_parameters/load/not_used.txt index 50214f04d..00f0c0c5a 100644 --- a/modules/29_CES_parameters/load/not_used.txt +++ b/modules/29_CES_parameters/load/not_used.txt @@ -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 diff --git a/modules/36_buildings/simple/sets.gms b/modules/36_buildings/simple/sets.gms index c34d6d1c1..b4dabc6ce 100644 --- a/modules/36_buildings/simple/sets.gms +++ b/modules/36_buildings/simple/sets.gms @@ -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" @@ -28,9 +30,11 @@ Sets fegab feh2b feheb - feelcb feelhpb - feelrhb + feelrhcob + feelalb + feelictb + feelscb / cal_ppf_buildings_dyn36(all_in) "primary production factors for calibration - buildings" @@ -38,8 +42,8 @@ Sets 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) / @@ -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"