diff --git a/HPXMLtoOpenStudio/measure.xml b/HPXMLtoOpenStudio/measure.xml
index 904671ef23..0a35379538 100644
--- a/HPXMLtoOpenStudio/measure.xml
+++ b/HPXMLtoOpenStudio/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>hpxm_lto_openstudio</name>
   <uid>b1543b30-9465-45ff-ba04-1d1f85e763bc</uid>
-  <version_id>bf9d7070-c3d0-4251-ad9d-e45da9629d51</version_id>
-  <version_modified>2026-04-09T03:47:56Z</version_modified>
+  <version_id>b2c2fc5a-5062-45bb-85ef-d93fe797f8ab</version_id>
+  <version_modified>2026-04-07T23:13:47Z</version_modified>
   <xml_checksum>D8922A73</xml_checksum>
   <class_name>HPXMLtoOpenStudio</class_name>
   <display_name>HPXML to OpenStudio Translator</display_name>
@@ -499,7 +499,7 @@
       <filename>output.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>2712B090</checksum>
+      <checksum>7F8E008D</checksum>
     </file>
     <file>
       <filename>psychrometrics.rb</filename>
@@ -715,7 +715,7 @@
       <filename>waterheater.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>096F8A5F</checksum>
+      <checksum>E9274389</checksum>
     </file>
     <file>
       <filename>weather.rb</filename>
diff --git a/HPXMLtoOpenStudio/resources/waterheater.rb b/HPXMLtoOpenStudio/resources/waterheater.rb
index 54f0425e73..c6cedb5021 100644
--- a/HPXMLtoOpenStudio/resources/waterheater.rb
+++ b/HPXMLtoOpenStudio/resources/waterheater.rb
@@ -317,24 +317,8 @@ def self.apply_combi(runner, model, spaces, hpxml_bldg, hpxml_header, water_heat
                                       unavailable_periods: unavailable_periods,
                                       unit_multiplier: unit_multiplier)
     water_heater.setSourceSideDesignFlowRate(100 * unit_multiplier) # set one large number, override by EMS
+	water_heater.setSourceSideFlowControlMode('StorageTank')
 
-    # Create alternate setpoint schedule for source side flow request
-    alternate_stp_sch = water_heater.setpointTemperatureSchedule.get.clone(model).to_Schedule.get
-    alternate_stp_sch.setName("#{obj_name_combi} Alt Spt")
-    water_heater.setIndirectAlternateSetpointTemperatureSchedule(alternate_stp_sch)
-
-    # Create setpoint schedule to specify source side temperature
-    # tank source side inlet temperature, degree C
-    boiler_spt_mngr = model.getSetpointManagerScheduleds.find { |spt_mngr| spt_mngr.setpointNode.get == boiler_plant_loop.loopTemperatureSetpointNode }
-    boiler_heating_spt = boiler_spt_mngr.to_SetpointManagerScheduled.get.schedule.to_ScheduleConstant.get.value
-    source_stp_sch = Model.add_schedule_constant(
-      model,
-      name: "#{obj_name_combi} Source Spt",
-      value: boiler_heating_spt,
-      limits: EPlus::ScheduleTypeLimitsTemperature
-    )
-    # reset dhw boiler setpoint
-    boiler_spt_mngr.to_SetpointManagerScheduled.get.setSchedule(source_stp_sch)
     boiler_plant_loop.autosizeMaximumLoopFlowRate()
 
     # change loop equipment operation scheme to heating load
@@ -460,9 +444,8 @@ def self.apply_combi_system_EMS(model, water_heating_systems, plantloop_map)
       equipment_sch_sensors = {}
       equipment_target_temp_sensors = {}
       tank_volume, deadband, tank_source_temp = 0.0, 0.0, 0.0
-      alt_spt_sch = nil
       tank_temp_sensor, tank_spt_sensor, tank_loss_energy_sensor = nil, nil, nil
-      altsch_actuator, pump_actuator = nil, nil
+      pump_actuator = nil, nil
       water_heater = nil
 
       # Create sensors and actuators
@@ -495,20 +478,6 @@ def self.apply_combi_system_EMS(model, water_heating_systems, plantloop_map)
           output_var_or_meter_name: 'Schedule Value',
           key_name: water_heater.setpointTemperatureSchedule.get.name
         )
-
-        alt_spt_sch = water_heater.indirectAlternateSetpointTemperatureSchedule.get
-        if alt_spt_sch.to_ScheduleConstant.is_initialized
-          comp_type_and_control = EPlus::EMSActuatorScheduleConstantValue
-        elsif alt_spt_sch.to_ScheduleRuleset.is_initialized
-          comp_type_and_control = EPlus::EMSActuatorScheduleYearValue
-        else
-          comp_type_and_control = EPlus::EMSActuatorScheduleFileValue
-        end
-        altsch_actuator = Model.add_ems_actuator(
-          name: "#{combi_sys_id} AltSchedOverride",
-          model_object: alt_spt_sch,
-          comp_type_and_control: comp_type_and_control
-        )
       end
       plant_loop.components.each do |c|
         next unless c.to_WaterUseConnections.is_initialized
@@ -597,10 +566,8 @@ def self.apply_combi_system_EMS(model, water_heating_systems, plantloop_map)
       combi_ctrl_program.addLine('Set WH_Energy_Heat = WH_Use + WH_Loss - WH_HeatToHighSetpoint')
       combi_ctrl_program.addLine('If WH_Energy_Demand > 0')
       combi_ctrl_program.addLine("Set #{pump_actuator.name} = WH_Energy_Heat / (Cp * DeltaT * 3600 * ZoneTimeStep)")
-      combi_ctrl_program.addLine("Set #{altsch_actuator.name} = 100") # Set the alternate setpoint temperature to highest level to ensure maximum source side flow rate
       combi_ctrl_program.addLine('Else')
       combi_ctrl_program.addLine("Set #{pump_actuator.name} = 0")
-      combi_ctrl_program.addLine("Set #{altsch_actuator.name} = NULL")
       combi_ctrl_program.addLine('EndIf')
 
       # ProgramCallingManagers
diff --git a/workflow/tests/base_results/results_simulations_bills.csv b/workflow/tests/base_results/results_simulations_bills.csv
index 3147c089a2..4e543190a5 100644
--- a/workflow/tests/base_results/results_simulations_bills.csv
+++ b/workflow/tests/base_results/results_simulations_bills.csv
@@ -88,11 +88,11 @@ base-dhw-desuperheater-tankless.xml,1433.41,144.0,1289.41,0.0,1433.41,0.0,0.0,0.
 base-dhw-desuperheater-var-speed.xml,1386.84,144.0,1242.84,0.0,1386.84,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 base-dhw-desuperheater.xml,1445.74,144.0,1301.74,0.0,1445.74,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 base-dhw-dwhr.xml,1949.6,144.0,1345.42,0.0,1489.42,144.0,316.18,460.18,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-base-dhw-indirect-detailed-setpoints.xml,1409.31,144.0,780.53,0.0,924.53,144.0,340.78,484.78,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+base-dhw-indirect-detailed-setpoints.xml,1409.11,144.0,780.53,0.0,924.53,144.0,340.58,484.58,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 base-dhw-indirect-dse.xml,1460.64,144.0,781.96,0.0,925.96,144.0,390.68,534.68,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 base-dhw-indirect-outside.xml,1435.3,144.0,780.67,0.0,924.67,144.0,366.63,510.63,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-base-dhw-indirect-standbyloss.xml,1411.02,144.0,780.52,0.0,924.52,144.0,342.5,486.5,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-base-dhw-indirect-with-solar-fraction.xml,1322.87,144.0,780.62,0.0,924.62,144.0,254.25,398.25,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+base-dhw-indirect-standbyloss.xml,1411.01,144.0,780.52,0.0,924.52,144.0,342.49,486.49,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+base-dhw-indirect-with-solar-fraction.xml,1322.84,144.0,780.62,0.0,924.62,144.0,254.22,398.22,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 base-dhw-indirect.xml,1410.69,144.0,780.53,0.0,924.53,144.0,342.16,486.16,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 base-dhw-jacket-electric.xml,2033.14,144.0,1425.93,0.0,1569.93,144.0,319.21,463.21,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 base-dhw-jacket-gas.xml,1814.99,144.0,1047.31,0.0,1191.31,144.0,479.68,623.68,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
@@ -513,11 +513,11 @@ house022.xml,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 house023.xml,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,5191.73,144.0,2626.96,0.0,2770.96,0.0,0.0,0.0,0.0,2420.77,2420.77,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 house024.xml,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,4616.51,144.0,2019.21,0.0,2163.21,0.0,0.0,0.0,0.0,2453.3,2453.3,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 house025.xml,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,3237.74,144.0,2453.24,0.0,2597.24,144.0,496.5,640.5,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-house026.xml,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1610.4,144.0,860.91,0.0,1004.91,144.0,461.49,605.49,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+house026.xml,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1610.37,144.0,860.91,0.0,1004.91,144.0,461.46,605.46,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 house027.xml,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,2003.18,144.0,1128.37,0.0,1272.37,144.0,586.81,730.81,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 house028.xml,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1875.82,144.0,1045.04,0.0,1189.04,144.0,542.78,686.78,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 house029.xml,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,2369.77,144.0,1378.09,0.0,1522.09,144.0,703.68,847.68,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-house030.xml,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,2420.8,144.0,777.13,0.0,921.13,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1499.67,1499.67,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+house030.xml,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,2420.68,144.0,777.13,0.0,921.13,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1499.55,1499.55,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 house031.xml,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,5103.51,144.0,2056.37,0.0,2200.37,144.0,2759.14,2903.14,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 house032.xml,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,2324.88,144.0,745.35,0.0,889.35,144.0,1291.53,1435.53,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 house033.xml,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,3513.61,144.0,692.82,0.0,836.82,0.0,0.0,0.0,0.0,2676.79,2676.79,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
diff --git a/workflow/tests/base_results/results_simulations_energy.csv b/workflow/tests/base_results/results_simulations_energy.csv
index 6164884ead..1ef802fbae 100644
--- a/workflow/tests/base_results/results_simulations_energy.csv
+++ b/workflow/tests/base_results/results_simulations_energy.csv
@@ -88,16 +88,16 @@ base-dhw-desuperheater-tankless.xml,35.113,35.113,35.113,35.113,0.0,0.0,0.0,0.0,
 base-dhw-desuperheater-var-speed.xml,33.845,33.845,33.845,33.845,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,4.309,0.724,7.976,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,1.899,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 base-dhw-desuperheater.xml,35.449,35.449,35.449,35.449,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,5.309,1.266,8.038,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,1.899,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 base-dhw-dwhr.xml,69.274,69.274,36.638,36.638,32.636,0.0,0.0,0.0,0.0,0.0,0.0,1.016,0.0,0.0,5.216,1.204,8.191,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.075,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,32.636,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-base-dhw-indirect-detailed-setpoints.xml,56.431,56.431,21.255,21.255,35.175,0.0,0.0,0.0,0.0,0.0,0.0,0.156,0.0,0.0,0.0,0.0,0.0,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.162,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.034,0.0,15.142,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-base-dhw-indirect-dse.xml,61.621,61.621,21.294,21.294,40.327,0.0,0.0,0.0,0.0,0.0,0.0,0.196,0.0,0.0,0.0,0.0,0.0,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.162,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,25.059,0.0,15.268,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+base-dhw-indirect-detailed-setpoints.xml,56.41,56.41,21.255,21.255,35.155,0.0,0.0,0.0,0.0,0.0,0.0,0.156,0.0,0.0,0.0,0.0,0.0,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.162,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.034,0.0,15.122,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+base-dhw-indirect-dse.xml,61.621,61.621,21.294,21.294,40.326,0.0,0.0,0.0,0.0,0.0,0.0,0.196,0.0,0.0,0.0,0.0,0.0,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.162,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,25.059,0.0,15.268,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 base-dhw-indirect-outside.xml,59.103,59.103,21.259,21.259,37.844,0.0,0.0,0.0,0.0,0.0,0.0,0.167,0.0,0.0,0.0,0.0,0.0,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.155,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,21.367,0.0,16.477,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-base-dhw-indirect-standbyloss.xml,56.608,56.608,21.255,21.255,35.353,0.0,0.0,0.0,0.0,0.0,0.0,0.156,0.0,0.0,0.0,0.0,0.0,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.162,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.016,0.0,15.337,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-base-dhw-indirect-with-solar-fraction.xml,47.502,47.502,21.258,21.258,26.244,0.0,0.0,0.0,0.0,0.0,0.0,0.164,0.0,0.0,0.0,0.0,0.0,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.158,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.911,0.0,5.333,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+base-dhw-indirect-standbyloss.xml,56.607,56.607,21.255,21.255,35.352,0.0,0.0,0.0,0.0,0.0,0.0,0.156,0.0,0.0,0.0,0.0,0.0,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.162,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.016,0.0,15.336,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+base-dhw-indirect-with-solar-fraction.xml,47.498,47.498,21.258,21.258,26.241,0.0,0.0,0.0,0.0,0.0,0.0,0.164,0.0,0.0,0.0,0.0,0.0,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.158,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.911,0.0,5.329,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 base-dhw-indirect.xml,56.573,56.573,21.255,21.255,35.318,0.0,0.0,0.0,0.0,0.0,0.0,0.157,0.0,0.0,0.0,0.0,0.0,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.162,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.05,0.0,15.268,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 base-dhw-jacket-electric.xml,71.78,71.78,38.831,38.831,32.949,0.0,0.0,0.0,0.0,0.0,0.0,1.026,0.0,0.0,5.185,1.196,10.413,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.074,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,32.949,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 base-dhw-jacket-gas.xml,78.032,78.032,28.52,28.52,49.512,0.0,0.0,0.0,0.0,0.0,0.0,1.056,0.0,0.0,5.243,1.211,0.0,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.074,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,33.914,0.0,15.599,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 base-dhw-jacket-hpwh.xml,70.565,70.565,30.68,30.68,39.886,0.0,0.0,0.0,0.0,0.0,0.0,1.242,0.0,0.0,4.562,1.031,2.844,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.065,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,39.886,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-base-dhw-jacket-indirect.xml,56.364,56.364,21.256,21.256,35.109,0.0,0.0,0.0,0.0,0.0,0.0,0.158,0.0,0.0,0.0,0.0,0.0,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.161,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.249,0.0,14.86,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+base-dhw-jacket-indirect.xml,56.364,56.364,21.256,21.256,35.108,0.0,0.0,0.0,0.0,0.0,0.0,0.158,0.0,0.0,0.0,0.0,0.0,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.161,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.249,0.0,14.859,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 base-dhw-low-flow-fixtures.xml,71.418,71.418,38.782,38.782,32.636,0.0,0.0,0.0,0.0,0.0,0.0,1.016,0.0,0.0,5.216,1.204,10.335,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.075,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,32.636,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 base-dhw-multiple.xml,49.453,49.453,23.55,23.55,25.902,0.0,0.0,0.0,0.0,0.0,0.0,0.169,0.0,0.0,0.0,0.0,2.287,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.158,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,21.54,0.0,4.362,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 base-dhw-none.xml,59.661,59.661,26.257,26.257,33.404,0.0,0.0,0.0,0.0,0.0,0.0,1.04,0.0,0.0,5.101,1.174,0.0,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.073,0.0,0.0,0.0,0.0,0.0,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,33.404,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
@@ -513,11 +513,11 @@ house022.xml,139.105,139.105,50.827,50.827,0.0,88.278,0.0,0.0,0.0,0.0,0.0,2.41,0
 house023.xml,144.021,144.021,61.989,61.989,0.0,82.032,0.0,0.0,0.0,0.0,0.0,2.266,0.0,0.0,5.661,0.858,20.068,0.0,0.0,9.214,0.0,0.692,0.045,0.0,0.0,0.0,4.026,0.0,0.0,0.489,0.409,3.04,1.945,0.0,3.151,10.124,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,82.032,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 house024.xml,130.782,130.782,47.648,47.648,0.0,83.134,0.0,0.0,0.0,0.0,0.0,2.269,0.0,0.0,5.339,0.937,17.009,0.0,0.0,3.914,0.0,0.396,0.058,0.0,0.0,0.0,1.839,0.0,0.0,0.489,0.409,3.04,1.945,0.0,2.647,7.357,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,83.134,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 house025.xml,105.396,105.396,70.58,70.58,34.815,0.0,0.0,0.0,0.0,0.0,6.159,1.609,0.389,0.0,19.07,2.864,12.946,0.0,0.0,9.258,0.0,0.783,0.0,0.0,0.0,0.0,3.902,0.0,0.0,0.35,0.273,2.029,1.392,0.0,2.3,7.256,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,34.815,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-house026.xml,57.128,57.128,24.768,24.768,32.36,0.0,0.0,0.0,0.0,0.0,0.0,0.046,0.0,0.0,0.0,0.0,0.0,0.0,0.0,6.53,0.252,0.548,0.299,0.0,0.0,0.0,2.083,0.0,0.0,0.399,0.321,2.387,1.529,0.934,2.116,7.325,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,18.414,0.0,13.946,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+house026.xml,57.127,57.127,24.768,24.768,32.358,0.0,0.0,0.0,0.0,0.0,0.0,0.046,0.0,0.0,0.0,0.0,0.0,0.0,0.0,6.53,0.252,0.548,0.299,0.0,0.0,0.0,2.083,0.0,0.0,0.399,0.321,2.387,1.529,0.934,2.116,7.325,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,18.414,0.0,13.945,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 house027.xml,73.611,73.611,32.463,32.463,41.148,0.0,0.0,0.0,0.0,0.0,0.0,0.639,0.0,0.0,8.101,1.589,0.0,0.0,0.0,5.944,0.218,0.485,0.927,0.0,0.0,0.0,1.638,0.0,0.0,0.399,0.321,2.387,0.105,0.0,2.116,7.595,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.363,0.0,17.714,0.0,3.07,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 house028.xml,68.127,68.127,30.066,30.066,38.061,0.0,0.0,0.0,0.0,0.0,0.0,0.443,0.0,0.0,7.62,1.43,0.0,0.0,0.0,6.134,0.226,0.503,0.618,0.0,0.0,0.0,2.012,0.0,0.0,0.437,0.358,0.21,0.114,0.0,2.351,7.61,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,14.126,0.0,17.799,2.796,3.34,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 house029.xml,77.577,77.577,30.455,30.455,47.122,0.0,0.0,0.0,0.0,0.0,0.0,1.047,0.0,0.0,6.515,0.914,0.0,0.0,0.0,6.539,0.275,0.569,0.76,0.0,0.0,0.0,1.847,0.0,0.0,0.399,0.321,2.387,0.105,0.0,2.116,6.66,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,31.645,0.0,12.407,0.0,3.07,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-house030.xml,59.585,59.585,17.174,17.174,0.0,0.0,42.411,0.0,0.0,0.0,0.0,0.058,0.0,0.0,0.0,0.0,0.0,0.0,0.0,5.321,0.272,0.497,0.57,0.0,0.0,0.0,1.818,0.0,0.0,0.362,0.284,0.167,0.096,0.701,1.88,5.148,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,24.11,0.0,13.279,2.223,2.8,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+house030.xml,59.582,59.582,17.174,17.174,0.0,0.0,42.408,0.0,0.0,0.0,0.0,0.058,0.0,0.0,0.0,0.0,0.0,0.0,0.0,5.321,0.272,0.497,0.57,0.0,0.0,0.0,1.818,0.0,0.0,0.362,0.284,0.167,0.096,0.701,1.88,5.148,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,24.11,0.0,13.275,2.223,2.8,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 house031.xml,231.467,231.467,48.524,48.524,182.942,0.0,0.0,0.0,0.0,0.0,0.0,3.983,0.0,0.0,12.803,2.369,0.0,0.0,0.0,10.355,0.246,0.759,0.0,0.0,0.0,0.0,1.486,0.0,0.0,0.558,0.477,0.28,0.153,0.0,3.564,11.492,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,145.937,0.0,28.802,3.726,4.477,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 house032.xml,103.222,103.222,17.588,17.588,85.634,0.0,0.0,0.0,0.0,0.0,0.0,1.664,0.0,0.0,0.0,0.0,0.0,0.0,0.0,5.091,0.0,0.518,0.0,0.0,0.0,0.0,1.588,0.0,0.0,0.35,0.273,0.161,0.095,0.0,2.037,5.811,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,64.991,0.0,15.718,2.133,2.792,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 house033.xml,107.056,107.056,16.349,16.349,0.0,90.708,0.0,0.0,0.0,0.0,0.0,0.309,0.0,0.0,0.0,0.0,0.0,0.0,0.0,4.885,0.0,0.529,0.0,0.0,0.0,0.0,1.355,0.0,0.0,0.0,0.205,1.524,1.115,0.0,1.679,4.749,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,83.257,0.0,7.451,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
diff --git a/workflow/tests/base_results/results_simulations_loads.csv b/workflow/tests/base_results/results_simulations_loads.csv
index 580288427e..bc9e49d9b9 100644
--- a/workflow/tests/base_results/results_simulations_loads.csv
+++ b/workflow/tests/base_results/results_simulations_loads.csv
@@ -88,11 +88,11 @@ base-dhw-desuperheater-tankless.xml,0.0,0.0,20.593,9.922,0.0,3.226,0.0,0.0,0.0,0
 base-dhw-desuperheater-var-speed.xml,0.0,0.0,23.368,9.915,0.921,3.379,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,-0.155,-0.209,-0.012,2.386,0.03,-0.268,12.451,0.0,0.0,0.0,-6.721,-0.132,-0.893,-4.113,-0.081,0.0,11.324,7.888,1.844
 base-dhw-desuperheater.xml,0.0,0.0,20.959,9.915,0.921,3.293,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,-0.049,-0.211,-0.012,2.383,0.03,-0.273,12.451,0.0,0.0,0.0,-6.727,-0.131,-0.891,-4.077,-0.081,0.0,8.814,7.864,1.844
 base-dhw-dwhr.xml,31.043,0.0,20.51,7.339,0.849,0.0,0.0,0.0,3.243,3.875,0.882,7.07,0.676,11.539,-12.828,0.0,0.0,0.0,8.305,-0.111,5.503,0.0,0.509,0.0,13.465,-8.481,-2.634,0.0,-0.072,-0.246,-0.022,2.447,0.018,-0.381,12.67,0.0,0.0,0.0,-6.428,-0.107,-0.931,-4.18,-0.084,0.0,8.615,7.311,1.873
-base-dhw-indirect-detailed-setpoints.xml,16.976,0.0,0.0,9.917,2.152,0.0,0.0,0.0,3.825,3.815,0.866,7.068,0.662,11.364,-12.644,0.0,0.0,0.0,8.174,-0.085,5.157,0.0,0.503,0.0,0.0,-9.147,-2.601,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+base-dhw-indirect-detailed-setpoints.xml,16.976,0.0,0.0,9.919,2.153,0.0,0.0,0.0,3.825,3.815,0.866,7.068,0.662,11.364,-12.644,0.0,0.0,0.0,8.174,-0.085,5.157,0.0,0.503,0.0,0.0,-9.147,-2.601,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 base-dhw-indirect-dse.xml,16.993,0.0,0.0,9.95,2.112,0.0,0.0,0.0,3.826,3.816,0.866,7.068,0.662,11.367,-12.642,0.0,0.0,0.0,8.17,-0.086,5.158,0.0,0.503,0.0,0.0,-9.131,-2.601,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 base-dhw-indirect-outside.xml,18.139,0.0,0.0,9.951,3.063,0.0,0.0,0.0,3.853,3.843,0.874,7.031,0.67,11.45,-12.753,0.0,0.0,0.0,8.117,-0.107,5.19,0.0,0.506,0.0,0.0,-7.94,-2.622,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 base-dhw-indirect-standbyloss.xml,16.963,0.0,0.0,9.95,2.166,0.0,0.0,0.0,3.826,3.816,0.866,7.069,0.662,11.367,-12.642,0.0,0.0,0.0,8.171,-0.086,5.159,0.0,0.503,0.0,0.0,-9.164,-2.601,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-base-dhw-indirect-with-solar-fraction.xml,17.742,0.0,0.0,9.927,0.728,0.0,6.453,0.0,3.845,3.834,0.872,7.041,0.668,11.426,-12.717,0.0,0.0,0.0,8.131,-0.101,5.182,0.0,0.505,0.0,0.0,-8.352,-2.613,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+base-dhw-indirect-with-solar-fraction.xml,17.742,0.0,0.0,9.928,0.728,0.0,6.453,0.0,3.845,3.834,0.872,7.041,0.668,11.426,-12.717,0.0,0.0,0.0,8.131,-0.101,5.182,0.0,0.505,0.0,0.0,-8.352,-2.613,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 base-dhw-indirect.xml,16.993,0.0,0.0,9.95,2.112,0.0,0.0,0.0,3.826,3.816,0.866,7.068,0.662,11.367,-12.642,0.0,0.0,0.0,8.17,-0.086,5.158,0.0,0.503,0.0,0.0,-9.131,-2.601,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 base-dhw-jacket-electric.xml,31.341,0.0,20.361,9.917,0.492,0.0,0.0,0.0,3.238,3.875,0.882,7.067,0.676,11.538,-12.835,0.0,0.0,0.0,8.3,-0.112,5.505,0.0,0.509,0.0,13.58,-8.277,-2.635,0.0,-0.067,-0.243,-0.021,2.452,0.019,-0.372,12.663,0.0,0.0,0.0,-6.42,-0.108,-0.928,-4.156,-0.084,0.0,8.569,7.158,1.872
 base-dhw-jacket-gas.xml,32.258,0.0,20.607,9.917,2.14,0.0,0.0,0.0,3.231,3.883,0.884,7.062,0.677,11.562,-12.859,0.0,0.0,0.0,8.287,-0.117,6.633,0.0,0.509,0.0,13.942,-8.826,-2.639,0.0,-0.061,-0.234,-0.019,2.45,0.021,-0.345,12.638,0.0,0.0,0.0,-6.429,-0.112,-1.144,-4.144,-0.083,0.0,8.655,7.516,1.868
@@ -513,11 +513,11 @@ house022.xml,72.404,0.0,19.312,10.615,1.919,0.0,0.0,3.886,3.789,21.47,0.0,0.0,1.
 house023.xml,68.687,0.0,15.872,16.354,3.591,0.0,0.0,0.0,10.337,22.364,1.257,15.733,0.88,10.251,-8.426,0.0,0.0,0.0,6.26,-0.536,29.608,0.0,1.705,0.0,0.0,-14.671,-6.024,0.0,0.568,0.06,0.049,5.413,-0.08,-0.708,8.526,0.0,0.0,0.0,-5.862,-0.515,-2.482,-1.514,-0.235,0.0,0.0,9.468,3.191
 house024.xml,68.738,0.0,16.658,14.315,2.681,0.0,0.0,0.0,7.09,30.027,0.0,0.0,0.7,7.364,-8.109,0.0,0.0,5.149,0.0,-0.279,25.488,0.0,1.874,0.0,11.215,-9.235,-2.51,0.0,1.072,1.343,0.0,0.0,-0.029,-0.231,5.786,0.0,0.0,0.222,0.0,-0.272,-1.232,-0.718,-0.158,0.0,3.239,6.256,1.404
 house025.xml,37.24,0.0,49.002,7.923,4.963,0.0,0.0,0.0,3.403,17.724,0.0,0.0,2.109,7.139,-6.2,0.0,0.0,6.656,0.0,-0.941,13.347,0.0,0.407,0.0,5.765,-8.356,-3.873,0.0,1.269,5.849,0.0,0.0,0.374,1.682,11.904,0.0,0.0,5.28,0.0,-0.94,-0.86,-0.28,-0.007,0.0,7.561,11.907,5.386
-house026.xml,14.118,0.0,0.0,8.47,2.068,0.0,0.0,0.0,2.009,7.329,0.249,0.0,0.21,4.484,-3.342,0.0,0.0,6.783,0.0,-0.302,2.511,0.0,3.286,0.0,0.0,-5.966,-3.117,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+house026.xml,14.118,0.0,0.0,8.471,2.068,0.0,0.0,0.0,2.009,7.329,0.249,0.0,0.21,4.484,-3.342,0.0,0.0,6.783,0.0,-0.302,2.511,0.0,3.286,0.0,0.0,-5.966,-3.117,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 house027.xml,19.376,0.0,24.004,8.431,5.234,0.0,0.0,0.801,1.995,8.726,0.468,0.0,0.64,5.172,-4.557,0.0,0.0,0.371,2.663,-0.583,1.8,0.0,11.239,0.0,2.08,-8.426,-2.951,0.583,1.142,1.54,0.122,0.0,-0.059,1.132,6.051,0.0,0.0,0.101,3.096,-0.584,-0.227,-1.647,-2.628,0.0,2.379,9.925,2.993
 house028.xml,13.442,0.0,24.026,9.98,3.62,0.0,0.0,0.844,1.843,7.469,0.361,0.0,0.439,4.92,-4.065,0.0,0.0,0.23,2.031,-0.426,4.122,0.0,4.564,0.0,1.691,-7.789,-2.758,0.692,1.186,-0.182,0.126,0.0,0.073,0.997,7.388,0.0,0.0,0.059,1.312,-0.428,-0.89,-2.121,-1.534,0.0,2.648,11.26,3.376
 house029.xml,31.729,0.0,14.482,9.47,0.0,0.0,0.0,0.0,3.686,15.415,0.412,0.0,0.3,6.38,-6.788,0.0,0.0,6.507,0.0,-0.252,6.991,0.0,7.671,0.0,3.127,-7.817,-3.887,0.0,1.297,0.121,0.028,0.0,0.085,1.286,5.744,0.0,0.0,-1.154,0.0,-0.249,-0.512,-1.926,-1.138,0.0,1.7,6.513,2.652
-house030.xml,18.202,0.0,0.0,7.695,2.218,0.0,0.0,0.0,1.811,10.674,0.509,1.111,1.079,5.363,-3.558,0.0,0.0,0.0,2.996,-0.084,2.937,0.0,5.928,0.0,0.0,-7.483,-3.078,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+house030.xml,18.202,0.0,0.0,7.696,2.218,0.0,0.0,0.0,1.811,10.674,0.509,1.111,1.079,5.363,-3.558,0.0,0.0,0.0,2.996,-0.084,2.937,0.0,5.928,0.0,0.0,-7.483,-3.078,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 house031.xml,120.102,0.0,39.842,17.698,5.237,0.0,0.0,0.0,14.472,42.611,1.076,6.34,1.389,19.996,-18.121,0.0,0.0,1.965,6.141,-0.566,55.841,0.0,0.658,0.0,9.588,-15.033,-6.493,0.0,2.738,5.754,0.202,2.505,0.108,0.446,15.584,0.0,0.0,0.26,-3.54,-0.534,-1.591,-0.845,-0.001,0.0,3.458,10.463,3.861
 house032.xml,49.843,0.0,0.0,7.587,4.931,0.0,0.0,0.0,10.531,9.026,1.966,20.337,1.412,8.266,-9.607,0.0,0.0,0.0,4.264,0.029,15.006,0.0,0.622,0.0,0.0,-8.953,-3.152,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 house033.xml,62.694,0.0,0.0,3.425,0.0,0.0,0.0,0.0,18.918,14.773,0.0,0.0,0.992,10.799,-7.833,0.0,0.0,14.177,0.0,-0.197,18.345,0.0,0.777,0.0,0.0,-5.295,-3.141,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
diff --git a/workflow/tests/base_results/results_simulations_misc.csv b/workflow/tests/base_results/results_simulations_misc.csv
index 3526934def..ff30b923f1 100644
--- a/workflow/tests/base_results/results_simulations_misc.csv
+++ b/workflow/tests/base_results/results_simulations_misc.csv
@@ -88,18 +88,18 @@ base-dhw-desuperheater-tankless.xml,0.0,92.0,0.0,1286.4,890.5,11420.9,3925.9,188
 base-dhw-desuperheater-var-speed.xml,0.0,25.0,0.0,1286.4,890.5,11484.6,3947.8,2138.2,3294.8,3294.8,2138.2,3294.8,3294.8,0.0,24124.0,0.0
 base-dhw-desuperheater.xml,0.0,97.0,0.0,1286.4,890.5,11483.2,3947.3,2138.2,3351.6,3351.6,2138.2,3351.6,3351.6,0.0,23006.0,0.0
 base-dhw-dwhr.xml,0.0,87.0,0.0,1286.4,890.5,10339.3,3554.1,2038.6,3725.1,3725.1,2038.6,3725.1,3725.1,33307.0,23005.0,0.0
-base-dhw-indirect-detailed-setpoints.xml,0.0,0.0,0.0,1126.5,793.4,10132.0,3482.9,1289.9,1157.9,1289.9,1289.9,1157.9,1289.9,16712.0,0.0,0.0
-base-dhw-indirect-dse.xml,0.0,0.0,0.0,1030.4,723.9,9285.9,3192.0,1296.3,1157.9,1296.3,1296.3,1157.9,1296.3,16805.0,0.0,0.0
-base-dhw-indirect-outside.xml,0.0,0.0,0.0,1030.5,724.2,9286.8,3192.3,1290.6,1157.6,1290.6,1290.6,1157.6,1290.6,17064.0,0.0,0.0
-base-dhw-indirect-standbyloss.xml,0.0,0.0,0.0,1030.5,723.9,9286.5,3192.2,1289.8,1157.9,1289.8,1289.8,1157.9,1289.8,16782.0,0.0,0.0
-base-dhw-indirect-with-solar-fraction.xml,0.0,0.0,0.0,1066.3,738.7,9281.6,3190.5,1290.3,1157.7,1290.3,1290.3,1157.7,1290.3,16970.0,0.0,0.0
-base-dhw-indirect.xml,0.0,0.0,0.0,1030.4,723.9,9285.9,3192.0,1289.8,1157.9,1289.8,1289.8,1157.9,1289.8,16805.0,0.0,0.0
+base-dhw-indirect-detailed-setpoints.xml,0.0,0.0,0.0,1079.8,760.7,9576.2,3291.8,1290.0,1157.9,1290.0,1290.0,1157.9,1290.0,16712.0,0.0,0.0
+base-dhw-indirect-dse.xml,0.0,0.0,0.0,1027.4,722.0,9249.6,3179.5,1296.3,1157.9,1296.3,1296.3,1157.9,1296.3,16805.0,0.0,0.0
+base-dhw-indirect-outside.xml,0.0,0.0,0.0,1028.0,722.4,9255.7,3181.6,1290.6,1157.6,1290.6,1290.6,1157.6,1290.6,17064.0,0.0,0.0
+base-dhw-indirect-standbyloss.xml,0.0,0.0,0.0,1027.4,722.0,9250.1,3179.7,1289.8,1157.9,1289.8,1289.8,1157.9,1289.8,16782.0,0.0,0.0
+base-dhw-indirect-with-solar-fraction.xml,0.0,0.0,0.0,979.0,677.3,8576.5,2948.1,1290.3,1157.7,1290.3,1290.3,1157.7,1290.3,16970.0,0.0,0.0
+base-dhw-indirect.xml,0.0,0.0,0.0,1027.4,722.0,9249.6,3179.5,1289.8,1157.9,1289.8,1289.8,1157.9,1289.8,16805.0,0.0,0.0
 base-dhw-jacket-electric.xml,0.0,85.0,0.0,1286.4,890.5,11468.6,3942.3,2340.9,3849.6,3849.6,2340.9,3849.6,3849.6,33376.0,23003.0,0.0
 base-dhw-jacket-gas.xml,0.0,90.0,0.0,1286.4,890.5,11468.7,3942.3,1484.0,3351.7,3351.7,1484.0,3351.7,3351.7,34008.0,23009.0,0.0
 base-dhw-jacket-hpwh.xml,0.0,57.0,0.0,1286.4,890.5,10922.8,3754.7,1915.7,3735.2,3735.2,1915.7,3735.2,3735.2,36104.0,22706.0,0.0
-base-dhw-jacket-indirect.xml,0.0,0.0,0.0,1030.5,724.1,9292.3,3194.2,1290.0,1157.9,1290.0,1290.0,1157.9,1290.0,16829.0,0.0,0.0
+base-dhw-jacket-indirect.xml,0.0,0.0,0.0,1027.2,721.9,9251.6,3180.2,1290.0,1157.9,1290.0,1290.0,1157.9,1290.0,16829.0,0.0,0.0
 base-dhw-low-flow-fixtures.xml,0.0,87.0,0.0,1286.4,890.5,10895.1,3745.2,2338.0,3775.0,3775.0,2338.0,3775.0,3775.0,33302.0,23005.0,0.0
-base-dhw-multiple.xml,0.0,0.0,0.0,1279.8,885.8,11477.0,3945.2,2151.7,2013.1,2151.7,2151.7,2013.1,2151.7,17323.0,0.0,0.0
+base-dhw-multiple.xml,0.0,0.0,0.0,1278.4,884.9,11464.4,3940.8,2151.7,2013.1,2151.7,2151.7,2013.1,2151.7,17323.0,0.0,0.0
 base-dhw-none.xml,0.0,78.0,0.0,0.0,0.0,0.0,0.0,1383.3,3259.2,3259.2,1383.3,3259.2,3259.2,33487.0,22998.0,0.0
 base-dhw-recirc-demand-scheduled.xml,0.0,87.0,0.0,1286.4,890.5,11468.6,1281.2,2287.3,3801.5,3801.5,2287.3,3801.5,3801.5,33303.0,23005.0,0.0
 base-dhw-recirc-demand.xml,0.0,87.0,0.0,1286.4,890.5,11468.6,1281.2,2287.3,3801.5,3801.5,2287.3,3801.5,3801.5,33303.0,23005.0,0.0
@@ -513,11 +513,11 @@ house022.xml,176.0,122.0,0.0,1624.1,1476.6,13849.5,4198.6,3227.4,5908.4,5929.4,3
 house023.xml,0.0,0.0,0.0,1947.8,1721.4,8085.0,2196.2,4163.4,4888.0,4989.3,4163.4,4888.0,4989.3,67241.0,21350.0,0.0
 house024.xml,0.0,0.0,0.0,1947.8,1721.4,15440.8,4194.3,3045.5,3907.7,4119.4,3045.5,3907.7,4119.4,70880.0,18574.0,0.0
 house025.xml,0.0,0.0,0.0,1300.3,1231.9,3357.8,1206.9,5189.2,7316.8,7316.8,5189.2,7316.8,7316.8,37383.0,34576.0,0.0
-house026.xml,0.0,0.0,0.0,1225.3,1139.4,8601.0,2956.6,1535.1,1465.7,1535.1,1535.1,1465.7,1535.1,17370.0,0.0,0.0
+house026.xml,0.0,0.0,0.0,1210.6,1126.6,8506.0,2923.9,1535.1,1465.7,1535.1,1535.1,1465.7,1535.1,17370.0,0.0,0.0
 house027.xml,0.0,0.0,0.0,1529.6,1405.7,10643.7,3658.7,1623.5,4116.9,4116.9,1623.5,4116.9,4116.9,24105.0,23795.0,0.0
 house028.xml,0.0,0.0,0.0,1704.2,1537.8,13056.0,4103.7,1554.6,3863.6,3863.6,1554.6,3863.6,3863.6,20554.0,23438.0,0.0
 house029.xml,0.0,0.0,0.0,1529.6,1405.7,11099.8,3815.5,1695.6,3354.7,3354.7,1695.6,3354.7,3354.7,28570.0,14867.0,0.0
-house030.xml,0.0,0.0,0.0,1057.4,979.7,6778.3,2562.9,1160.9,1088.0,1160.9,1160.9,1088.0,1160.9,16227.0,0.0,0.0
+house030.xml,0.0,0.0,0.0,1023.0,946.9,6588.9,2491.2,1160.9,1088.0,1160.9,1160.9,1088.0,1160.9,16227.0,0.0,0.0
 house031.xml,3.0,0.0,0.0,2271.6,1966.1,19123.6,4791.7,3261.2,9148.2,9449.9,3261.2,9148.2,9449.9,123183.0,63324.0,0.0
 house032.xml,168.0,0.0,0.0,1300.3,1231.9,7019.6,2523.1,1546.7,986.8,1546.7,1546.7,986.8,1546.7,53929.0,0.0,0.0
 house033.xml,0.0,0.0,0.0,976.6,0.0,3198.9,1664.5,1120.2,938.3,1120.2,1120.2,938.3,1120.2,47760.0,0.0,0.0