diff --git a/lib/openstudio-standards.rb b/lib/openstudio-standards.rb index ea6814086e..e3ed5fc987 100644 --- a/lib/openstudio-standards.rb +++ b/lib/openstudio-standards.rb @@ -35,6 +35,9 @@ module OpenstudioStandards require_relative 'openstudio-standards/schedules/information' require_relative 'openstudio-standards/schedules/parametric' + # ServiceWaterHeating Module + require_relative 'openstudio-standards/service_water_heating/component' + # Space Module require_relative 'openstudio-standards/space/space' diff --git a/lib/openstudio-standards/prototypes/common/objects/Prototype.ServiceWaterHeating.rb b/lib/openstudio-standards/prototypes/common/objects/Prototype.ServiceWaterHeating.rb index 31c70f755e..aee87a3c9e 100644 --- a/lib/openstudio-standards/prototypes/common/objects/Prototype.ServiceWaterHeating.rb +++ b/lib/openstudio-standards/prototypes/common/objects/Prototype.ServiceWaterHeating.rb @@ -99,19 +99,19 @@ def model_add_swh_loop(model, swh_pump.setMotorEfficiency(service_water_pump_motor_efficiency) swh_pump.addToNode(service_water_loop.supplyInletNode) - water_heater = model_add_water_heater(model, - water_heater_capacity, - water_heater_volume, - water_heater_fuel, - service_water_temperature, - parasitic_fuel_consumption_rate, - swh_temp_sch, - false, - 0.0, - nil, - water_heater_thermal_zone, - number_water_heaters) - + water_heater = OpenstudioStandards::ServiceWaterHeating.model_add_water_heater(model, + water_heater_capacity: water_heater_capacity, + water_heater_volume: water_heater_volume, + water_heater_fuel: water_heater_fuel, + on_cycle_parasitic_fuel_consumption_rate: parasitic_fuel_consumption_rate, + off_cycle_parasitic_fuel_consumption_rate: parasitic_fuel_consumption_rate, + service_water_temperature: service_water_temperature, + service_water_temperature_schedule: swh_temp_sch, + set_peak_use_flowrate: false, + peak_flowrate: 0.0, + flowrate_schedule: nil, + water_heater_thermal_zone: water_heater_thermal_zone, + number_water_heaters: number_water_heaters) service_water_loop.addSupplyBranchForComponent(water_heater) # Pipe losses @@ -143,171 +143,6 @@ def model_add_swh_loop(model, return service_water_loop end - # Creates a water heater and attaches it to the supplied service water heating loop. - # - # @param model [OpenStudio::Model::Model] OpenStudio model object - # @param water_heater_capacity [Double] water heater capacity, in W - # @param water_heater_volume [Double] water heater volume, in m^3 - # @param water_heater_fuel [Double] valid choices are NaturalGas, Electricity - # @param service_water_temperature [Double] water heater temperature, in C - # @param parasitic_fuel_consumption_rate [Double] water heater parasitic fuel consumption rate, in W - # @param swh_temp_sch [OpenStudio::Model::Schedule] the service water heating schedule. If nil, will be defaulted. - # @param set_peak_use_flowrate [Boolean] if true, the peak flow rate and flow rate schedule will be set. - # @param peak_flowrate [Double] in m^3/s - # @param flowrate_schedule [String] name of the flow rate schedule - # @param water_heater_thermal_zone [OpenStudio::Model::ThermalZone] zone to place water heater in. - # If nil, will be assumed in 70F air for heat loss. - # @param number_water_heaters [Double] the number of water heaters represented by the capacity and volume inputs. - # Used to modify efficiencies for water heaters based on individual component size while avoiding having to model - # lots of individual water heaters (for runtime sake). - # @return [OpenStudio::Model::WaterHeaterMixed] the resulting water heater - def model_add_water_heater(model, - water_heater_capacity, - water_heater_volume, - water_heater_fuel, - service_water_temperature, - parasitic_fuel_consumption_rate, - swh_temp_sch, - set_peak_use_flowrate, - peak_flowrate, - flowrate_schedule, - water_heater_thermal_zone, - number_water_heaters) - # Water heater - # @todo Standards - Change water heater methodology to follow - # 'Model Enhancements Appendix A.' - water_heater_capacity_btu_per_hr = OpenStudio.convert(water_heater_capacity, 'W', 'Btu/hr').get - water_heater_capacity_kbtu_per_hr = OpenStudio.convert(water_heater_capacity_btu_per_hr, 'Btu/hr', 'kBtu/hr').get - water_heater_vol_gal = OpenStudio.convert(water_heater_volume, 'm^3', 'gal').get - - # Temperature schedule type limits - temp_sch_type_limits = OpenstudioStandards::Schedules.create_schedule_type_limits(model, - name: 'Temperature Schedule Type Limits', - lower_limit_value: 0.0, - upper_limit_value: 100.0, - numeric_type: 'Continuous', - unit_type: 'Temperature') - - if swh_temp_sch.nil? - # Service water heating loop controls - swh_temp_c = service_water_temperature - swh_temp_f = OpenStudio.convert(swh_temp_c, 'C', 'F').get - swh_delta_t_r = 9 # 9F delta-T - swh_temp_c = OpenStudio.convert(swh_temp_f, 'F', 'C').get - swh_delta_t_k = OpenStudio.convert(swh_delta_t_r, 'R', 'K').get - swh_temp_sch = OpenstudioStandards::Schedules.create_constant_schedule_ruleset(model, - swh_temp_c, - name: "Service Water Loop Temp - #{swh_temp_f.round}F", - schedule_type_limit: 'Temperature') - swh_temp_sch.setScheduleTypeLimits(temp_sch_type_limits) - end - - # Water heater depends on the fuel type - water_heater = OpenStudio::Model::WaterHeaterMixed.new(model) - - # Assign a quantity to the water heater if it represents multiple water heaters - if number_water_heaters > 1 - water_heater.setName("#{number_water_heaters}X #{(water_heater_vol_gal / number_water_heaters).round}gal #{water_heater_fuel} Water Heater - #{(water_heater_capacity_kbtu_per_hr / number_water_heaters).round}kBtu/hr") - water_heater.additionalProperties.setFeature('component_quantity', number_water_heaters) - else - water_heater.setName("#{water_heater_vol_gal.round}gal #{water_heater_fuel} Water Heater - #{water_heater_capacity_kbtu_per_hr.round}kBtu/hr") - end - - water_heater.setTankVolume(OpenStudio.convert(water_heater_vol_gal, 'gal', 'm^3').get) - water_heater.setSetpointTemperatureSchedule(swh_temp_sch) - water_heater.setDeadbandTemperatureDifference(2.0) - - if water_heater_thermal_zone.nil? - # Assume the water heater is indoors at 70F or 72F - case template - when '90.1-2004', '90.1-2007', '90.1-2010', '90.1-2013', '90.1-2016', '90.1-2019' - indoor_temp = 71.6 - else - indoor_temp = 70.0 - end - default_water_heater_ambient_temp_sch = OpenstudioStandards::Schedules.create_constant_schedule_ruleset(model, - OpenStudio.convert(indoor_temp, 'F', 'C').get, - name: "Water Heater Ambient Temp Schedule #{indoor_temp}F", - schedule_type_limit: 'Temperature') - default_water_heater_ambient_temp_sch.setScheduleTypeLimits(temp_sch_type_limits) - water_heater.setAmbientTemperatureIndicator('Schedule') - water_heater.setAmbientTemperatureSchedule(default_water_heater_ambient_temp_sch) - water_heater.resetAmbientTemperatureThermalZone - else - water_heater.setAmbientTemperatureIndicator('ThermalZone') - water_heater.setAmbientTemperatureThermalZone(water_heater_thermal_zone) - water_heater.resetAmbientTemperatureSchedule - end - - water_heater.setMaximumTemperatureLimit(service_water_temperature) - water_heater.setDeadbandTemperatureDifference(OpenStudio.convert(3.6, 'R', 'K').get) - water_heater.setHeaterControlType('Cycle') - water_heater.setHeaterMaximumCapacity(OpenStudio.convert(water_heater_capacity_btu_per_hr, 'Btu/hr', 'W').get) - water_heater.setOffCycleParasiticHeatFractiontoTank(0.8) - water_heater.setIndirectWaterHeatingRecoveryTime(1.5) # 1.5hrs - case water_heater_fuel - when 'Electricity' - water_heater.setHeaterFuelType('Electricity') - water_heater.setHeaterThermalEfficiency(1.0) - water_heater.setOffCycleParasiticFuelConsumptionRate(parasitic_fuel_consumption_rate) - water_heater.setOnCycleParasiticFuelConsumptionRate(parasitic_fuel_consumption_rate) - water_heater.setOffCycleParasiticFuelType('Electricity') - water_heater.setOnCycleParasiticFuelType('Electricity') - water_heater.setOffCycleLossCoefficienttoAmbientTemperature(1.053) - water_heater.setOnCycleLossCoefficienttoAmbientTemperature(1.053) - when 'Natural Gas', 'NaturalGas' - water_heater.setHeaterFuelType('Gas') - water_heater.setHeaterThermalEfficiency(0.78) - water_heater.setOffCycleParasiticFuelConsumptionRate(parasitic_fuel_consumption_rate) - water_heater.setOnCycleParasiticFuelConsumptionRate(parasitic_fuel_consumption_rate) - water_heater.setOffCycleParasiticFuelType('Gas') - water_heater.setOnCycleParasiticFuelType('Gas') - water_heater.setOffCycleLossCoefficienttoAmbientTemperature(6.0) - water_heater.setOnCycleLossCoefficienttoAmbientTemperature(6.0) - when 'HeatPump' - OpenStudio.logFree(OpenStudio::Warn, 'openstudio.Model.Model', 'Simple workaround to represent heat pump water heaters without incurring significant runtime penalty associated with using correct objects.') - # Make a part-load efficiency modifier curve with a value above 1, which - # is multiplied by the nominal efficiency of 100% to represent - # the COP of a HPWH. - # @todo could make this workaround better by using EMS - # to modify this curve output in realtime based on - # the OA temperature. - hpwh_cop = 2.8 - eff_f_of_plr = OpenStudio::Model::CurveCubic.new(model) - eff_f_of_plr.setName("HPWH_COP_#{hpwh_cop}") - eff_f_of_plr.setCoefficient1Constant(hpwh_cop) - eff_f_of_plr.setCoefficient2x(0.0) - eff_f_of_plr.setCoefficient3xPOW2(0.0) - eff_f_of_plr.setCoefficient4xPOW3(0.0) - eff_f_of_plr.setMinimumValueofx(0.0) - eff_f_of_plr.setMaximumValueofx(1.0) - water_heater.setHeaterFuelType('Electricity') - water_heater.setHeaterThermalEfficiency(1.0) - water_heater.setPartLoadFactorCurve(eff_f_of_plr) - water_heater.setOffCycleParasiticFuelConsumptionRate(parasitic_fuel_consumption_rate) - water_heater.setOnCycleParasiticFuelConsumptionRate(parasitic_fuel_consumption_rate) - water_heater.setOffCycleParasiticFuelType('Electricity') - water_heater.setOnCycleParasiticFuelType('Electricity') - water_heater.setOffCycleLossCoefficienttoAmbientTemperature(1.053) - water_heater.setOnCycleLossCoefficienttoAmbientTemperature(1.053) - else - OpenStudio.logFree(OpenStudio::Error, 'openstudio.Model.Model', "#{water_heater_fuel} is not a valid water heater fuel. Valid choices are Electricity, NaturalGas, and HeatPump.") - end - - if set_peak_use_flowrate - rated_flow_rate_m3_per_s = peak_flowrate - rated_flow_rate_gal_per_min = OpenStudio.convert(rated_flow_rate_m3_per_s, 'm^3/s', 'gal/min').get - water_heater.setPeakUseFlowRate(rated_flow_rate_m3_per_s) - - schedule = model_add_schedule(model, flowrate_schedule) - water_heater.setUseFlowRateFractionSchedule(schedule) - end - - OpenStudio.logFree(OpenStudio::Info, 'openstudio.Model.Model', "Added water heater called #{water_heater.name}") - - return water_heater - end - # Creates a heatpump water heater and attaches it to the supplied service water heating loop. # # @param model [OpenStudio::Model::Model] OpenStudio model object @@ -561,7 +396,7 @@ def model_add_heatpump_water_heater(model, # assume the water heater is indoors at 70F for now default_water_heater_ambient_temp_sch = OpenstudioStandards::Schedules.create_constant_schedule_ruleset(model, OpenStudio.convert(70.0, 'F', 'C').get, - name: 'Water Heater Ambient Temp Schedule - 70F', + name: 'Water Heater Ambient Temp Schedule 70F', schedule_type_limit: 'Temperature') if temp_sch_type_limits.nil? temp_sch_type_limits = OpenstudioStandards::Schedules.create_schedule_type_limits(model, diff --git a/lib/openstudio-standards/service_water_heating/component.rb b/lib/openstudio-standards/service_water_heating/component.rb new file mode 100644 index 0000000000..d28cfa633c --- /dev/null +++ b/lib/openstudio-standards/service_water_heating/component.rb @@ -0,0 +1,180 @@ +module OpenstudioStandards + # The ServiceWaterHeating module provides methods to create, modify, and get information about service water heating + module ServiceWaterHeating + # @!group Create Component + # Methods to add service water heating components + + # Creates a water heater and attaches it to the supplied service water heating loop. + # + # @param model [OpenStudio::Model::Model] OpenStudio model object + # @param water_heater_capacity [Double] water heater capacity, in W. Defaults to 58.6 kW / 200 kBtu/hr + # @param water_heater_volume [Double] water heater volume, in m^3. Defaults to 0.378 m^3 / 100 gal + # @param water_heater_fuel [String] water heating fuel. Valid choices are 'NaturalGas', 'Electricity', or 'HeatPump' + # @param on_cycle_parasitic_fuel_consumption_rate [Double] water heater on cycle parasitic fuel consumption rate, in W + # @param off_cycle_parasitic_fuel_consumption_rate [Double] water heater off cycle parasitic fuel consumption rate, in W + # @param service_water_temperature [Double] water heater temperature, in degrees C. Default is 60 C / 140 F. + # @param service_water_temperature_schedule [OpenStudio::Model::Schedule] the service water heating schedule. + # If nil, will be defaulted to a constant temperature schedule based on the service_water_temperature + # @param set_peak_use_flowrate [Boolean] if true, the peak flow rate and flow rate schedule will be set. + # @param peak_flowrate [Double] peak flow rate in m^3/s + # @param flowrate_schedule [OpenStudio::Model::Schedule] the flow rate fraction scehdulename of the flow rate schedule + # @param water_heater_thermal_zone [OpenStudio::Model::ThermalZone] Thermal zone for ambient heat loss. + # If nil, will assume 71.6 F / 22 C ambient air temperature. + # @param number_water_heaters [Integer] the number of water heaters represented by the capacity and volume inputs. + # Used to modify efficiencies for water heaters based on individual component size while avoiding having to model + # lots of individual water heaters (for runtime sake). + # @param service_water_loop [OpenStudio::Model::PlantLoop] if provided, add the water heater to this loop + # @return [OpenStudio::Model::WaterHeaterMixed] OpenStudio WaterHeaterMixed object + def self.model_add_water_heater(model, + water_heater_capacity: nil, + water_heater_volume: nil, + water_heater_fuel: 'Electricity', + on_cycle_parasitic_fuel_consumption_rate: 0.0, + off_cycle_parasitic_fuel_consumption_rate: 0.0, + service_water_temperature: 60.0, + service_water_temperature_schedule: nil, + set_peak_use_flowrate: false, + peak_flowrate: nil, + flowrate_schedule: nil, + water_heater_thermal_zone: nil, + number_water_heaters: 1, + service_water_loop: nil) + # create water heater object + # @todo Standards - Change water heater methodology to follow 'Model Enhancements Appendix A.' + water_heater = OpenStudio::Model::WaterHeaterMixed.new(model) + + # default water heater capacity if nil + if water_heater_capacity.nil? + water_heater_capacity = OpenStudio.convert(200.0, 'kBtu/hr', 'W').get + end + water_heater_capacity_kbtu_per_hr = OpenStudio.convert(water_heater_capacity, 'W', 'kBtu/hr').get + water_heater.setHeaterMaximumCapacity(water_heater_capacity) + + # default water heater volume if nil + if water_heater_volume.nil? + water_heater_volume = OpenStudio.convert(100.0, 'gal', 'm^3').get + end + water_heater_volume_gal = OpenStudio.convert(water_heater_volume, 'm^3', 'gal').get + water_heater.setTankVolume(water_heater_volume) + + # set the water heater fuel + case water_heater_fuel + when 'Natural Gas', 'NaturalGas', 'Gas' + water_heater.setHeaterFuelType('Gas') + water_heater.setHeaterThermalEfficiency(0.78) + water_heater.setOnCycleParasiticFuelConsumptionRate(on_cycle_parasitic_fuel_consumption_rate) + water_heater.setOffCycleParasiticFuelConsumptionRate(off_cycle_parasitic_fuel_consumption_rate) + water_heater.setOnCycleParasiticFuelType('Gas') + water_heater.setOffCycleParasiticFuelType('Gas') + water_heater.setOffCycleLossCoefficienttoAmbientTemperature(6.0) + water_heater.setOnCycleLossCoefficienttoAmbientTemperature(6.0) + when 'Electricity', 'Electric', 'Elec' + water_heater.setHeaterFuelType('Electricity') + water_heater.setHeaterThermalEfficiency(1.0) + water_heater.setOnCycleParasiticFuelConsumptionRate(on_cycle_parasitic_fuel_consumption_rate) + water_heater.setOffCycleParasiticFuelConsumptionRate(off_cycle_parasitic_fuel_consumption_rate) + water_heater.setOnCycleParasiticFuelType('Electricity') + water_heater.setOffCycleParasiticFuelType('Electricity') + water_heater.setOffCycleLossCoefficienttoAmbientTemperature(1.053) + water_heater.setOnCycleLossCoefficienttoAmbientTemperature(1.053) + when 'HeatPump', 'SimpleHeatPump' + OpenStudio.logFree(OpenStudio::Warn, 'openstudio.Model.Model', 'Simple workaround to represent heat pump water heaters without incurring significant runtime penalty associated with using correct objects.') + # Make a part-load efficiency modifier curve with a value above 1, which is multiplied by the nominal efficiency of 100% to represent the COP of a HPWH. + # @todo could make this workaround better by using EMS to modify this curve output in realtime based on the OA temperature. + hpwh_cop = 2.8 + water_heater.setHeaterFuelType('Electricity') + water_heater.setHeaterThermalEfficiency(1.0) + eff_f_of_plr = OpenStudio::Model::CurveCubic.new(model) + eff_f_of_plr.setName("HPWH_COP_#{hpwh_cop}") + eff_f_of_plr.setCoefficient1Constant(hpwh_cop) + eff_f_of_plr.setCoefficient2x(0.0) + eff_f_of_plr.setCoefficient3xPOW2(0.0) + eff_f_of_plr.setCoefficient4xPOW3(0.0) + eff_f_of_plr.setMinimumValueofx(0.0) + eff_f_of_plr.setMaximumValueofx(1.0) + water_heater.setPartLoadFactorCurve(eff_f_of_plr) + water_heater.setOnCycleParasiticFuelConsumptionRate(on_cycle_parasitic_fuel_consumption_rate) + water_heater.setOffCycleParasiticFuelConsumptionRate(off_cycle_parasitic_fuel_consumption_rate) + water_heater.setOnCycleParasiticFuelType('Electricity') + water_heater.setOffCycleParasiticFuelType('Electricity') + water_heater.setOffCycleLossCoefficienttoAmbientTemperature(1.053) + water_heater.setOnCycleLossCoefficienttoAmbientTemperature(1.053) + else + OpenStudio.logFree(OpenStudio::Error, 'openstudio.Model.Model', "#{water_heater_fuel} is not a valid water heater fuel. Valid choices are NaturalGas, Electricity, and HeatPump.") + end + + # set water temperature properties + water_heater.setDeadbandTemperatureDifference(2.0) + water_heater.setDeadbandTemperatureDifference(OpenStudio.convert(3.6, 'R', 'K').get) + water_heater.setHeaterControlType('Cycle') + water_heater.setOffCycleParasiticHeatFractiontoTank(0.8) + water_heater.setIndirectWaterHeatingRecoveryTime(1.5) # 1.5hrs + + # get or create temperature schedule type limits + temp_sch_type_limits = OpenstudioStandards::Schedules.create_schedule_type_limits(model, + name: 'Temperature Schedule Type Limits', + lower_limit_value: 0.0, + upper_limit_value: 100.0, + numeric_type: 'Continuous', + unit_type: 'Temperature') + + # create service water temperature schedule based on the service_water_temperature if none provided + if service_water_temperature_schedule.nil? + swh_temp_c = service_water_temperature + swh_temp_f = OpenStudio.convert(swh_temp_c, 'C', 'F').get + service_water_temperature_schedule = OpenstudioStandards::Schedules.create_constant_schedule_ruleset(model, + swh_temp_c, + name: "Service Water Loop Temp - #{swh_temp_f.round}F", + schedule_type_limit: 'Temperature') + service_water_temperature_schedule.setScheduleTypeLimits(temp_sch_type_limits) + end + water_heater.setMaximumTemperatureLimit(service_water_temperature) + water_heater.setSetpointTemperatureSchedule(service_water_temperature_schedule) + + # set peak flow rate characteristics + if set_peak_use_flowrate + water_heater.setPeakUseFlowRate(peak_flowrate) unless peak_flowrate.nil? + water_heater.setUseFlowRateFractionSchedule(flowrate_schedule) unless flowrate_schedule.nil? + end + + # set the water heater ambient conditions + if water_heater_thermal_zone.nil? + # assume the water heater is indoors at 71.6F / 22C + indoor_temp_f = 71.6 + indoor_temp_c = OpenStudio.convert(indoor_temp_f, 'F', 'C').get + default_water_heater_ambient_temp_sch = OpenstudioStandards::Schedules.create_constant_schedule_ruleset(model, + indoor_temp_c, + name: "Water Heater Ambient Temp Schedule #{indoor_temp_f}F", + schedule_type_limit: 'Temperature') + default_water_heater_ambient_temp_sch.setScheduleTypeLimits(temp_sch_type_limits) + water_heater.setAmbientTemperatureIndicator('Schedule') + water_heater.setAmbientTemperatureSchedule(default_water_heater_ambient_temp_sch) + water_heater.resetAmbientTemperatureThermalZone + else + water_heater.setAmbientTemperatureIndicator('ThermalZone') + water_heater.setAmbientTemperatureThermalZone(water_heater_thermal_zone) + water_heater.resetAmbientTemperatureSchedule + end + + # assign a quantity to the water heater if it represents multiple water heaters + if number_water_heaters > 1 + water_heater.setName("#{number_water_heaters}X #{(water_heater_volume_gal / number_water_heaters).round}gal #{water_heater_fuel} Water Heater - #{(water_heater_capacity_kbtu_per_hr / number_water_heaters).round}kBtu/hr") + water_heater.additionalProperties.setFeature('component_quantity', number_water_heaters) + else + water_heater.setName("#{water_heater_volume_gal.round}gal #{water_heater_fuel} Water Heater - #{water_heater_capacity_kbtu_per_hr.round}kBtu/hr") + end + + # add the water heater to the service water loop if provided + unless service_water_loop.nil? + service_water_loop.addSupplyBranchForComponent(water_heater) + end + + OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.ServiceWaterHeating.Create', "Added water heater called #{water_heater.name}") + + return water_heater + end + + + # @!endgroup Create Component + end +end diff --git a/lib/openstudio-standards/standards/necb/NECB2011/data/geometry/NorthernEducation.osm b/lib/openstudio-standards/standards/necb/NECB2011/data/geometry/NorthernEducation.osm index 5ef612f36a..f8970ff8a0 100644 --- a/lib/openstudio-standards/standards/necb/NECB2011/data/geometry/NorthernEducation.osm +++ b/lib/openstudio-standards/standards/necb/NECB2011/data/geometry/NorthernEducation.osm @@ -44366,7 +44366,7 @@ OS:Connection, OS:Schedule:Ruleset, {9d5b666a-4e1e-46b3-9d97-8c5c37fc3b63}, !- Handle - Water Heater Ambient Temp Schedule - 70F, !- Name + Water Heater Ambient Temp Schedule 70F, !- Name {85e3f998-9b04-469c-b1ae-993d46032970}, !- Schedule Type Limits Name {74f82300-3fbb-4409-b504-cf26bb955cdb}, !- Default Day Schedule Name {756b8134-4003-4632-9ddb-72e4c2c884b6}, !- Summer Design Day Schedule Name @@ -44374,7 +44374,7 @@ OS:Schedule:Ruleset, OS:Schedule:Day, {74f82300-3fbb-4409-b504-cf26bb955cdb}, !- Handle - Water Heater Ambient Temp Schedule - 70F_Default, !- Name + Water Heater Ambient Temp Schedule 70F_Default, !- Name {85e3f998-9b04-469c-b1ae-993d46032970}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 @@ -44383,7 +44383,7 @@ OS:Schedule:Day, OS:Schedule:Day, {756b8134-4003-4632-9ddb-72e4c2c884b6}, !- Handle - Water Heater Ambient Temp Schedule - 70F_Summer_Design_Day, !- Name + Water Heater Ambient Temp Schedule 70F_Summer_Design_Day, !- Name {85e3f998-9b04-469c-b1ae-993d46032970}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 @@ -44392,7 +44392,7 @@ OS:Schedule:Day, OS:Schedule:Day, {1016e14d-d134-44b4-8243-fef610fe7c9c}, !- Handle - Water Heater Ambient Temp Schedule - 70F_Winter_Design_Day, !- Name + Water Heater Ambient Temp Schedule 70F_Winter_Design_Day, !- Name {85e3f998-9b04-469c-b1ae-993d46032970}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/lib/openstudio-standards/standards/necb/NECB2011/data/geometry/NorthernHealthCare.osm b/lib/openstudio-standards/standards/necb/NECB2011/data/geometry/NorthernHealthCare.osm index ed8209c772..def19906ac 100644 --- a/lib/openstudio-standards/standards/necb/NECB2011/data/geometry/NorthernHealthCare.osm +++ b/lib/openstudio-standards/standards/necb/NECB2011/data/geometry/NorthernHealthCare.osm @@ -48651,7 +48651,7 @@ OS:Connection, OS:Schedule:Ruleset, {4f677daa-59d2-49b5-aa1a-6dd83e0b19bd}, !- Handle - Water Heater Ambient Temp Schedule - 70F, !- Name + Water Heater Ambient Temp Schedule 70F, !- Name {85e3f998-9b04-469c-b1ae-993d46032970}, !- Schedule Type Limits Name {d34869e3-d524-49a8-be02-404ef50ddebd}, !- Default Day Schedule Name {1b0aa04d-8083-4db1-b00e-25f523c27ed6}, !- Summer Design Day Schedule Name @@ -48659,7 +48659,7 @@ OS:Schedule:Ruleset, OS:Schedule:Day, {d34869e3-d524-49a8-be02-404ef50ddebd}, !- Handle - Water Heater Ambient Temp Schedule - 70F_Default, !- Name + Water Heater Ambient Temp Schedule 70F_Default, !- Name {85e3f998-9b04-469c-b1ae-993d46032970}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 @@ -48668,7 +48668,7 @@ OS:Schedule:Day, OS:Schedule:Day, {1b0aa04d-8083-4db1-b00e-25f523c27ed6}, !- Handle - Water Heater Ambient Temp Schedule - 70F_Summer_Design_Day, !- Name + Water Heater Ambient Temp Schedule 70F_Summer_Design_Day, !- Name {85e3f998-9b04-469c-b1ae-993d46032970}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 @@ -48677,7 +48677,7 @@ OS:Schedule:Day, OS:Schedule:Day, {96989d3c-9a1f-45e2-aa14-e96ed361f0b5}, !- Handle - Water Heater Ambient Temp Schedule - 70F_Winter_Design_Day, !- Name + Water Heater Ambient Temp Schedule 70F_Winter_Design_Day, !- Name {85e3f998-9b04-469c-b1ae-993d46032970}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/lib/openstudio-standards/standards/necb/common/construction_defaults.osm b/lib/openstudio-standards/standards/necb/common/construction_defaults.osm index 0acd7ad9b2..51b1b47868 100644 --- a/lib/openstudio-standards/standards/necb/common/construction_defaults.osm +++ b/lib/openstudio-standards/standards/necb/common/construction_defaults.osm @@ -1928,13 +1928,13 @@ OS:Schedule:Day, OS:Schedule:Ruleset, {402721ef-5979-4bdf-8041-e590c3fe0060}, !- Handle - Water Heater Ambient Temp Schedule - 70F, !- Name + Water Heater Ambient Temp Schedule 70F, !- Name {7b49cd38-34d6-4fe8-8f95-f7546eac6e94}, !- Schedule Type Limits Name {5d1da6bc-bb9e-4fd7-930d-a079c77f9584}; !- Default Day Schedule Name OS:Schedule:Day, {5d1da6bc-bb9e-4fd7-930d-a079c77f9584}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default, !- Name + Water Heater Ambient Temp Schedule 70F Default, !- Name {7b49cd38-34d6-4fe8-8f95-f7546eac6e94}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/90_1_prm/models/MidRiseApt_2010_5A.osm b/test/90_1_prm/models/MidRiseApt_2010_5A.osm index 1a123a618a..e59a961c52 100644 --- a/test/90_1_prm/models/MidRiseApt_2010_5A.osm +++ b/test/90_1_prm/models/MidRiseApt_2010_5A.osm @@ -25516,13 +25516,13 @@ OS:Schedule:Day, OS:Schedule:Ruleset, {b3701f32-28f1-4a69-8704-7d7d3f8dbfe8}, !- Handle - Water Heater Ambient Temp Schedule - 70F, !- Name + Water Heater Ambient Temp Schedule 70F, !- Name {e73bbd84-0a04-44b7-ab23-e6b6e1d44b6b}, !- Schedule Type Limits Name {84ffc99d-68e2-46c5-af9f-854c2e411c66}; !- Default Day Schedule Name OS:Schedule:Day, {84ffc99d-68e2-46c5-af9f-854c2e411c66}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default, !- Name + Water Heater Ambient Temp Schedule 70F Default, !- Name {e73bbd84-0a04-44b7-ab23-e6b6e1d44b6b}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/90_1_prm/models/SecondarySchool-DOE Ref Pre-1980-ASHRAE 169-2006-2A.osm b/test/90_1_prm/models/SecondarySchool-DOE Ref Pre-1980-ASHRAE 169-2006-2A.osm index 2682db8b8e..a0c87975ad 100644 --- a/test/90_1_prm/models/SecondarySchool-DOE Ref Pre-1980-ASHRAE 169-2006-2A.osm +++ b/test/90_1_prm/models/SecondarySchool-DOE Ref Pre-1980-ASHRAE 169-2006-2A.osm @@ -30944,13 +30944,13 @@ OS:Schedule:Day, OS:Schedule:Ruleset, {9734297c-4b42-4c03-8a6e-74d3cb24a131}, !- Handle - Water Heater Ambient Temp Schedule - 70F, !- Name + Water Heater Ambient Temp Schedule 70F, !- Name {2c1748a8-4314-4beb-bf13-d10dfb07abec}, !- Schedule Type Limits Name {789e97a7-f832-4be2-84ae-d1fd2490e2f1}; !- Default Day Schedule Name OS:Schedule:Day, {789e97a7-f832-4be2-84ae-d1fd2490e2f1}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default, !- Name + Water Heater Ambient Temp Schedule 70F Default, !- Name {2c1748a8-4314-4beb-bf13-d10dfb07abec}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/deer_prototype/models/ecc_test.osm b/test/deer_prototype/models/ecc_test.osm index bb81faa435..6b4c13bbd9 100644 --- a/test/deer_prototype/models/ecc_test.osm +++ b/test/deer_prototype/models/ecc_test.osm @@ -29065,13 +29065,13 @@ OS:WaterHeater:Mixed, OS:Schedule:Ruleset, {796f3498-7ebe-42ac-8960-eae89fa70e3a}, !- Handle - Water Heater Ambient Temp Schedule - 70F, !- Name + Water Heater Ambient Temp Schedule 70F, !- Name {083c8dcc-f29c-4a3e-932c-3f99636c132c}, !- Schedule Type Limits Name {d21bc2f4-d070-45bb-a9d3-1154015bc9ca}; !- Default Day Schedule Name OS:Schedule:Day, {d21bc2f4-d070-45bb-a9d3-1154015bc9ca}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default, !- Name + Water Heater Ambient Temp Schedule 70F Default, !- Name {083c8dcc-f29c-4a3e-932c-3f99636c132c}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 @@ -29698,13 +29698,13 @@ OS:WaterHeater:Mixed, OS:Schedule:Ruleset, {b3d81da1-fb2c-461b-9edd-34023df91f6a}, !- Handle - Water Heater Ambient Temp Schedule - 70F 1, !- Name + Water Heater Ambient Temp Schedule 70F 1, !- Name {4e72bbce-6c60-4bae-8307-1027756816c9}, !- Schedule Type Limits Name {c2a068ed-0d16-4595-990b-164086a648b6}; !- Default Day Schedule Name OS:Schedule:Day, {c2a068ed-0d16-4595-990b-164086a648b6}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default 1, !- Name + Water Heater Ambient Temp Schedule 70F Default 1, !- Name {4e72bbce-6c60-4bae-8307-1027756816c9}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/deer_prototype/models/epr_test.osm b/test/deer_prototype/models/epr_test.osm index 55ad054a67..156efeb1be 100644 --- a/test/deer_prototype/models/epr_test.osm +++ b/test/deer_prototype/models/epr_test.osm @@ -17204,13 +17204,13 @@ OS:WaterHeater:Mixed, OS:Schedule:Ruleset, {c684f42c-2e14-4a64-960c-1655a1ccf06c}, !- Handle - Water Heater Ambient Temp Schedule - 70F, !- Name + Water Heater Ambient Temp Schedule 70F, !- Name {d1caf49c-42e9-4a74-966b-aa691b811dc2}, !- Schedule Type Limits Name {259c0569-8970-438f-9194-bb46252baf2f}; !- Default Day Schedule Name OS:Schedule:Day, {259c0569-8970-438f-9194-bb46252baf2f}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default, !- Name + Water Heater Ambient Temp Schedule 70F Default, !- Name {d1caf49c-42e9-4a74-966b-aa691b811dc2}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 @@ -17837,13 +17837,13 @@ OS:WaterHeater:Mixed, OS:Schedule:Ruleset, {b5a17409-5fc1-4d9d-96d8-fc6a32c1d03f}, !- Handle - Water Heater Ambient Temp Schedule - 70F 1, !- Name + Water Heater Ambient Temp Schedule 70F 1, !- Name {e6dd6281-356b-4cec-8dac-c02c21a6261b}, !- Schedule Type Limits Name {603a7c4e-e016-4660-badf-b702ba5f8606}; !- Default Day Schedule Name OS:Schedule:Day, {603a7c4e-e016-4660-badf-b702ba5f8606}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default 1, !- Name + Water Heater Ambient Temp Schedule 70F Default 1, !- Name {e6dd6281-356b-4cec-8dac-c02c21a6261b}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/deer_prototype/models/ese_test.osm b/test/deer_prototype/models/ese_test.osm index 95c1a88132..a5ea62764e 100644 --- a/test/deer_prototype/models/ese_test.osm +++ b/test/deer_prototype/models/ese_test.osm @@ -27087,13 +27087,13 @@ OS:WaterHeater:Mixed, OS:Schedule:Ruleset, {41e5b44f-956a-46bf-9499-eb0a0d85e9fa}, !- Handle - Water Heater Ambient Temp Schedule - 70F, !- Name + Water Heater Ambient Temp Schedule 70F, !- Name {2665e144-e086-4a1f-9ff2-07b6ff3bc5ad}, !- Schedule Type Limits Name {bb0b7e76-dec1-4151-b4fd-8361b17aa1dd}; !- Default Day Schedule Name OS:Schedule:Day, {bb0b7e76-dec1-4151-b4fd-8361b17aa1dd}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default, !- Name + Water Heater Ambient Temp Schedule 70F Default, !- Name {2665e144-e086-4a1f-9ff2-07b6ff3bc5ad}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 @@ -27720,13 +27720,13 @@ OS:WaterHeater:Mixed, OS:Schedule:Ruleset, {66a4cb5d-6b70-4ebe-b01d-12eaba2b6427}, !- Handle - Water Heater Ambient Temp Schedule - 70F 1, !- Name + Water Heater Ambient Temp Schedule 70F 1, !- Name {c9149fd7-4442-4bd7-9f2a-f61e579cdcc9}, !- Schedule Type Limits Name {a1fbe7c3-c48b-465f-9f25-a0eda9eb416f}; !- Default Day Schedule Name OS:Schedule:Day, {a1fbe7c3-c48b-465f-9f25-a0eda9eb416f}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default 1, !- Name + Water Heater Ambient Temp Schedule 70F Default 1, !- Name {c9149fd7-4442-4bd7-9f2a-f61e579cdcc9}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/deer_prototype/models/eun_test.osm b/test/deer_prototype/models/eun_test.osm index 1b0676dbd6..b76b107523 100644 --- a/test/deer_prototype/models/eun_test.osm +++ b/test/deer_prototype/models/eun_test.osm @@ -35964,13 +35964,13 @@ OS:WaterHeater:Mixed, OS:Schedule:Ruleset, {fd69d02c-d913-47c4-a331-3c7c154d75ea}, !- Handle - Water Heater Ambient Temp Schedule - 70F, !- Name + Water Heater Ambient Temp Schedule 70F, !- Name {c49d49cd-6e0a-465b-ae97-98c637d33c21}, !- Schedule Type Limits Name {7e7bd4ca-6225-49ff-880b-d9c2ef54021f}; !- Default Day Schedule Name OS:Schedule:Day, {7e7bd4ca-6225-49ff-880b-d9c2ef54021f}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default, !- Name + Water Heater Ambient Temp Schedule 70F Default, !- Name {c49d49cd-6e0a-465b-ae97-98c637d33c21}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 @@ -36597,13 +36597,13 @@ OS:WaterHeater:Mixed, OS:Schedule:Ruleset, {a41113f0-f8cd-4665-8d87-4124a83dbdda}, !- Handle - Water Heater Ambient Temp Schedule - 70F 1, !- Name + Water Heater Ambient Temp Schedule 70F 1, !- Name {2f7a481f-a056-4aad-933a-a11907dc4236}, !- Schedule Type Limits Name {f0d52eaf-084b-4650-9f95-e6983ba97692}; !- Default Day Schedule Name OS:Schedule:Day, {f0d52eaf-084b-4650-9f95-e6983ba97692}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default 1, !- Name + Water Heater Ambient Temp Schedule 70F Default 1, !- Name {2f7a481f-a056-4aad-933a-a11907dc4236}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 @@ -37335,13 +37335,13 @@ OS:WaterHeater:Mixed, OS:Schedule:Ruleset, {4e012543-98ce-4d13-8a9a-cda6056bdabf}, !- Handle - Water Heater Ambient Temp Schedule - 70F 2, !- Name + Water Heater Ambient Temp Schedule 70F 2, !- Name {6af03a07-1898-4360-ab64-0b2ea06920e5}, !- Schedule Type Limits Name {b5783e61-9fa4-4fd7-b34f-5e034a56d1bb}; !- Default Day Schedule Name OS:Schedule:Day, {b5783e61-9fa4-4fd7-b34f-5e034a56d1bb}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default 2, !- Name + Water Heater Ambient Temp Schedule 70F Default 2, !- Name {6af03a07-1898-4360-ab64-0b2ea06920e5}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/deer_prototype/models/hsp_test.osm b/test/deer_prototype/models/hsp_test.osm index 2c55ef1ea7..9e951c6261 100644 --- a/test/deer_prototype/models/hsp_test.osm +++ b/test/deer_prototype/models/hsp_test.osm @@ -19161,13 +19161,13 @@ OS:WaterHeater:Mixed, OS:Schedule:Ruleset, {acae2e06-641a-40e2-b31f-2692543d026d}, !- Handle - Water Heater Ambient Temp Schedule - 70F, !- Name + Water Heater Ambient Temp Schedule 70F, !- Name {3106d09b-761f-4a45-8ba6-95302e8eedf7}, !- Schedule Type Limits Name {f686b43b-6cc5-4a89-8e23-7b24df7a38f8}; !- Default Day Schedule Name OS:Schedule:Day, {f686b43b-6cc5-4a89-8e23-7b24df7a38f8}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default, !- Name + Water Heater Ambient Temp Schedule 70F Default, !- Name {3106d09b-761f-4a45-8ba6-95302e8eedf7}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 @@ -19794,13 +19794,13 @@ OS:WaterHeater:Mixed, OS:Schedule:Ruleset, {a9e3bbd8-47b2-45dd-82cc-f31316313b92}, !- Handle - Water Heater Ambient Temp Schedule - 70F 1, !- Name + Water Heater Ambient Temp Schedule 70F 1, !- Name {bbc82270-1631-4ba6-89a2-e36f654be89f}, !- Schedule Type Limits Name {a7798739-ea0e-48e4-9474-e0c0dfd2dae7}; !- Default Day Schedule Name OS:Schedule:Day, {a7798739-ea0e-48e4-9474-e0c0dfd2dae7}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default 1, !- Name + Water Heater Ambient Temp Schedule 70F Default 1, !- Name {bbc82270-1631-4ba6-89a2-e36f654be89f}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/deer_prototype/models/htl_test.osm b/test/deer_prototype/models/htl_test.osm index 251fcda97e..e960715912 100644 --- a/test/deer_prototype/models/htl_test.osm +++ b/test/deer_prototype/models/htl_test.osm @@ -29879,13 +29879,13 @@ OS:WaterHeater:Mixed, OS:Schedule:Ruleset, {642583d6-d852-4914-9383-50e704bfec23}, !- Handle - Water Heater Ambient Temp Schedule - 70F, !- Name + Water Heater Ambient Temp Schedule 70F, !- Name {49eaace2-4351-473c-a9be-60df9e08ff69}, !- Schedule Type Limits Name {f46b1019-a8b4-4532-861d-a227aa922799}; !- Default Day Schedule Name OS:Schedule:Day, {f46b1019-a8b4-4532-861d-a227aa922799}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default, !- Name + Water Heater Ambient Temp Schedule 70F Default, !- Name {49eaace2-4351-473c-a9be-60df9e08ff69}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 @@ -30512,13 +30512,13 @@ OS:WaterHeater:Mixed, OS:Schedule:Ruleset, {8f8d5065-356d-49d8-8668-11b320c1e570}, !- Handle - Water Heater Ambient Temp Schedule - 70F 1, !- Name + Water Heater Ambient Temp Schedule 70F 1, !- Name {570d5c31-f9cd-4206-ba3f-962132d598e2}, !- Schedule Type Limits Name {a912c77f-ecfc-460a-a936-cc742ca2f9a5}; !- Default Day Schedule Name OS:Schedule:Day, {a912c77f-ecfc-460a-a936-cc742ca2f9a5}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default 1, !- Name + Water Heater Ambient Temp Schedule 70F Default 1, !- Name {570d5c31-f9cd-4206-ba3f-962132d598e2}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 @@ -31250,13 +31250,13 @@ OS:WaterHeater:Mixed, OS:Schedule:Ruleset, {5cd76845-7399-4d23-add4-cadbd034c86e}, !- Handle - Water Heater Ambient Temp Schedule - 70F 2, !- Name + Water Heater Ambient Temp Schedule 70F 2, !- Name {d524afc0-4c55-4e17-8b79-c375431d2c96}, !- Schedule Type Limits Name {88b205b4-2970-4973-9333-9b91d5b5400e}; !- Default Day Schedule Name OS:Schedule:Day, {88b205b4-2970-4973-9333-9b91d5b5400e}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default 2, !- Name + Water Heater Ambient Temp Schedule 70F Default 2, !- Name {d524afc0-4c55-4e17-8b79-c375431d2c96}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/deer_prototype/models/mfm_test.osm b/test/deer_prototype/models/mfm_test.osm index 3ed0be1ff3..3e1f7f902e 100644 --- a/test/deer_prototype/models/mfm_test.osm +++ b/test/deer_prototype/models/mfm_test.osm @@ -13358,13 +13358,13 @@ OS:AdditionalProperties, OS:Schedule:Ruleset, {aec6080c-36a5-4862-9a9c-3a51ac2f9705}, !- Handle - Water Heater Ambient Temp Schedule - 70F, !- Name + Water Heater Ambient Temp Schedule 70F, !- Name {b71af9dc-2b3e-481a-a630-2c2f0d7b6815}, !- Schedule Type Limits Name {de971b16-396b-4c27-8782-1a883b56bdc7}; !- Default Day Schedule Name OS:Schedule:Day, {de971b16-396b-4c27-8782-1a883b56bdc7}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default, !- Name + Water Heater Ambient Temp Schedule 70F Default, !- Name {b71af9dc-2b3e-481a-a630-2c2f0d7b6815}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/deer_prototype/models/mtl_test.osm b/test/deer_prototype/models/mtl_test.osm index 1eadd7e604..b6f27b6a2d 100644 --- a/test/deer_prototype/models/mtl_test.osm +++ b/test/deer_prototype/models/mtl_test.osm @@ -11644,13 +11644,13 @@ OS:WaterHeater:Mixed, OS:Schedule:Ruleset, {9ac945b7-b636-4572-8932-29a4e890c743}, !- Handle - Water Heater Ambient Temp Schedule - 70F, !- Name + Water Heater Ambient Temp Schedule 70F, !- Name {c5486cab-6789-47e0-b07e-7c8f2f84cb5f}, !- Schedule Type Limits Name {bfe7a5a7-0ef1-4098-bc99-26cce31ae3bd}; !- Default Day Schedule Name OS:Schedule:Day, {bfe7a5a7-0ef1-4098-bc99-26cce31ae3bd}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default, !- Name + Water Heater Ambient Temp Schedule 70F Default, !- Name {c5486cab-6789-47e0-b07e-7c8f2f84cb5f}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/deer_prototype/models/nrs_test.osm b/test/deer_prototype/models/nrs_test.osm index ea71d57edc..0a3af61c67 100644 --- a/test/deer_prototype/models/nrs_test.osm +++ b/test/deer_prototype/models/nrs_test.osm @@ -18670,13 +18670,13 @@ OS:WaterHeater:Mixed, OS:Schedule:Ruleset, {06540667-9c0c-488e-830e-56506da41c31}, !- Handle - Water Heater Ambient Temp Schedule - 70F, !- Name + Water Heater Ambient Temp Schedule 70F, !- Name {5c2a5a90-7960-42e1-be58-d4cb517bf848}, !- Schedule Type Limits Name {7dddd80b-8f69-497b-a882-a0252b200c2d}; !- Default Day Schedule Name OS:Schedule:Day, {7dddd80b-8f69-497b-a882-a0252b200c2d}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default, !- Name + Water Heater Ambient Temp Schedule 70F Default, !- Name {5c2a5a90-7960-42e1-be58-d4cb517bf848}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 @@ -19303,13 +19303,13 @@ OS:WaterHeater:Mixed, OS:Schedule:Ruleset, {8fcd8efc-553d-48ae-8950-d1bec0c63970}, !- Handle - Water Heater Ambient Temp Schedule - 70F 1, !- Name + Water Heater Ambient Temp Schedule 70F 1, !- Name {9025e524-6a53-4a1a-bace-21473a57fb29}, !- Schedule Type Limits Name {34bbbc49-f154-4ce1-9aa4-b000f6de4ce3}; !- Default Day Schedule Name OS:Schedule:Day, {34bbbc49-f154-4ce1-9aa4-b000f6de4ce3}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default 1, !- Name + Water Heater Ambient Temp Schedule 70F Default 1, !- Name {9025e524-6a53-4a1a-bace-21473a57fb29}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/deer_prototype/models/ofl_test.osm b/test/deer_prototype/models/ofl_test.osm index 317394b6f8..688485ac0e 100644 --- a/test/deer_prototype/models/ofl_test.osm +++ b/test/deer_prototype/models/ofl_test.osm @@ -16610,13 +16610,13 @@ OS:WaterHeater:Mixed, OS:Schedule:Ruleset, {c4298b00-c132-4114-ae47-128be0aed2fa}, !- Handle - Water Heater Ambient Temp Schedule - 70F, !- Name + Water Heater Ambient Temp Schedule 70F, !- Name {7f36ac38-8d3c-496f-8f82-e97372e3feaa}, !- Schedule Type Limits Name {5a6932ae-f66f-40d6-a7dd-8d455e1692d9}; !- Default Day Schedule Name OS:Schedule:Day, {5a6932ae-f66f-40d6-a7dd-8d455e1692d9}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default, !- Name + Water Heater Ambient Temp Schedule 70F Default, !- Name {7f36ac38-8d3c-496f-8f82-e97372e3feaa}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/deer_prototype/models/ofs_test.osm b/test/deer_prototype/models/ofs_test.osm index 08abbda927..bfa0d3cbd9 100644 --- a/test/deer_prototype/models/ofs_test.osm +++ b/test/deer_prototype/models/ofs_test.osm @@ -8863,13 +8863,13 @@ OS:WaterHeater:Mixed, OS:Schedule:Ruleset, {2cc8ba28-5b21-401f-8dbe-a276d673b931}, !- Handle - Water Heater Ambient Temp Schedule - 70F, !- Name + Water Heater Ambient Temp Schedule 70F, !- Name {bebe01eb-fc7e-43f4-86b2-0dde86d701e8}, !- Schedule Type Limits Name {d1721432-bfa3-444a-a74a-7b045a249933}; !- Default Day Schedule Name OS:Schedule:Day, {d1721432-bfa3-444a-a74a-7b045a249933}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default, !- Name + Water Heater Ambient Temp Schedule 70F Default, !- Name {bebe01eb-fc7e-43f4-86b2-0dde86d701e8}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/deer_prototype/models/rt3_test.osm b/test/deer_prototype/models/rt3_test.osm index 04be4c6e2e..33f2658fe0 100644 --- a/test/deer_prototype/models/rt3_test.osm +++ b/test/deer_prototype/models/rt3_test.osm @@ -9257,13 +9257,13 @@ OS:WaterHeater:Mixed, OS:Schedule:Ruleset, {dc3926d2-d6ac-4013-86bd-cae3462ca702}, !- Handle - Water Heater Ambient Temp Schedule - 70F, !- Name + Water Heater Ambient Temp Schedule 70F, !- Name {1c4b821c-3835-4c4b-b417-b30941a342fc}, !- Schedule Type Limits Name {dc17d306-5801-47f5-99ce-1a559d47f992}; !- Default Day Schedule Name OS:Schedule:Day, {dc17d306-5801-47f5-99ce-1a559d47f992}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default, !- Name + Water Heater Ambient Temp Schedule 70F Default, !- Name {1c4b821c-3835-4c4b-b417-b30941a342fc}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/doe_prototype/models/HighriseApartment_1A_2010.osm b/test/doe_prototype/models/HighriseApartment_1A_2010.osm index 3993cdb34a..49ed6bfac8 100644 --- a/test/doe_prototype/models/HighriseApartment_1A_2010.osm +++ b/test/doe_prototype/models/HighriseApartment_1A_2010.osm @@ -117450,13 +117450,13 @@ OS:Schedule:Day, OS:Schedule:Ruleset, {cc039fbb-a917-4831-aa29-36785ff4910c}, !- Handle - Water Heater Ambient Temp Schedule - 70F, !- Name + Water Heater Ambient Temp Schedule 70F, !- Name {d9e9a578-e4d5-4cfa-bf68-f9a1d27452cf}, !- Schedule Type Limits Name {f46593a9-1b19-4b56-94e6-9d02d04abdd2}; !- Default Day Schedule Name OS:Schedule:Day, {f46593a9-1b19-4b56-94e6-9d02d04abdd2}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default, !- Name + Water Heater Ambient Temp Schedule 70F Default, !- Name {d9e9a578-e4d5-4cfa-bf68-f9a1d27452cf}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/doe_prototype/models/Hospital_4B_Pre1980.osm b/test/doe_prototype/models/Hospital_4B_Pre1980.osm index 00eb52fea4..837ad0b819 100644 --- a/test/doe_prototype/models/Hospital_4B_Pre1980.osm +++ b/test/doe_prototype/models/Hospital_4B_Pre1980.osm @@ -33417,13 +33417,13 @@ OS:Schedule:Day, OS:Schedule:Ruleset, {56107bf3-2ad5-46a0-b005-20cd85cee558}, !- Handle - Water Heater Ambient Temp Schedule - 70F, !- Name + Water Heater Ambient Temp Schedule 70F, !- Name {c23c0a36-8c74-469b-b34e-f359bcf5f66c}, !- Schedule Type Limits Name {6d81f719-7cf7-4877-8ef2-99771a98dfa1}; !- Default Day Schedule Name OS:Schedule:Day, {6d81f719-7cf7-4877-8ef2-99771a98dfa1}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default, !- Name + Water Heater Ambient Temp Schedule 70F Default, !- Name {c23c0a36-8c74-469b-b34e-f359bcf5f66c}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 @@ -34315,13 +34315,13 @@ OS:Schedule:Day, OS:Schedule:Ruleset, {822da938-7690-4964-b378-d8e96474cfc3}, !- Handle - Water Heater Ambient Temp Schedule - 70F 1, !- Name + Water Heater Ambient Temp Schedule 70F 1, !- Name {27ee48ae-782d-4f9d-9eec-fb5a7e17c951}, !- Schedule Type Limits Name {6c6c27d9-16b5-4d90-a987-89e45f5d6917}; !- Default Day Schedule Name OS:Schedule:Day, {6c6c27d9-16b5-4d90-a987-89e45f5d6917}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default 1, !- Name + Water Heater Ambient Temp Schedule 70F Default 1, !- Name {27ee48ae-782d-4f9d-9eec-fb5a7e17c951}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 @@ -35044,13 +35044,13 @@ OS:Schedule:Day, OS:Schedule:Ruleset, {c6c61351-626f-4731-9812-d6e510ad530e}, !- Handle - Water Heater Ambient Temp Schedule - 70F 2, !- Name + Water Heater Ambient Temp Schedule 70F 2, !- Name {a66220a3-89a2-4e63-9ee2-2753396a054f}, !- Schedule Type Limits Name {839f0e2f-7d17-41bb-9018-2ee9b5b1cf85}; !- Default Day Schedule Name OS:Schedule:Day, {839f0e2f-7d17-41bb-9018-2ee9b5b1cf85}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default 2, !- Name + Water Heater Ambient Temp Schedule 70F Default 2, !- Name {a66220a3-89a2-4e63-9ee2-2753396a054f}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/doe_prototype/models/LargeHotel_3A_2010.osm b/test/doe_prototype/models/LargeHotel_3A_2010.osm index 9072b180b2..72db2a6779 100644 --- a/test/doe_prototype/models/LargeHotel_3A_2010.osm +++ b/test/doe_prototype/models/LargeHotel_3A_2010.osm @@ -20535,13 +20535,13 @@ OS:Schedule:Day, OS:Schedule:Ruleset, {88e5a9d3-cae4-4599-b86a-b5c48bfaa728}, !- Handle - Water Heater Ambient Temp Schedule - 70F, !- Name + Water Heater Ambient Temp Schedule 70F, !- Name {028dd04a-65f6-4990-a95a-959e7b4f5e38}, !- Schedule Type Limits Name {b1f7958c-7b57-4cab-981f-8bea36b144dc}; !- Default Day Schedule Name OS:Schedule:Day, {b1f7958c-7b57-4cab-981f-8bea36b144dc}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default, !- Name + Water Heater Ambient Temp Schedule 70F Default, !- Name {028dd04a-65f6-4990-a95a-959e7b4f5e38}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 @@ -22877,13 +22877,13 @@ OS:Schedule:Day, OS:Schedule:Ruleset, {7053ac6f-aa0e-4da0-89c9-6c0693553c9d}, !- Handle - Water Heater Ambient Temp Schedule - 70F 1, !- Name + Water Heater Ambient Temp Schedule 70F 1, !- Name {f295d281-f6e5-4068-822c-e64618ce3075}, !- Schedule Type Limits Name {21fac910-7987-431a-ae0b-db128436d91d}; !- Default Day Schedule Name OS:Schedule:Day, {21fac910-7987-431a-ae0b-db128436d91d}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default 1, !- Name + Water Heater Ambient Temp Schedule 70F Default 1, !- Name {f295d281-f6e5-4068-822c-e64618ce3075}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 @@ -23607,13 +23607,13 @@ OS:Schedule:Day, OS:Schedule:Ruleset, {b36963ba-ac52-4a36-b89b-c7065989c35b}, !- Handle - Water Heater Ambient Temp Schedule - 70F 2, !- Name + Water Heater Ambient Temp Schedule 70F 2, !- Name {d702ce4b-1859-43a4-bddb-86028d88725b}, !- Schedule Type Limits Name {a6de2743-6baa-4bcf-939f-8e500a4f4ee2}; !- Default Day Schedule Name OS:Schedule:Day, {a6de2743-6baa-4bcf-939f-8e500a4f4ee2}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default 2, !- Name + Water Heater Ambient Temp Schedule 70F Default 2, !- Name {d702ce4b-1859-43a4-bddb-86028d88725b}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/doe_prototype/models/MediumOffice_8A_2004.osm b/test/doe_prototype/models/MediumOffice_8A_2004.osm index 36dc61bccb..c8005bbdfa 100644 --- a/test/doe_prototype/models/MediumOffice_8A_2004.osm +++ b/test/doe_prototype/models/MediumOffice_8A_2004.osm @@ -10566,13 +10566,13 @@ OS:Schedule:Day, OS:Schedule:Ruleset, {38e4b68c-6582-4dde-92fb-fb0985352d78}, !- Handle - Water Heater Ambient Temp Schedule - 70F, !- Name + Water Heater Ambient Temp Schedule 70F, !- Name {d2a11ebc-cb3b-411a-918a-916765b7056e}, !- Schedule Type Limits Name {1fb13621-b621-46b6-9071-532f06b5f5ca}; !- Default Day Schedule Name OS:Schedule:Day, {1fb13621-b621-46b6-9071-532f06b5f5ca}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default, !- Name + Water Heater Ambient Temp Schedule 70F Default, !- Name {d2a11ebc-cb3b-411a-918a-916765b7056e}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/doe_prototype/models/MidriseApartment_2A_2013.osm b/test/doe_prototype/models/MidriseApartment_2A_2013.osm index 85a06e2eeb..68962d1e50 100644 --- a/test/doe_prototype/models/MidriseApartment_2A_2013.osm +++ b/test/doe_prototype/models/MidriseApartment_2A_2013.osm @@ -23444,13 +23444,13 @@ OS:Schedule:Day, OS:Schedule:Ruleset, {6e806be7-9608-43fd-92b6-4d687af41311}, !- Handle - Water Heater Ambient Temp Schedule - 70F, !- Name + Water Heater Ambient Temp Schedule 70F, !- Name {b4062d8b-7c1f-4c52-98f9-84bccc0387f7}, !- Schedule Type Limits Name {8da7cd6d-9222-492b-a09e-3278f0b3c3ac}; !- Default Day Schedule Name OS:Schedule:Day, {8da7cd6d-9222-492b-a09e-3278f0b3c3ac}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default, !- Name + Water Heater Ambient Temp Schedule 70F Default, !- Name {b4062d8b-7c1f-4c52-98f9-84bccc0387f7}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/doe_prototype/models/Outpatient_7A_2010.osm b/test/doe_prototype/models/Outpatient_7A_2010.osm index 4aacebcaa1..9012358787 100644 --- a/test/doe_prototype/models/Outpatient_7A_2010.osm +++ b/test/doe_prototype/models/Outpatient_7A_2010.osm @@ -61100,13 +61100,13 @@ OS:Schedule:Day, OS:Schedule:Ruleset, {4ed14430-b462-407f-a682-7d0b72b2cfdc}, !- Handle - Water Heater Ambient Temp Schedule - 70F, !- Name + Water Heater Ambient Temp Schedule 70F, !- Name {7e247af9-fecf-42b9-9669-a1a00b84f5ef}, !- Schedule Type Limits Name {cd45af7e-535d-4fbf-869f-9ba206723a51}; !- Default Day Schedule Name OS:Schedule:Day, {cd45af7e-535d-4fbf-869f-9ba206723a51}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default, !- Name + Water Heater Ambient Temp Schedule 70F Default, !- Name {7e247af9-fecf-42b9-9669-a1a00b84f5ef}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/doe_prototype/models/QuickServiceRestaurant_2A_2010.osm b/test/doe_prototype/models/QuickServiceRestaurant_2A_2010.osm index 8024951736..23d81fdd94 100644 --- a/test/doe_prototype/models/QuickServiceRestaurant_2A_2010.osm +++ b/test/doe_prototype/models/QuickServiceRestaurant_2A_2010.osm @@ -6631,13 +6631,13 @@ OS:Schedule:Day, OS:Schedule:Ruleset, {1d0ed74e-c640-4a68-b963-1c441aa867c6}, !- Handle - Water Heater Ambient Temp Schedule - 70F, !- Name + Water Heater Ambient Temp Schedule 70F, !- Name {ec06a395-8911-4be9-9ae3-917f558f2ec2}, !- Schedule Type Limits Name {26cd08f9-b37e-4c5e-9c88-c08404bfa7eb}; !- Default Day Schedule Name OS:Schedule:Day, {26cd08f9-b37e-4c5e-9c88-c08404bfa7eb}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default, !- Name + Water Heater Ambient Temp Schedule 70F Default, !- Name {ec06a395-8911-4be9-9ae3-917f558f2ec2}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/doe_prototype/models/SecondarySchool_6A_1980-2004.osm b/test/doe_prototype/models/SecondarySchool_6A_1980-2004.osm index db8b488f93..6929752e81 100644 --- a/test/doe_prototype/models/SecondarySchool_6A_1980-2004.osm +++ b/test/doe_prototype/models/SecondarySchool_6A_1980-2004.osm @@ -31700,13 +31700,13 @@ OS:Schedule:Day, OS:Schedule:Ruleset, {4e5d0fcb-29d4-4d54-bbc7-7b4a1654d269}, !- Handle - Water Heater Ambient Temp Schedule - 70F, !- Name + Water Heater Ambient Temp Schedule 70F, !- Name {db7ac843-653c-437d-a60f-4de0c6059a6f}, !- Schedule Type Limits Name {725d782b-1a29-43d0-9490-4bbf90e9300c}; !- Default Day Schedule Name OS:Schedule:Day, {725d782b-1a29-43d0-9490-4bbf90e9300c}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default, !- Name + Water Heater Ambient Temp Schedule 70F Default, !- Name {db7ac843-653c-437d-a60f-4de0c6059a6f}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/doe_prototype/models/SmallHotel_5B_2004.osm b/test/doe_prototype/models/SmallHotel_5B_2004.osm index 77d7f1d2ac..1a1477cd13 100644 --- a/test/doe_prototype/models/SmallHotel_5B_2004.osm +++ b/test/doe_prototype/models/SmallHotel_5B_2004.osm @@ -36502,13 +36502,13 @@ OS:Schedule:Day, OS:Schedule:Ruleset, {027ce669-eff5-43d1-bf49-48b57f71aa29}, !- Handle - Water Heater Ambient Temp Schedule - 70F, !- Name + Water Heater Ambient Temp Schedule 70F, !- Name {56582bd8-3cde-41cd-ac06-f296ab31e201}, !- Schedule Type Limits Name {b76bfe66-ff35-4c48-920e-1cc9573e7416}; !- Default Day Schedule Name OS:Schedule:Day, {b76bfe66-ff35-4c48-920e-1cc9573e7416}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default, !- Name + Water Heater Ambient Temp Schedule 70F Default, !- Name {56582bd8-3cde-41cd-ac06-f296ab31e201}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 @@ -41475,13 +41475,13 @@ OS:Schedule:Day, OS:Schedule:Ruleset, {39fd85f1-dcfd-495f-bd9a-02dfde5db1c7}, !- Handle - Water Heater Ambient Temp Schedule - 70F 1, !- Name + Water Heater Ambient Temp Schedule 70F 1, !- Name {3c690bcc-9b0c-4c9a-a03c-2f276303496d}, !- Schedule Type Limits Name {32777d24-9a62-4159-9f15-b81fc7e32fa4}; !- Default Day Schedule Name OS:Schedule:Day, {32777d24-9a62-4159-9f15-b81fc7e32fa4}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default 1, !- Name + Water Heater Ambient Temp Schedule 70F Default 1, !- Name {3c690bcc-9b0c-4c9a-a03c-2f276303496d}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/doe_prototype/regression_models/FullServiceRestaurant-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm b/test/doe_prototype/regression_models/FullServiceRestaurant-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm index fe0da5875a..c4e7fdf3b3 100644 --- a/test/doe_prototype/regression_models/FullServiceRestaurant-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm +++ b/test/doe_prototype/regression_models/FullServiceRestaurant-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm @@ -7129,7 +7129,7 @@ OS:WaterHeater:Sizing, OS:Schedule:Day, {fb88cb6d-ee9e-4b75-aa06-4ec9699ef4ea}, !- Handle - Water Heater Ambient Temp Schedule - 71.6 Default, !- Name + Water Heater Ambient Temp Schedule 71.6F Default, !- Name {5ab9ae13-7fcb-4c28-b9cc-9eef1d8579e4}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/doe_prototype/regression_models/FullServiceRestaurant-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm b/test/doe_prototype/regression_models/FullServiceRestaurant-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm index 0b5d6bc91c..84226c1288 100644 --- a/test/doe_prototype/regression_models/FullServiceRestaurant-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm +++ b/test/doe_prototype/regression_models/FullServiceRestaurant-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm @@ -7552,7 +7552,7 @@ OS:WaterHeater:Sizing, OS:Schedule:Day, {cc4345ba-6357-4b34-8d76-a97926bad0ce}, !- Handle - Water Heater Ambient Temp Schedule - 71.6 Default, !- Name + Water Heater Ambient Temp Schedule 71.6F Default, !- Name {a91e37a9-bc79-4d11-b315-33703353f45c}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/doe_prototype/regression_models/FullServiceRestaurant-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm b/test/doe_prototype/regression_models/FullServiceRestaurant-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm index 928284c23a..64e0a7d75e 100644 --- a/test/doe_prototype/regression_models/FullServiceRestaurant-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm +++ b/test/doe_prototype/regression_models/FullServiceRestaurant-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm @@ -7441,7 +7441,7 @@ OS:WaterHeater:Sizing, OS:Schedule:Day, {3c5441b4-e753-4a17-ac89-944d4691566a}, !- Handle - Water Heater Ambient Temp Schedule - 71.6 Default, !- Name + Water Heater Ambient Temp Schedule 71.6F Default, !- Name {260314ab-344a-4adc-a0d9-0742e831ea67}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/doe_prototype/regression_models/FullServiceRestaurant-90.1-2019-ASHRAE 169-2013-4A_expected_result.osm b/test/doe_prototype/regression_models/FullServiceRestaurant-90.1-2019-ASHRAE 169-2013-4A_expected_result.osm index ec040aaa4c..21f0c8ec61 100644 --- a/test/doe_prototype/regression_models/FullServiceRestaurant-90.1-2019-ASHRAE 169-2013-4A_expected_result.osm +++ b/test/doe_prototype/regression_models/FullServiceRestaurant-90.1-2019-ASHRAE 169-2013-4A_expected_result.osm @@ -7441,7 +7441,7 @@ OS:WaterHeater:Sizing, OS:Schedule:Day, {da148b8f-3fcd-46f7-8695-dbd1ceebf955}, !- Handle - Water Heater Ambient Temp Schedule - 71.6 Default, !- Name + Water Heater Ambient Temp Schedule 71.6F Default, !- Name {ebf7933a-2753-4e00-8b25-c04ee749e791}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/doe_prototype/regression_models/Hospital-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm b/test/doe_prototype/regression_models/Hospital-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm index bd1889a001..0e0c9e4d5b 100644 --- a/test/doe_prototype/regression_models/Hospital-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm +++ b/test/doe_prototype/regression_models/Hospital-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm @@ -41318,7 +41318,7 @@ OS:WaterHeater:Sizing, OS:Schedule:Day, {eaa42c4a-00db-419f-aae4-38b7d27695f3}, !- Handle - Water Heater Ambient Temp Schedule - 71.6 Default, !- Name + Water Heater Ambient Temp Schedule 71.6F Default, !- Name {b1996898-6899-44b1-9d96-ccf4d16c4fd6}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/doe_prototype/regression_models/Hospital-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm b/test/doe_prototype/regression_models/Hospital-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm index abc69a18a1..fe355d4768 100644 --- a/test/doe_prototype/regression_models/Hospital-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm +++ b/test/doe_prototype/regression_models/Hospital-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm @@ -41723,7 +41723,7 @@ OS:WaterHeater:Sizing, OS:Schedule:Day, {12235576-99a7-4d9d-b2fc-c0a095e05c6a}, !- Handle - Water Heater Ambient Temp Schedule - 71.6 Default, !- Name + Water Heater Ambient Temp Schedule 71.6F Default, !- Name {078efc5e-0c7a-4bf5-8407-29829e9cb431}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/doe_prototype/regression_models/Hospital-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm b/test/doe_prototype/regression_models/Hospital-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm index 0a7d3e31ae..50837644c9 100644 --- a/test/doe_prototype/regression_models/Hospital-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm +++ b/test/doe_prototype/regression_models/Hospital-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm @@ -41619,7 +41619,7 @@ OS:WaterHeater:Sizing, OS:Schedule:Day, {5d84ec84-4d15-4266-aaac-334a802d347a}, !- Handle - Water Heater Ambient Temp Schedule - 71.6 Default, !- Name + Water Heater Ambient Temp Schedule 71.6F Default, !- Name {b466f9ff-e517-40e5-b709-ba93510d3d81}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/doe_prototype/regression_models/Hospital-90.1-2019-ASHRAE 169-2013-4A_expected_result.osm b/test/doe_prototype/regression_models/Hospital-90.1-2019-ASHRAE 169-2013-4A_expected_result.osm index 2086e952be..960b7ca080 100644 --- a/test/doe_prototype/regression_models/Hospital-90.1-2019-ASHRAE 169-2013-4A_expected_result.osm +++ b/test/doe_prototype/regression_models/Hospital-90.1-2019-ASHRAE 169-2013-4A_expected_result.osm @@ -41701,7 +41701,7 @@ OS:WaterHeater:Sizing, OS:Schedule:Day, {2b7f1a7d-edac-4a3b-a544-926c6952e826}, !- Handle - Water Heater Ambient Temp Schedule - 71.6 Default, !- Name + Water Heater Ambient Temp Schedule 71.6F Default, !- Name {836abf37-1712-4561-befc-70141588e339}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/doe_prototype/regression_models/LargeHotel-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm b/test/doe_prototype/regression_models/LargeHotel-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm index 82a6252d22..625303348f 100644 --- a/test/doe_prototype/regression_models/LargeHotel-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm +++ b/test/doe_prototype/regression_models/LargeHotel-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm @@ -23155,7 +23155,7 @@ OS:WaterHeater:Sizing, OS:Schedule:Day, {333d6664-02ff-4593-ac29-ed642e938d96}, !- Handle - Water Heater Ambient Temp Schedule - 71.6 Default, !- Name + Water Heater Ambient Temp Schedule 71.6F Default, !- Name {1c800cd3-c8da-4a8b-b2fd-e0e4a3229549}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/doe_prototype/regression_models/LargeHotel-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm b/test/doe_prototype/regression_models/LargeHotel-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm index 3e2d8486d7..38a585f5dd 100644 --- a/test/doe_prototype/regression_models/LargeHotel-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm +++ b/test/doe_prototype/regression_models/LargeHotel-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm @@ -23613,7 +23613,7 @@ OS:WaterHeater:Sizing, OS:Schedule:Day, {519423f1-0613-44fb-9a1b-b4c97717973e}, !- Handle - Water Heater Ambient Temp Schedule - 71.6 Default, !- Name + Water Heater Ambient Temp Schedule 71.6F Default, !- Name {6a4dfa6c-8ed2-4523-bdf4-8a0309d6280b}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/doe_prototype/regression_models/LargeHotel-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm b/test/doe_prototype/regression_models/LargeHotel-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm index 5250ff4c43..96a6b114ad 100644 --- a/test/doe_prototype/regression_models/LargeHotel-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm +++ b/test/doe_prototype/regression_models/LargeHotel-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm @@ -24383,7 +24383,7 @@ OS:WaterHeater:Sizing, OS:Schedule:Day, {5605c0a3-14ff-4b63-bc54-24f7196eefaf}, !- Handle - Water Heater Ambient Temp Schedule - 71.6 Default, !- Name + Water Heater Ambient Temp Schedule 71.6F Default, !- Name {c4fba051-9cd0-49ea-a46e-c0c68f66ab04}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/doe_prototype/regression_models/LargeHotel-90.1-2019-ASHRAE 169-2013-4A_expected_result.osm b/test/doe_prototype/regression_models/LargeHotel-90.1-2019-ASHRAE 169-2013-4A_expected_result.osm index c949f7f6df..471cdfbee4 100644 --- a/test/doe_prototype/regression_models/LargeHotel-90.1-2019-ASHRAE 169-2013-4A_expected_result.osm +++ b/test/doe_prototype/regression_models/LargeHotel-90.1-2019-ASHRAE 169-2013-4A_expected_result.osm @@ -24383,7 +24383,7 @@ OS:WaterHeater:Sizing, OS:Schedule:Day, {6f19ac40-d2e5-428d-b816-f5e1bb1e9db2}, !- Handle - Water Heater Ambient Temp Schedule - 71.6 Default, !- Name + Water Heater Ambient Temp Schedule 71.6F Default, !- Name {39024d86-4641-47e5-8285-d38a6bb4c7b3}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/doe_prototype/regression_models/PrimarySchool-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm b/test/doe_prototype/regression_models/PrimarySchool-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm index 67eb0bfeb2..8b53e50a28 100644 --- a/test/doe_prototype/regression_models/PrimarySchool-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm +++ b/test/doe_prototype/regression_models/PrimarySchool-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm @@ -24124,7 +24124,7 @@ OS:WaterHeater:Sizing, OS:Schedule:Day, {58313aa0-759c-4380-a304-2c84b1f74217}, !- Handle - Water Heater Ambient Temp Schedule - 71.6 Default, !- Name + Water Heater Ambient Temp Schedule 71.6F Default, !- Name {c0c37d50-1e53-410b-82a4-e18f2c8af8a2}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/doe_prototype/regression_models/PrimarySchool-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm b/test/doe_prototype/regression_models/PrimarySchool-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm index 680e6ea319..d8360520ec 100644 --- a/test/doe_prototype/regression_models/PrimarySchool-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm +++ b/test/doe_prototype/regression_models/PrimarySchool-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm @@ -24627,7 +24627,7 @@ OS:WaterHeater:Sizing, OS:Schedule:Day, {84a24aa5-4163-4b31-8c34-ca32ac7cf27a}, !- Handle - Water Heater Ambient Temp Schedule - 71.6 Default, !- Name + Water Heater Ambient Temp Schedule 71.6F Default, !- Name {e8d6ff81-4d73-403e-99e9-7fbfbc9b18d9}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/doe_prototype/regression_models/PrimarySchool-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm b/test/doe_prototype/regression_models/PrimarySchool-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm index 686793d500..ed73b5dc4b 100644 --- a/test/doe_prototype/regression_models/PrimarySchool-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm +++ b/test/doe_prototype/regression_models/PrimarySchool-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm @@ -24529,7 +24529,7 @@ OS:WaterHeater:Sizing, OS:Schedule:Day, {470d9e6c-7a98-44b5-ab3a-c02f4695c585}, !- Handle - Water Heater Ambient Temp Schedule - 71.6 Default, !- Name + Water Heater Ambient Temp Schedule 71.6F Default, !- Name {39ab7fbf-846a-49bf-9ef3-61afd7206e0e}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/doe_prototype/regression_models/PrimarySchool-90.1-2019-ASHRAE 169-2013-4A_expected_result.osm b/test/doe_prototype/regression_models/PrimarySchool-90.1-2019-ASHRAE 169-2013-4A_expected_result.osm index 18196289a1..907670c76f 100644 --- a/test/doe_prototype/regression_models/PrimarySchool-90.1-2019-ASHRAE 169-2013-4A_expected_result.osm +++ b/test/doe_prototype/regression_models/PrimarySchool-90.1-2019-ASHRAE 169-2013-4A_expected_result.osm @@ -24710,7 +24710,7 @@ OS:WaterHeater:Sizing, OS:Schedule:Day, {b1ad33cd-d895-4dde-a58a-9e58066644e9}, !- Handle - Water Heater Ambient Temp Schedule - 71.6 Default, !- Name + Water Heater Ambient Temp Schedule 71.6F Default, !- Name {9f8ed0b5-1c6a-4c31-a3d9-5973d26132fd}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/doe_prototype/regression_models/SecondarySchool-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm b/test/doe_prototype/regression_models/SecondarySchool-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm index 4537dea6ec..94d4b4bd27 100644 --- a/test/doe_prototype/regression_models/SecondarySchool-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm +++ b/test/doe_prototype/regression_models/SecondarySchool-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm @@ -37113,7 +37113,7 @@ OS:WaterHeater:Sizing, OS:Schedule:Day, {675cb1af-606a-4864-8bb8-82faf8dfc019}, !- Handle - Water Heater Ambient Temp Schedule - 71.6 Default, !- Name + Water Heater Ambient Temp Schedule 71.6F Default, !- Name {bf3e915c-98dd-43dd-bc7b-5bde07c96f6d}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/doe_prototype/regression_models/SecondarySchool-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm b/test/doe_prototype/regression_models/SecondarySchool-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm index 28a31c8bc0..ab15ac819a 100644 --- a/test/doe_prototype/regression_models/SecondarySchool-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm +++ b/test/doe_prototype/regression_models/SecondarySchool-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm @@ -37883,7 +37883,7 @@ OS:WaterHeater:Sizing, OS:Schedule:Day, {76e2609c-346c-4291-95f9-47475eaa8b5c}, !- Handle - Water Heater Ambient Temp Schedule - 71.6 Default, !- Name + Water Heater Ambient Temp Schedule 71.6F Default, !- Name {94f3896d-5533-46ca-8c36-94d21447b7b8}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/doe_prototype/regression_models/SecondarySchool-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm b/test/doe_prototype/regression_models/SecondarySchool-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm index f7bd85c547..f51f833601 100644 --- a/test/doe_prototype/regression_models/SecondarySchool-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm +++ b/test/doe_prototype/regression_models/SecondarySchool-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm @@ -37910,7 +37910,7 @@ OS:WaterHeater:Sizing, OS:Schedule:Day, {1392a029-a9df-4c57-a8b5-3295b62930a4}, !- Handle - Water Heater Ambient Temp Schedule - 71.6 Default, !- Name + Water Heater Ambient Temp Schedule 71.6F Default, !- Name {d979b06f-f8f8-41d4-8ced-1341ee12a79c}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/doe_prototype/regression_models/SecondarySchool-90.1-2019-ASHRAE 169-2013-4A_expected_result.osm b/test/doe_prototype/regression_models/SecondarySchool-90.1-2019-ASHRAE 169-2013-4A_expected_result.osm index 529716139c..c9cd02454d 100644 --- a/test/doe_prototype/regression_models/SecondarySchool-90.1-2019-ASHRAE 169-2013-4A_expected_result.osm +++ b/test/doe_prototype/regression_models/SecondarySchool-90.1-2019-ASHRAE 169-2013-4A_expected_result.osm @@ -38038,7 +38038,7 @@ OS:WaterHeater:Sizing, OS:Schedule:Day, {c9d28079-f95c-45c9-9714-df3c6564e802}, !- Handle - Water Heater Ambient Temp Schedule - 71.6 Default, !- Name + Water Heater Ambient Temp Schedule 71.6F Default, !- Name {3a6d9f11-3682-41c4-b3c4-05398c10f82a}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/modules/service_water_heating/test_component.rb b/test/modules/service_water_heating/test_component.rb new file mode 100644 index 0000000000..e1a9db4d5b --- /dev/null +++ b/test/modules/service_water_heating/test_component.rb @@ -0,0 +1,21 @@ +require_relative '../../helpers/minitest_helper' + +class TestServiceWaterHeatingComponent < Minitest::Test + def setup + @swh = OpenstudioStandards::ServiceWaterHeating + end + + def test_model_add_water_heater + model = OpenStudio::Model::Model.new + + # default water heater + water_heater1 = @swh.model_add_water_heater(model) + + # custom inputs + volume = OpenStudio.convert(100.0, 'gal', 'm^3').get + capacity = OpenStudio.convert(200.0, 'kBtu/hr', 'W').get + water_heater2 = @swh.model_add_water_heater(model, + water_heater_capacity: volume, + water_heater_volume: capacity) + end +end diff --git a/test/necb/unit_tests/expected_results/qaqc_report_expected_result.json b/test/necb/unit_tests/expected_results/qaqc_report_expected_result.json index 2d5edb7599..8827fac69e 100644 --- a/test/necb/unit_tests/expected_results/qaqc_report_expected_result.json +++ b/test/necb/unit_tests/expected_results/qaqc_report_expected_result.json @@ -7,7 +7,7 @@ "table": [ { "name": "Heating", - "natural_gas_GJ": 1147.71 + "natural_gas_GJ": 1147.68 }, { "name": "Cooling", @@ -31,13 +31,13 @@ }, { "name": "Water Systems", - "natural_gas_GJ": 100.5, + "natural_gas_GJ": 100.4, "water_m3": 379.87 }, { "name": "Total End Uses", - "electricity_GJ": 271.59, - "natural_gas_GJ": 1248.21, + "electricity_GJ": 271.6, + "natural_gas_GJ": 1248.08, "water_m3": 379.87 } ] @@ -49,27 +49,27 @@ "table": [ { "name": "Total Site Energy", - "total_energy_GJ": 1519.8, - "energy_per_total_building_area_MJ/m2": 2973.28, - "energy_per_conditioned_building_area_MJ/m2": 2973.28 + "total_energy_GJ": 1519.67, + "energy_per_total_building_area_MJ/m2": 2973.03, + "energy_per_conditioned_building_area_MJ/m2": 2973.03 }, { "name": "Net Site Energy", - "total_energy_GJ": 1519.8, - "energy_per_total_building_area_MJ/m2": 2973.28, - "energy_per_conditioned_building_area_MJ/m2": 2973.28 + "total_energy_GJ": 1519.67, + "energy_per_total_building_area_MJ/m2": 2973.03, + "energy_per_conditioned_building_area_MJ/m2": 2973.03 }, { "name": "Total Source Energy", - "total_energy_GJ": 2213.19, - "energy_per_total_building_area_MJ/m2": 4329.8, - "energy_per_conditioned_building_area_MJ/m2": 4329.8 + "total_energy_GJ": 2213.06, + "energy_per_total_building_area_MJ/m2": 4329.54, + "energy_per_conditioned_building_area_MJ/m2": 4329.54 }, { "name": "Net Source Energy", - "total_energy_GJ": 2213.19, - "energy_per_total_building_area_MJ/m2": 4329.8, - "energy_per_conditioned_building_area_MJ/m2": 4329.8 + "total_energy_GJ": 2213.06, + "energy_per_total_building_area_MJ/m2": 4329.54, + "energy_per_conditioned_building_area_MJ/m2": 4329.54 } ] } @@ -103,10 +103,10 @@ "space_function_food_preparation": 139.4052442 }, "economics": { - "total_neb_cost": 6721.852499999999, - "total_neb_cost_per_m2": 13.150364662950972, - "Electricity_neb_cost": 6721.852499999999, - "Electricity_neb_cost_per_m2": 13.150364662950972, + "total_neb_cost": 6722.1, + "total_neb_cost_per_m2": 13.150848862099064, + "Electricity_neb_cost": 6722.1, + "Electricity_neb_cost_per_m2": 13.150848862099064, "Natural Gas_neb_cost": 0.0, "Natural Gas_neb_cost_per_m2": 0.0, "Oil_neb_cost": 0.0, @@ -121,7 +121,7 @@ "total_cost_per_m2": 0.0 }, "end_uses": { - "heating_gj": 1147.71, + "heating_gj": 1147.68, "cooling_gj": 34.26, "interior_lighting_gj": 98.39, "exterior_lighting_gj": 0, @@ -132,15 +132,15 @@ "heat_rejection_gj": 0, "humidification_gj": 0, "heat_recovery_gj": 0, - "water_systems_gj": 100.5, + "water_systems_gj": 100.4, "water_systems_water_m3": 379.87, "refrigeration_gj": 0, "generators_gj": 0, - "total_end_uses_gj": 1519.8, + "total_end_uses_gj": 1519.6799999999998, "total_end_uses_water_m3": 379.87 }, "end_uses_eui": { - "heating_gj_per_m2": 2.245334158599205, + "heating_gj_per_m2": 2.2452754677933764, "cooling_gj_per_m2": 0.06702490025669268, "interior_lighting_gj_per_m2": 0.19248627951710431, "exterior_lighting_gj_per_m2": 0, @@ -151,19 +151,19 @@ "heat_rejection_gj_per_m2": 0, "humidification_gj_per_m2": 0, "heat_recovery_gj_per_m2": 0, - "water_systems_gj_per_m2": 0.19661419952707576, + "water_systems_gj_per_m2": 0.19641856350764583, "water_systems_water_m3_per_m2": 0.7431625470084604, "refrigeration_gj_per_m2": 0, "generators_gj_per_m2": 0, - "total_end_uses_gj_per_m2": 2.9732762232960175, + "total_end_uses_gj_per_m2": 2.973041460072701, "total_end_uses_water_m3_per_m2": 0.7431625470084604 }, "meter_peaks": { "electric_w": 33976.54, - "natural_gas_w": 233586.66 + "natural_gas_w": 233567.72 }, "unmet_hours": { - "cooling": 63.67, + "cooling": 63.5, "heating": 0.0 }, "service_water_heating": { @@ -171,7 +171,7 @@ "electricity_per_year": 0.0, "electricity_per_day": 0.0, "electricity_per_day_per_occupant": 0.0, - "natural_gas_per_year": 100.5, + "natural_gas_per_year": 100.4, "additional_fuel_per_year": -1, "water_m3_per_year": 379.87, "water_m3_per_day": 1.0393160054719561, @@ -654,11 +654,11 @@ "Output:Meter: invalid Key Name=\"DISTRICTCOOLING:FACILITY\" - not found.", "Output:Meter: invalid Key Name=\"DISTRICTHEATING:FACILITY\" - not found.", "Output:Meter:MeterFileOnly requested for \"Electricity:Facility\" (TimeStep), already on \"Output:Meter\". Will report to both eplusout.eso and eplusout.mtr", - "CalcEquipmentFlowRates: \"DINING SERVICE WATER USE 0.38GAL/MIN\" - Target water temperature is greater than the hot water temperature by (1.02 C) Environment=RUN PERIOD 1, at Simulation time=01/01 00:00 - 00:10 ...target water temperature = 60.00 C ...hot water temperature = 58.98 C ...Target water temperature should be less than or equal to the hot water temperature. Verify temperature setpoints and schedules.", - "CalcEquipmentFlowRates: \"KITCHEN SERVICE WATER USE 0.07GAL/MIN\" - Target water temperature is greater than the hot water temperature by (1.02 C) Environment=RUN PERIOD 1, at Simulation time=01/01 00:00 - 00:10 ...target water temperature = 60.00 C ...hot water temperature = 58.98 C ...Target water temperature should be less than or equal to the hot water temperature. Verify temperature setpoints and schedules.", + "CalcEquipmentFlowRates: \"DINING SERVICE WATER USE 0.38GAL/MIN\" - Target water temperature is greater than the hot water temperature by (1.07 C) Environment=RUN PERIOD 1, at Simulation time=01/01 00:00 - 00:10 ...target water temperature = 60.00 C ...hot water temperature = 58.93 C ...Target water temperature should be less than or equal to the hot water temperature. Verify temperature setpoints and schedules.", + "CalcEquipmentFlowRates: \"KITCHEN SERVICE WATER USE 0.07GAL/MIN\" - Target water temperature is greater than the hot water temperature by (1.07 C) Environment=RUN PERIOD 1, at Simulation time=01/01 00:00 - 00:10 ...target water temperature = 60.00 C ...hot water temperature = 58.93 C ...Target water temperature should be less than or equal to the hot water temperature. Verify temperature setpoints and schedules.", "Processing Monthly Tabular Reports: Variable names not valid for this simulation ...use Output:Diagnostics,DisplayExtraWarnings; to show more details on individual variables.", "CalcDoe2DXCoil: Coil:Cooling:DX:SingleSpeed \"COILCOOLINGDXSINGLESPEED_DX 1 32KBTU/HR 14.0SEER\" - Air-cooled condenser inlet dry-bulb temperature below 0 C. Outdoor dry-bulb temperature = -18.23 ... Occurrence info = RUN PERIOD 1, 01/01 09:01 - 09:03 ... Operation at low ambient temperatures may require special performance curves.", - "CalcDoe2DXCoil: Coil:Cooling:DX:SingleSpeed \"COILCOOLINGDXSINGLESPEED_DX 1 32KBTU/HR 14.0SEER\" - Full load outlet air dry-bulb temperature < 2C. This indicates the possibility of coil frost/freeze. Outlet temperature = 1.01 C. ...Occurrence info = RUN PERIOD 1, 01/01 09:01 - 09:03 ... Possible reasons for low outlet air dry-bulb temperatures are: This DX coil 1) may have a low inlet air dry-bulb temperature. Inlet air temperature = 19.496 C. 2) may have a low air flow rate per watt of cooling capacity. Check inputs. 3) is used as part of a HX assisted cooling coil which uses a high sensible effectiveness. Check inputs.", + "CalcDoe2DXCoil: Coil:Cooling:DX:SingleSpeed \"COILCOOLINGDXSINGLESPEED_DX 1 32KBTU/HR 14.0SEER\" - Full load outlet air dry-bulb temperature < 2C. This indicates the possibility of coil frost/freeze. Outlet temperature = 1.02 C. ...Occurrence info = RUN PERIOD 1, 01/01 09:01 - 09:03 ... Possible reasons for low outlet air dry-bulb temperatures are: This DX coil 1) may have a low inlet air dry-bulb temperature. Inlet air temperature = 19.498 C. 2) may have a low air flow rate per watt of cooling capacity. Check inputs. 3) is used as part of a HX assisted cooling coil which uses a high sensible effectiveness. Check inputs.", "Temperature out of range [-100. to 200.] (PsyPsatFnTemp) Routine=PsyTwbFnTdbWPb, Environment=RUN PERIOD 1, at Simulation time=04/21 19:50 - 20:00 Input Temperature=-146.61", "CalcDoe2DXCoil: Coil:Cooling:DX:SingleSpeed \"COILCOOLINGDXSINGLESPEED_DX 224KBTU/HR 9.7EER\" - Full load outlet air dry-bulb temperature < 2C. This indicates the possibility of coil frost/freeze. Outlet temperature = 1.94 C. ...Occurrence info = RUN PERIOD 1, 04/24 14:00 - 14:10 ... Possible reasons for low outlet air dry-bulb temperatures are: This DX coil 1) may have a low inlet air dry-bulb temperature. Inlet air temperature = 20.650 C. 2) may have a low air flow rate per watt of cooling capacity. Check inputs. 3) is used as part of a HX assisted cooling coil which uses a high sensible effectiveness. Check inputs.", "The resource referenced by LifeCycleCost:UsePriceEscalation= \"U.S. AVG COMMERCIAL-ELECTRICITY\" has no energy cost. ... It is likely that the wrong resource is used. The resource should match the meter used in Utility:Tariff.", @@ -681,11 +681,11 @@ "zone.sizingZone.zoneCoolingSizingFactor is empty for ALL_ST=- undefined -_FL=Building Story 2_SCH=A" ], "code_metrics": { - "heating_gj": 1147.71, + "heating_gj": 1147.68, "cooling_gj": 34.26, "ep_conditioned_floor_area_m2": 511.15331569, "os_conditioned_floor_area_m2": 1022.30663138, - "building_tedi_gj_per_m2": 2.3123590588558978, + "building_tedi_gj_per_m2": 2.312300368050069, "building_medi_gj_per_m2": 0.20467440352758873 } } \ No newline at end of file diff --git a/test/necb/unit_tests/resources/fsr.osm b/test/necb/unit_tests/resources/fsr.osm index 77b957114c..211253725a 100644 --- a/test/necb/unit_tests/resources/fsr.osm +++ b/test/necb/unit_tests/resources/fsr.osm @@ -5050,13 +5050,13 @@ OS:Schedule:Day, OS:Schedule:Ruleset, {4403337d-5ada-4e1b-97b5-7923577b512f}, !- Handle - Water Heater Ambient Temp Schedule - 70F, !- Name + Water Heater Ambient Temp Schedule 70F, !- Name {d1b43d81-ecb5-4fe5-aaeb-4d84fb836b50}, !- Schedule Type Limits Name {5281f084-1566-4b31-961c-093ae4fe5332}; !- Default Day Schedule Name OS:Schedule:Day, {5281f084-1566-4b31-961c-093ae4fe5332}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default, !- Name + Water Heater Ambient Temp Schedule 70F Default, !- Name {d1b43d81-ecb5-4fe5-aaeb-4d84fb836b50}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/os_stds_methods/models/QuickServiceRestaurant_2A_2010.osm b/test/os_stds_methods/models/QuickServiceRestaurant_2A_2010.osm index 8024951736..23d81fdd94 100644 --- a/test/os_stds_methods/models/QuickServiceRestaurant_2A_2010.osm +++ b/test/os_stds_methods/models/QuickServiceRestaurant_2A_2010.osm @@ -6631,13 +6631,13 @@ OS:Schedule:Day, OS:Schedule:Ruleset, {1d0ed74e-c640-4a68-b963-1c441aa867c6}, !- Handle - Water Heater Ambient Temp Schedule - 70F, !- Name + Water Heater Ambient Temp Schedule 70F, !- Name {ec06a395-8911-4be9-9ae3-917f558f2ec2}, !- Schedule Type Limits Name {26cd08f9-b37e-4c5e-9c88-c08404bfa7eb}; !- Default Day Schedule Name OS:Schedule:Day, {26cd08f9-b37e-4c5e-9c88-c08404bfa7eb}, !- Handle - Water Heater Ambient Temp Schedule - 70F Default, !- Name + Water Heater Ambient Temp Schedule 70F Default, !- Name {ec06a395-8911-4be9-9ae3-917f558f2ec2}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1 diff --git a/test/os_stds_methods/models/test_school.osm b/test/os_stds_methods/models/test_school.osm index 88d9e3265f..fcae418168 100644 --- a/test/os_stds_methods/models/test_school.osm +++ b/test/os_stds_methods/models/test_school.osm @@ -26749,13 +26749,13 @@ OS:WaterHeater:Sizing, OS:Schedule:Ruleset, {bf1376ae-72ff-45ce-a324-72efe6d78ed3}, !- Handle - Water Heater Ambient Temp Schedule - 70.0, !- Name + Water Heater Ambient Temp Schedule 70.0F, !- Name {c463a3f1-9b7a-4d23-8888-9cefa388d098}, !- Schedule Type Limits Name {406e189a-6ac2-4eff-b0b3-822bb4c9384d}; !- Default Day Schedule Name OS:Schedule:Day, {406e189a-6ac2-4eff-b0b3-822bb4c9384d}, !- Handle - Water Heater Ambient Temp Schedule - 70.0 Default, !- Name + Water Heater Ambient Temp Schedule 70.0F Default, !- Name {c463a3f1-9b7a-4d23-8888-9cefa388d098}, !- Schedule Type Limits Name , !- Interpolate to Timestep 24, !- Hour 1