diff --git a/prototypes/residential/MFm-1985-boiler/root_boiler.pxt b/prototypes/residential/MFm-1985-boiler/templates/root_boiler.pxt similarity index 99% rename from prototypes/residential/MFm-1985-boiler/root_boiler.pxt rename to prototypes/residential/MFm-1985-boiler/templates/root_boiler.pxt index 520f16b2..fd5a3ca1 100644 --- a/prototypes/residential/MFm-1985-boiler/root_boiler.pxt +++ b/prototypes/residential/MFm-1985-boiler/templates/root_boiler.pxt @@ -78,6 +78,11 @@ parameter "boiler_eff_curve", :default=>'Cond_Boiler_Eff' # Efficiency Curve Temperature Evaluation Variable parameter "curve_evaluation_variable", :default=>'LeavingBoiler' +# Parameterize Setpoint at Outdoor Low/High Temperature added by Behzad Rizi (Solaris Technical), 2026-03-12 +parameter "supply_temp_at_lo", :default=>130['F'] +parameter "lo_outdoor_temp", :default=>20['F'] +parameter "supply_temp_at_hi", :default=>105['F'] +parameter "hi_outdoor_temp", :default=>50['F'] #Duct Loss parameter "total_leakage_ratio", :default=>0.15 #total leakage ratio @@ -55130,25 +55135,14 @@ Controller:OutdoorAir, !- Inputs based on EnergyPlus defaults and boiler library. !- =========== ALL OBJECTS IN CLASS: SETPOINTMANAGER:OUTDOORAIRRESET =========== - -SetpointManager:OutdoorAirReset, - Hot Water Loop Setpoint Manager, !- Name - Temperature, !- Control Variable - 93.3333333333333, !- Setpoint at Outdoor Low Temperature {C} - -17.7777777777778, !- Outdoor Low Temperature {C} - 40, !- Setpoint at Outdoor High Temperature {C} - 21.1111111111111, !- Outdoor High Temperature {C} - Hot Water Loop Setpoint Node List; !- Setpoint Node or NodeList Name - SetpointManager:OutdoorAirReset, - Boiler Setpoint Manager, !- Name - Temperature, !- Control Variable - 73.88888888888888, !- Setpoint at Outdoor Low Temperature {C} - -17.7777777777778, !- Outdoor Low Temperature {C} - 60, !- Setpoint at Outdoor High Temperature {C} - 21.1111111111111, !- Outdoor High Temperature {C} - Boiler Water Oulet Node; !- Setpoint Node or NodeList Name - + Hot Water Loop Setpoint Manager, !- Name + Temperature, !- Control Variable + <%= supply_temp_at_lo %>, !- Setpoint at Outdoor Low Temperature + <%= lo_outdoor_temp %>, !- Outdoor Low Temperature + <%= supply_temp_at_hi %>, !- Setpoint at Outdoor High Temperature + <%= hi_outdoor_temp %>, !- Outdoor High Temperature + Hot Water Loop Setpoint Node List; !- Setpoint Node or NodeList Name !- =========== ALL OBJECTS IN CLASS: CURVE:BICUBIC =========== diff --git a/prototypes/residential/MFm-1985-boiler/root_steam_boiler.pxt b/prototypes/residential/MFm-1985-boiler/templates/root_steam_boiler.pxt similarity index 99% rename from prototypes/residential/MFm-1985-boiler/root_steam_boiler.pxt rename to prototypes/residential/MFm-1985-boiler/templates/root_steam_boiler.pxt index fd1f59ae..1e546582 100644 --- a/prototypes/residential/MFm-1985-boiler/root_steam_boiler.pxt +++ b/prototypes/residential/MFm-1985-boiler/templates/root_steam_boiler.pxt @@ -54998,7 +54998,6 @@ Controller:OutdoorAir, !- Inputs based on EnergyPlus defaults and boiler library. !- =========== ALL OBJECTS IN CLASS: SETPOINTMANAGER:OUTDOORAIRRESET =========== - SetpointManager:OutdoorAirReset, Boiler Setpoint Manager, !- Name Temperature, !- Control Variable diff --git a/prototypes/residential/MFm-New-boiler/root_boiler_new.pxt b/prototypes/residential/MFm-New-boiler/root_boiler_new.pxt index 55b1d864..30e6bd91 100644 --- a/prototypes/residential/MFm-New-boiler/root_boiler_new.pxt +++ b/prototypes/residential/MFm-New-boiler/root_boiler_new.pxt @@ -88,6 +88,12 @@ parameter "boiler_eff_curve", :default=>'Cond_Boiler_Eff' # Efficiency Curve Temperature Evaluation Variable parameter "curve_evaluation_variable", :default=>'LeavingBoiler' +# Parameters for Setpoint at Outdoor Low/High Temperature added by Behzad Rizi (Solaris Technical), 2025-08-06 +# Setpoint at Outdoor Low Temperature +parameter "setpoint_oa_low_temp", :default=>165 + +# Setpoint at Outdoor High Temperature +parameter "setpoint_oa_high_temp", :default=>140 #Duct Loss parameter "total_leakage_ratio", :default=>0.12 #total leakage ratio parameter "number_of_stories", :default=>1 #no. of stories, default one story @@ -55221,9 +55227,9 @@ SetpointManager:OutdoorAirReset, SetpointManager:OutdoorAirReset, Boiler Setpoint Manager, !- Name Temperature, !- Control Variable - 73.88888888888888, !- Setpoint at Outdoor Low Temperature {C} + <%= setpoint_oa_low_temp %>, !- Setpoint at Outdoor Low Temperature {C} -17.7777777777778, !- Outdoor Low Temperature {C} - 60, !- Setpoint at Outdoor High Temperature {C} + <%= setpoint_oa_high_temp %>, !- Setpoint at Outdoor High Temperature {C} 21.1111111111111, !- Outdoor High Temperature {C} Boiler Water Oulet Node; !- Setpoint Node or NodeList Name diff --git a/residential measures/SWHC004-07 Space Heating Boiler/SWHC004-07 Space Heating Boiler_MFm_Ex/cases/MFm&0&rNCHW&Ex&SpaceHtg_eq__HotWaterBoiler.csv b/residential measures/SWHC004-07 Space Heating Boiler/SWHC004-07 Space Heating Boiler_MFm_Ex/cases/MFm&0&rNCHW&Ex&SpaceHtg_eq__HotWaterBoiler.csv index 10fe5f52..aa089e2f 100644 --- a/residential measures/SWHC004-07 Space Heating Boiler/SWHC004-07 Space Heating Boiler_MFm_Ex/cases/MFm&0&rNCHW&Ex&SpaceHtg_eq__HotWaterBoiler.csv +++ b/residential measures/SWHC004-07 Space Heating Boiler/SWHC004-07 Space Heating Boiler_MFm_Ex/cases/MFm&0&rNCHW&Ex&SpaceHtg_eq__HotWaterBoiler.csv @@ -1,8 +1,7 @@ -skip,case_name,:boiler_eff,:boiler_eff_curve,:curve_evaluation_variable -,AFUE_84_Non-Condensing_baseline,0.84,NonCond_Boiler_Eff,LeavingBoiler -,AFUE_83_Non-Condensing_baseline,0.83,NonCond_Boiler_Eff,LeavingBoiler -#,AFUE_85_Non-Condensing_baseline,0.85,NonCond_Boiler_Eff,LeavingBoiler -,Msr_AFUE_93_ Condensing_ECM,0.93,Cond_Boiler_Eff,EnteringBoiler -,Msr_AFUE_94_ Condensing_ECM,0.94,Cond_Boiler_Eff,EnteringBoiler -,Msr_AFUE_85_Non-Condensing_ECM,0.85,NonCond_Boiler_Eff,LeavingBoiler -,Msr_AFUE_85.3_Non-Condensing_ECM,0.853,NonCond_Boiler_Eff,LeavingBoiler +skip,case_name,:boiler_eff,:boiler_eff_curve,:curve_evaluation_variable,:setpoint_oa_low_temp,:setpoint_oa_high_temp +,RG-SpaceHtg_eq-Boiler-Non-Cond-83-TE,0.83,NonCond_Boiler_Eff,LeavingBoiler,130['F'],105['F'] +,RG-SpaceHtg_eq-Boiler-Non-Cond-84-TE,0.84,NonCond_Boiler_Eff,LeavingBoiler,130['F'],105['F'] +,RG-SpaceHtg_eq-Boiler-Cond-94-TE,0.94,Cond_Boiler_Eff,EnteringBoiler,130['F'],105['F'] +,RG-SpaceHtg_eq-Boiler-Cond-93-TE,0.93,Cond_Boiler_Eff,EnteringBoiler,130['F'],105['F'] +,RG-SpaceHtg_eq-Boiler-Non-Cond-85-TE,0.85,NonCond_Boiler_Eff,LeavingBoiler,130['F'],105['F'] +,RG-SpaceHtg_eq-Boiler-Non-Cond-85.3-TE,0.853,NonCond_Boiler_Eff,LeavingBoiler,130['F'],105['F'] diff --git a/residential measures/SWHC004-07 Space Heating Boiler/SWHC004-07 Space Heating Boiler_MFm_Ex/cases/MFm&0&rNCHW&Ex&SpaceHtg_eq__SteamBoiler.csv b/residential measures/SWHC004-07 Space Heating Boiler/SWHC004-07 Space Heating Boiler_MFm_Ex/cases/MFm&0&rNCHW&Ex&SpaceHtg_eq__SteamBoiler.csv index 666815b5..186da48f 100644 --- a/residential measures/SWHC004-07 Space Heating Boiler/SWHC004-07 Space Heating Boiler_MFm_Ex/cases/MFm&0&rNCHW&Ex&SpaceHtg_eq__SteamBoiler.csv +++ b/residential measures/SWHC004-07 Space Heating Boiler/SWHC004-07 Space Heating Boiler_MFm_Ex/cases/MFm&0&rNCHW&Ex&SpaceHtg_eq__SteamBoiler.csv @@ -1,3 +1,3 @@ skip,case_name,:steam_boiler_eff -,TE_81_Steam_baseline,0.81 -,Msr_TE_82_ECM,0.82 +,RG-SpaceHtg_eq-Boiler-Steam-82-TE,0.82 +,RG-SpaceHtg_eq-Boiler-Steam-81-TE,0.81 diff --git a/residential measures/SWHC004-07 Space Heating Boiler/SWHC004-07 Space Heating Boiler_MFm_New/cases/MFm&0&rNCHW&New&SpaceHtg_eq__HotWaterBoiler.csv b/residential measures/SWHC004-07 Space Heating Boiler/SWHC004-07 Space Heating Boiler_MFm_New/cases/MFm&0&rNCHW&New&SpaceHtg_eq__HotWaterBoiler.csv deleted file mode 100644 index 10fe5f52..00000000 --- a/residential measures/SWHC004-07 Space Heating Boiler/SWHC004-07 Space Heating Boiler_MFm_New/cases/MFm&0&rNCHW&New&SpaceHtg_eq__HotWaterBoiler.csv +++ /dev/null @@ -1,8 +0,0 @@ -skip,case_name,:boiler_eff,:boiler_eff_curve,:curve_evaluation_variable -,AFUE_84_Non-Condensing_baseline,0.84,NonCond_Boiler_Eff,LeavingBoiler -,AFUE_83_Non-Condensing_baseline,0.83,NonCond_Boiler_Eff,LeavingBoiler -#,AFUE_85_Non-Condensing_baseline,0.85,NonCond_Boiler_Eff,LeavingBoiler -,Msr_AFUE_93_ Condensing_ECM,0.93,Cond_Boiler_Eff,EnteringBoiler -,Msr_AFUE_94_ Condensing_ECM,0.94,Cond_Boiler_Eff,EnteringBoiler -,Msr_AFUE_85_Non-Condensing_ECM,0.85,NonCond_Boiler_Eff,LeavingBoiler -,Msr_AFUE_85.3_Non-Condensing_ECM,0.853,NonCond_Boiler_Eff,LeavingBoiler diff --git a/residential measures/SWHC004-07 Space Heating Boiler/SWHC004-07 Space Heating Boiler_MFm_New/cases/MFm&0&rNCHW&New&SpaceHtg_eq__SteamBoiler.csv b/residential measures/SWHC004-07 Space Heating Boiler/SWHC004-07 Space Heating Boiler_MFm_New/cases/MFm&0&rNCHW&New&SpaceHtg_eq__SteamBoiler.csv deleted file mode 100644 index 666815b5..00000000 --- a/residential measures/SWHC004-07 Space Heating Boiler/SWHC004-07 Space Heating Boiler_MFm_New/cases/MFm&0&rNCHW&New&SpaceHtg_eq__SteamBoiler.csv +++ /dev/null @@ -1,3 +0,0 @@ -skip,case_name,:steam_boiler_eff -,TE_81_Steam_baseline,0.81 -,Msr_TE_82_ECM,0.82 diff --git a/residential measures/SWHC004-07 Space Heating Boiler/SWHC004-07 Space Heating Boiler_MFm_New/climates.csv b/residential measures/SWHC004-07 Space Heating Boiler/SWHC004-07 Space Heating Boiler_MFm_New/climates.csv deleted file mode 100644 index f4d95d28..00000000 --- a/residential measures/SWHC004-07 Space Heating Boiler/SWHC004-07 Space Heating Boiler_MFm_New/climates.csv +++ /dev/null @@ -1,17 +0,0 @@ -skip,climate,hz_cz,weather_file,climate_zone,codes_file -,CZ01,,CA_EUREKA_725940S_CZ2022.epw,1,T24_2022_MFm.csv -,CZ02,,CA_NAPA-CO_724955S_CZ2022.epw,2,T24_2022_MFm.csv -,CZ03,,CA_OAKLAND-METRO-AP_724930S_CZ2022.epw,3,T24_2022_MFm.csv -,CZ04,,CA_SAN-JOSE-IAP_724945S_CZ2022.epw,4,T24_2022_MFm.csv -,CZ05,,CA_SANTA-MARIA-PUBLIC-AP_723940S_CZ2022.epw,5,T24_2022_MFm.csv -,CZ06,,CA_LOS-ANGELES-IAP_722950S_CZ2022.epw,6,T24_2022_MFm.csv -,CZ07,,CA_SAN-DIEGO-LINDBERGH-FLD_722900S_CZ2022.epw,7,T24_2022_MFm.csv -,CZ08,,CA_LONG-BEACH-DAUGHERTY-FLD_722970S_CZ2022.epw,8,T24_2022_MFm.csv -,CZ09,,CA_LOS-ANGELES-DOWNTOWN-USC_722874S_CZ2022.epw,9,T24_2022_MFm.csv -,CZ10,,CA_RIVERSIDE-MUNI_722869S_CZ2022.epw,10,T24_2022_MFm.csv -,CZ11,,CA_RED-BLUFF-MUNI-AP_725910S_CZ2022.epw,11,T24_2022_MFm.csv -,CZ12,,CA_STOCKTON-METRO-AP_724920S_CZ2022.epw,12,T24_2022_MFm.csv -,CZ13,,CA_FRESNO-YOSEMITE-IAP_723890S_CZ2022.epw,13,T24_2022_MFm.csv -,CZ14,,CA_DAGGETT-BARSTOW-AP_723815S_CZ2022.epw,14,T24_2022_MFm.csv -,CZ15,,CA_EL-CENTRO-NAF_722810S_CZ2022.epw,15,T24_2022_MFm.csv -,CZ16,,CA_BISHOP-AP_724800S_CZ2022.epw,16,T24_2022_MFm.csv diff --git a/residential measures/SWHC004-07 Space Heating Boiler/SWHC004-07 Space Heating Boiler_MFm_New/cohorts.csv b/residential measures/SWHC004-07 Space Heating Boiler/SWHC004-07 Space Heating Boiler_MFm_New/cohorts.csv deleted file mode 100644 index 66308aaa..00000000 --- a/residential measures/SWHC004-07 Space Heating Boiler/SWHC004-07 Space Heating Boiler_MFm_New/cohorts.csv +++ /dev/null @@ -1,3 +0,0 @@ -skip,cohort,root,:glass_u,:glass_shgc,:wall_consol_layer_thickness,:wall_consol_layer_conductivity,:wall_insulation_layer_thickness,:wall_insulation_layer_conductivity,:ceil_consol_layer_thickness,:ceil_consol_layer_conductivity,:climate_zone,:slab_perimeter_insulation,:roofing,:below_roof_deck_insulation,:radiant_barrier,:duct_r_value -,MFm&0&rNCHW&New&SpaceHtg_eq__HotWaterBoiler,MFm-New-boiler/templates/root_boiler_new.pxt,"%= codes.lookup(""Res Key Prototype Values | Climate Zone #{climate_zone}"", ""Vertical Fenestration U-Factor"", ""Value"")['U-IP']","%= codes.lookup(""Res Key Prototype Values | Climate Zone #{climate_zone}"", ""Vertical Fenestration SHGC"", ""Value"")","%= codes.lookup(""Res Key Prototype Values | Climate Zone #{climate_zone}"", ""wall_consol_layer_thickness"", ""Value"")['m']","%= codes.lookup(""Res Key Prototype Values | Climate Zone #{climate_zone}"", ""wall_consol_layer_conductivity"", ""Value"")","%= codes.lookup(""Res Key Prototype Values | Climate Zone #{climate_zone}"", ""wall_insulation_layer_thickness"", ""Value"")","%= codes.lookup(""Res Key Prototype Values | Climate Zone #{climate_zone}"", ""wall_insulation_layer_conductivity"", ""Value"")","%= codes.lookup(""Res Key Prototype Values | Climate Zone #{climate_zone}"", ""ceil_consol_layer_thickness"", ""Value"")['m']","%= codes.lookup(""Res Key Prototype Values | Climate Zone #{climate_zone}"", ""ceil_consol_layer_conductivity"", ""Value"")","%= codes.lookup(""Res Key Prototype Values | Climate Zone #{climate_zone}"", ""climate_zone"", ""Value"")","%= codes.lookup(""Res Key Prototype Values | Climate Zone #{climate_zone}"", ""Slab Floor"", ""Value"")","%= codes.lookup(""Res Key Prototype Values | Climate Zone #{climate_zone}"", ""Roofing"", ""Value"")","%= codes.lookup(""Res Key Prototype Values | Climate Zone #{climate_zone}"", ""Below Roof Deck Insulation"", ""Value"")","%= codes.lookup(""Res Key Prototype Values | Climate Zone #{climate_zone}"", ""Radiant Barrier"", ""Value"")","%= codes.lookup(""Res Key Prototype Values | Climate Zone #{climate_zone}"", ""Duct Insulation"", ""Value"")['R-IP']" -,MFm&0&rNCHW&New&SpaceHtg_eq__SteamBoiler,MFm-New-boiler/templates/root_steam_boiler_new.pxt,"%= codes.lookup(""Res Key Prototype Values | Climate Zone #{climate_zone}"", ""Vertical Fenestration U-Factor"", ""Value"")['U-IP']","%= codes.lookup(""Res Key Prototype Values | Climate Zone #{climate_zone}"", ""Vertical Fenestration SHGC"", ""Value"")","%= codes.lookup(""Res Key Prototype Values | Climate Zone #{climate_zone}"", ""wall_consol_layer_thickness"", ""Value"")['m']","%= codes.lookup(""Res Key Prototype Values | Climate Zone #{climate_zone}"", ""wall_consol_layer_conductivity"", ""Value"")","%= codes.lookup(""Res Key Prototype Values | Climate Zone #{climate_zone}"", ""wall_insulation_layer_thickness"", ""Value"")","%= codes.lookup(""Res Key Prototype Values | Climate Zone #{climate_zone}"", ""wall_insulation_layer_conductivity"", ""Value"")","%= codes.lookup(""Res Key Prototype Values | Climate Zone #{climate_zone}"", ""ceil_consol_layer_thickness"", ""Value"")['m']","%= codes.lookup(""Res Key Prototype Values | Climate Zone #{climate_zone}"", ""ceil_consol_layer_conductivity"", ""Value"")","%= codes.lookup(""Res Key Prototype Values | Climate Zone #{climate_zone}"", ""climate_zone"", ""Value"")","%= codes.lookup(""Res Key Prototype Values | Climate Zone #{climate_zone}"", ""Slab Floor"", ""Value"")","%= codes.lookup(""Res Key Prototype Values | Climate Zone #{climate_zone}"", ""Roofing"", ""Value"")","%= codes.lookup(""Res Key Prototype Values | Climate Zone #{climate_zone}"", ""Below Roof Deck Insulation"", ""Value"")","%= codes.lookup(""Res Key Prototype Values | Climate Zone #{climate_zone}"", ""Radiant Barrier"", ""Value"")","%= codes.lookup(""Res Key Prototype Values | Climate Zone #{climate_zone}"", ""Duct Insulation"", ""Value"")['R-IP']" diff --git a/residential measures/SWHC004-07 Space Heating Boiler/SWHC004-07 Space Heating Boiler_MFm_New/query.txt b/residential measures/SWHC004-07 Space Heating Boiler/SWHC004-07 Space Heating Boiler_MFm_New/query.txt deleted file mode 100644 index b7a670df..00000000 --- a/residential measures/SWHC004-07 Space Heating Boiler/SWHC004-07 Space Heating Boiler_MFm_New/query.txt +++ /dev/null @@ -1,29 +0,0 @@ -AnnualBuildingUtilityPerformanceSummary/Entire Facility/Site and Source Energy/Energy Per Total Building Area/Net Site Energy, Net Site EUI -AnnualBuildingUtilityPerformanceSummary/Entire Facility/Site and Source Energy/Energy Per Total Building Area/Net Source Energy, Net Source EUI -AnnualBuildingUtilityPerformanceSummary/Entire Facility/Site and Source Energy/Total Energy/Net Site Energy -AnnualBuildingUtilityPerformanceSummary/Entire Facility/Site and Source Energy/Total Energy/Net Source Energy - -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Total End Uses, Total -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Heating, Heating -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Cooling, Cooling -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Interior Lighting, Interior Lighting -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Exterior Lighting, Exterior Lighting -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Interior Equipment, Interior Equipment -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Exterior Equipment, Exterior Equipment -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Fans, Fans -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Pumps, Pumps -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Heat Rejection, Heat Rejection -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Humidification, Humidification -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Heat Recovery, Heat Recovery -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Water Systems, Water Systems -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Refrigeration, Refrigeration -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Generators, Generators -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Heating, Heating Elec -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Cooling, Cooling Elec -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Heating, Heating NG -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Cooling, Cooling NG -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Interior Equipment, Interior Equipment Elec -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Interior Equipment, Interior Equipment NG - -AnnualBuildingUtilityPerformanceSummary/Entire Facility/Comfort and Setpoint Not Met Summary/Facility/Time Setpoint Not Met During Occupied Heating, Unmet Heating -AnnualBuildingUtilityPerformanceSummary/Entire Facility/Comfort and Setpoint Not Met Summary/Facility/Time Setpoint Not Met During Occupied Cooling, Unmet Cooling diff --git a/residential measures/SWHC004-07 Space Heating Boiler/SWHC004-07 Space Heating Boiler_MFm_New/query_boiler_sizing.txt b/residential measures/SWHC004-07 Space Heating Boiler/SWHC004-07 Space Heating Boiler_MFm_New/query_boiler_sizing.txt deleted file mode 100644 index 37a2ca27..00000000 --- a/residential measures/SWHC004-07 Space Heating Boiler/SWHC004-07 Space Heating Boiler_MFm_New/query_boiler_sizing.txt +++ /dev/null @@ -1,32 +0,0 @@ -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Heating -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Cooling -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Interior Lighting -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Exterior Lighting -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Interior Equipment -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Exterior Equipment -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Fans -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Pumps -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Heat Rejection -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Humidification -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Heat Recovery -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Water Systems -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Refrigeration -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Generators -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Heating -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Cooling -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Interior Lighting -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Exterior Lighting -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Interior Equipment -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Exterior Equipment -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Fans -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Pumps -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Heat Rejection -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Humidification -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Heat Recovery -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Water Systems -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Refrigeration -AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Generators -ComponentSizingSummary/Entire Facility/Coil:Heating:Water/Design Size Rated Capacity/*, Coil:Heating:Water Design Size Rated Capacity -ComponentSizingSummary/Entire Facility/Boiler:HotWater/Design Size Nominal Capacity/*, Boiler:HotWater Design Size Nominal Capacity -ComponentSizingSummary/Entire Facility/Coil:Heating:Steam/Maximum Steam Flow Rate/*, Coil:Heating:Steam Maximum Steam Flow Rate -ComponentSizingSummary/Entire Facility/Boiler:Steam/Design Size Nominal Capacity/*, Boiler:Steam Design Size Nominal Capacity diff --git a/scripts/data transformation/insert_normunits.py b/scripts/data transformation/insert_normunits.py index 9543ae44..8d66846b 100644 --- a/scripts/data transformation/insert_normunits.py +++ b/scripts/data transformation/insert_normunits.py @@ -27,6 +27,7 @@ * 2024-04-06 Make dependence on measure list and NumStor2 more explicit. * ... Include more error checking and progress statements. * 2024-04-08 Updates for commercial building type compatibility. + * 2025-08-06 Changed conversion factor "W" to "kBtu/h" from 3.412141633 to 0.003412141633. @Author: Nicholas Fette, Behzad Salimian Rizi @Date: 2024-01-19 @@ -209,7 +210,7 @@ def test(): normunit = 'CapOut-kBtuh' # Specify a multipler, e.g. for a unit conversion. - kbtuh_per_watt = 3.412141633 + kbtuh_per_watt = 0.003412 # Correct: W → kBtu/h sizing_multiplier = 1/kbtuh_per_watt measure_name = 'Wall Furnace'