From 759b25436ac0170d27e408f2d5600aa601657439 Mon Sep 17 00:00:00 2001
From: Scott Horowitz <scott.horowitz@nrel.gov>
Date: Wed, 16 Oct 2024 12:15:35 -0600
Subject: [PATCH 1/3] First step: Tankless -> Instantaneous to align with HPXML
 terminology.

---
 BuildResidentialHPXML/measure.rb              | 14 ++++----
 BuildResidentialHPXML/measure.xml             |  6 ++--
 HPXMLtoOpenStudio/measure.xml                 | 18 +++++-----
 HPXMLtoOpenStudio/resources/defaults.rb       |  4 +--
 HPXMLtoOpenStudio/resources/hpxml.rb          |  2 +-
 .../hpxml_schematron/EPvalidator.xml          |  4 +--
 HPXMLtoOpenStudio/resources/waterheater.rb    | 14 ++++----
 HPXMLtoOpenStudio/tests/test_defaults.rb      | 18 +++++-----
 HPXMLtoOpenStudio/tests/test_validation.rb    |  2 +-
 HPXMLtoOpenStudio/tests/test_water_heater.rb  | 12 +++----
 docs/source/workflow_inputs.rst               |  8 ++---
 tasks.rb                                      |  6 ++--
 workflow/hpxml_inputs.json                    | 34 +++++++++----------
 ... base-dhw-desuperheater-instantaneous.xml} |  0
 ...-dhw-instantaneous-detailed-setpoints.xml} |  0
 ...se-dhw-instantaneous-electric-outside.xml} |  0
 ...> base-dhw-instantaneous-electric-uef.xml} |  0
 ...ml => base-dhw-instantaneous-electric.xml} |  0
 ...xml => base-dhw-instantaneous-gas-uef.xml} |  0
 ...instantaneous-gas-with-solar-fraction.xml} |  0
 ...base-dhw-instantaneous-gas-with-solar.xml} |  0
 ...gas.xml => base-dhw-instantaneous-gas.xml} |  0
 ...xml => base-dhw-instantaneous-propane.xml} |  0
 23 files changed, 71 insertions(+), 71 deletions(-)
 rename workflow/sample_files/{base-dhw-desuperheater-tankless.xml => base-dhw-desuperheater-instantaneous.xml} (100%)
 rename workflow/sample_files/{base-dhw-tankless-detailed-setpoints.xml => base-dhw-instantaneous-detailed-setpoints.xml} (100%)
 rename workflow/sample_files/{base-dhw-tankless-electric-outside.xml => base-dhw-instantaneous-electric-outside.xml} (100%)
 rename workflow/sample_files/{base-dhw-tankless-electric-uef.xml => base-dhw-instantaneous-electric-uef.xml} (100%)
 rename workflow/sample_files/{base-dhw-tankless-electric.xml => base-dhw-instantaneous-electric.xml} (100%)
 rename workflow/sample_files/{base-dhw-tankless-gas-uef.xml => base-dhw-instantaneous-gas-uef.xml} (100%)
 rename workflow/sample_files/{base-dhw-tankless-gas-with-solar-fraction.xml => base-dhw-instantaneous-gas-with-solar-fraction.xml} (100%)
 rename workflow/sample_files/{base-dhw-tankless-gas-with-solar.xml => base-dhw-instantaneous-gas-with-solar.xml} (100%)
 rename workflow/sample_files/{base-dhw-tankless-gas.xml => base-dhw-instantaneous-gas.xml} (100%)
 rename workflow/sample_files/{base-dhw-tankless-propane.xml => base-dhw-instantaneous-propane.xml} (100%)

diff --git a/BuildResidentialHPXML/measure.rb b/BuildResidentialHPXML/measure.rb
index b819408084..b2f2c96184 100644
--- a/BuildResidentialHPXML/measure.rb
+++ b/BuildResidentialHPXML/measure.rb
@@ -2184,7 +2184,7 @@ def arguments(model) # rubocop:disable Lint/UnusedMethodArgument
     water_heater_type_choices = OpenStudio::StringVector.new
     water_heater_type_choices << Constants::None
     water_heater_type_choices << HPXML::WaterHeaterTypeStorage
-    water_heater_type_choices << HPXML::WaterHeaterTypeTankless
+    water_heater_type_choices << HPXML::WaterHeaterTypeInstantaneous
     water_heater_type_choices << HPXML::WaterHeaterTypeHeatPump
     water_heater_type_choices << HPXML::WaterHeaterTypeCombiStorage
     water_heater_type_choices << HPXML::WaterHeaterTypeCombiTankless
@@ -2262,7 +2262,7 @@ def arguments(model) # rubocop:disable Lint/UnusedMethodArgument
 
     arg = OpenStudio::Measure::OSArgument::makeChoiceArgument('water_heater_usage_bin', water_heater_usage_bin_choices, false)
     arg.setDisplayName('Water Heater: Usage Bin')
-    arg.setDescription("The usage of the water heater. Only applies if Efficiency Type is UniformEnergyFactor and Type is not #{HPXML::WaterHeaterTypeTankless}. Does not apply to space-heating boilers. If not provided, the OS-HPXML default (see <a href='#{docs_base_url}#conventional-storage'>Conventional Storage</a>, <a href='#{docs_base_url}#heat-pump'>Heat Pump</a>) is used.")
+    arg.setDescription("The usage of the water heater. Only applies if Efficiency Type is UniformEnergyFactor and Type is not #{HPXML::WaterHeaterTypeInstantaneous}. Does not apply to space-heating boilers. If not provided, the OS-HPXML default (see <a href='#{docs_base_url}#conventional-storage'>Conventional Storage</a>, <a href='#{docs_base_url}#heat-pump'>Heat Pump</a>) is used.")
     args << arg
 
     arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('water_heater_recovery_efficiency', false)
@@ -2291,7 +2291,7 @@ def arguments(model) # rubocop:disable Lint/UnusedMethodArgument
 
     arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('water_heater_jacket_rvalue', false)
     arg.setDisplayName('Water Heater: Jacket R-value')
-    arg.setDescription("The jacket R-value of water heater. Doesn't apply to #{HPXML::WaterHeaterTypeTankless} or #{HPXML::WaterHeaterTypeCombiTankless}. If not provided, defaults to no jacket insulation.")
+    arg.setDescription("The jacket R-value of water heater. Doesn't apply to #{HPXML::WaterHeaterTypeInstantaneous} or #{HPXML::WaterHeaterTypeCombiTankless}. If not provided, defaults to no jacket insulation.")
     arg.setUnits('h-ft^2-R/Btu')
     args << arg
 
@@ -6547,7 +6547,7 @@ def self.set_water_heating_systems(hpxml_bldg, args)
         energy_factor = args[:water_heater_efficiency]
       elsif args[:water_heater_efficiency_type] == 'UniformEnergyFactor'
         uniform_energy_factor = args[:water_heater_efficiency]
-        if water_heater_type != HPXML::WaterHeaterTypeTankless
+        if water_heater_type != HPXML::WaterHeaterTypeInstantaneous
           usage_bin = args[:water_heater_usage_bin]
         end
       end
@@ -6557,11 +6557,11 @@ def self.set_water_heating_systems(hpxml_bldg, args)
       recovery_efficiency = args[:water_heater_recovery_efficiency]
     end
 
-    if [HPXML::WaterHeaterTypeTankless, HPXML::WaterHeaterTypeCombiTankless].include? water_heater_type
+    if [HPXML::WaterHeaterTypeInstantaneous, HPXML::WaterHeaterTypeCombiTankless].include? water_heater_type
       args[:water_heater_tank_volume] = nil
     end
 
-    if [HPXML::WaterHeaterTypeTankless].include? water_heater_type
+    if [HPXML::WaterHeaterTypeInstantaneous].include? water_heater_type
       heating_capacity = nil
       recovery_efficiency = nil
     elsif [HPXML::WaterHeaterTypeCombiTankless, HPXML::WaterHeaterTypeCombiStorage].include? water_heater_type
@@ -6580,7 +6580,7 @@ def self.set_water_heating_systems(hpxml_bldg, args)
       end
     end
 
-    if not [HPXML::WaterHeaterTypeTankless, HPXML::WaterHeaterTypeCombiTankless].include? water_heater_type
+    if not [HPXML::WaterHeaterTypeInstantaneous, HPXML::WaterHeaterTypeCombiTankless].include? water_heater_type
       if args[:water_heater_jacket_rvalue].to_f > 0
         jacket_r_value = args[:water_heater_jacket_rvalue]
       end
diff --git a/BuildResidentialHPXML/measure.xml b/BuildResidentialHPXML/measure.xml
index 7ca4ef9098..c344612c23 100644
--- a/BuildResidentialHPXML/measure.xml
+++ b/BuildResidentialHPXML/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>build_residential_hpxml</name>
   <uid>a13a8983-2b01-4930-8af2-42030b6e4233</uid>
-  <version_id>8dfdc271-772e-46a3-a611-71ca703a96c2</version_id>
-  <version_modified>2024-10-14T23:23:50Z</version_modified>
+  <version_id>22cac8e6-3e14-43cf-8f35-936ea8d5c875</version_id>
+  <version_modified>2024-10-16T18:14:35Z</version_modified>
   <xml_checksum>2C38F48B</xml_checksum>
   <class_name>BuildResidentialHPXML</class_name>
   <display_name>HPXML Builder</display_name>
@@ -7544,7 +7544,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>F2C64E58</checksum>
+      <checksum>7ABB3719</checksum>
     </file>
     <file>
       <filename>constants.rb</filename>
diff --git a/HPXMLtoOpenStudio/measure.xml b/HPXMLtoOpenStudio/measure.xml
index 1bae06f8cc..3eb94c8d93 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>5c60d469-73ac-415f-b37f-8b8401c8d5f3</version_id>
-  <version_modified>2024-10-16T17:32:33Z</version_modified>
+  <version_id>4bc6959d-1dff-4e25-9af0-3460e4f474a5</version_id>
+  <version_modified>2024-10-16T18:14:39Z</version_modified>
   <xml_checksum>D8922A73</xml_checksum>
   <class_name>HPXMLtoOpenStudio</class_name>
   <display_name>HPXML to OpenStudio Translator</display_name>
@@ -327,7 +327,7 @@
       <filename>defaults.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>1B4820ED</checksum>
+      <checksum>5FEBB017</checksum>
     </file>
     <file>
       <filename>energyplus.rb</filename>
@@ -357,7 +357,7 @@
       <filename>hpxml.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>F866C769</checksum>
+      <checksum>B1AABDBA</checksum>
     </file>
     <file>
       <filename>hpxml_schema/HPXML.xsd</filename>
@@ -375,7 +375,7 @@
       <filename>hpxml_schematron/EPvalidator.xml</filename>
       <filetype>xml</filetype>
       <usage_type>resource</usage_type>
-      <checksum>BD9733AC</checksum>
+      <checksum>C2F5CF6D</checksum>
     </file>
     <file>
       <filename>hpxml_schematron/iso-schematron.xsd</filename>
@@ -627,7 +627,7 @@
       <filename>waterheater.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>6F8A18EC</checksum>
+      <checksum>661771DC</checksum>
     </file>
     <file>
       <filename>weather.rb</filename>
@@ -663,7 +663,7 @@
       <filename>test_defaults.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>9DD97EAF</checksum>
+      <checksum>5E703194</checksum>
     </file>
     <file>
       <filename>test_enclosure.rb</filename>
@@ -735,13 +735,13 @@
       <filename>test_validation.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>7CB39E62</checksum>
+      <checksum>6766741E</checksum>
     </file>
     <file>
       <filename>test_water_heater.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>A293B678</checksum>
+      <checksum>9277F61D</checksum>
     </file>
     <file>
       <filename>test_weather.rb</filename>
diff --git a/HPXMLtoOpenStudio/resources/defaults.rb b/HPXMLtoOpenStudio/resources/defaults.rb
index 30d03cafb2..c2232f7f06 100644
--- a/HPXMLtoOpenStudio/resources/defaults.rb
+++ b/HPXMLtoOpenStudio/resources/defaults.rb
@@ -4945,13 +4945,13 @@ def self.get_water_heater_temperature(eri_version)
     end
   end
 
-  # Gets the default performance adjustment for a tankless water heater. Multiplier on efficiency
+  # Gets the default performance adjustment for an instantaneous water heater. Multiplier on efficiency
   # to account for cycling.
   #
   # @param water_heating_system [HPXML::WaterHeatingSystem] The HPXML water heating system of interest
   # @return [Double] Water heater performance adjustment (frac)
   def self.get_water_heater_performance_adjustment(water_heating_system)
-    return unless water_heating_system.water_heater_type == HPXML::WaterHeaterTypeTankless
+    return unless water_heating_system.water_heater_type == HPXML::WaterHeaterTypeInstantaneous
     if not water_heating_system.energy_factor.nil?
       return 0.92 # Applies to EF, ANSI 301-2019
     elsif not water_heating_system.uniform_energy_factor.nil?
diff --git a/HPXMLtoOpenStudio/resources/hpxml.rb b/HPXMLtoOpenStudio/resources/hpxml.rb
index f79f2b67d0..230e977956 100644
--- a/HPXMLtoOpenStudio/resources/hpxml.rb
+++ b/HPXMLtoOpenStudio/resources/hpxml.rb
@@ -457,7 +457,7 @@ class HPXML < Object
   WaterHeaterTypeCombiStorage = 'space-heating boiler with storage tank'
   WaterHeaterTypeCombiTankless = 'space-heating boiler with tankless coil'
   WaterHeaterTypeHeatPump = 'heat pump water heater'
-  WaterHeaterTypeTankless = 'instantaneous water heater'
+  WaterHeaterTypeInstantaneous = 'instantaneous water heater'
   WaterHeaterTypeStorage = 'storage water heater'
   WaterHeaterUsageBinVerySmall = 'very small'
   WaterHeaterUsageBinLow = 'low'
diff --git a/HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.xml b/HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.xml
index 7fac85970b..6d21f02138 100644
--- a/HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.xml
+++ b/HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.xml
@@ -2139,7 +2139,7 @@
     <sch:rule context='/h:HPXML/h:Building/h:BuildingDetails/h:Systems/h:WaterHeating/h:WaterHeatingSystem'>
       <sch:assert role='ERROR' test='count(../h:HotWaterDistribution) = 1'>Expected 1 element(s) for xpath: ../HotWaterDistribution</sch:assert> <!-- See [HotWaterDistribution] -->
       <sch:assert role='ERROR' test='count(../h:WaterFixture) &gt;= 1'>Expected 1 or more element(s) for xpath: ../WaterFixture</sch:assert> <!-- See [WaterFixture] -->
-      <sch:assert role='ERROR' test='count(h:WaterHeaterType) = 1'>Expected 1 element(s) for xpath: WaterHeaterType</sch:assert> <!-- See [WaterHeatingSystemType=Tank] or [WaterHeatingSystemType=Tankless] or [WaterHeatingSystemType=HeatPump] or [WaterHeatingSystemType=CombiIndirect] or [WaterHeatingSystemType=CombiTanklessCoil] -->
+      <sch:assert role='ERROR' test='count(h:WaterHeaterType) = 1'>Expected 1 element(s) for xpath: WaterHeaterType</sch:assert> <!-- See [WaterHeatingSystemType=Tank] or [WaterHeatingSystemType=Instantaneous] or [WaterHeatingSystemType=HeatPump] or [WaterHeatingSystemType=CombiIndirect] or [WaterHeatingSystemType=CombiTanklessCoil] -->
       <sch:assert role='ERROR' test='h:WaterHeaterType[text()="storage water heater" or text()="instantaneous water heater" or text()="heat pump water heater" or text()="space-heating boiler with storage tank" or text()="space-heating boiler with tankless coil"] or not(h:WaterHeaterType)'>Expected WaterHeaterType to be 'storage water heater' or 'instantaneous water heater' or 'heat pump water heater' or 'space-heating boiler with storage tank' or 'space-heating boiler with tankless coil'</sch:assert>
     </sch:rule>
   </sch:pattern>
@@ -2177,7 +2177,7 @@
   </sch:pattern>
 
   <sch:pattern>
-    <sch:title>[WaterHeatingSystemType=Tankless]</sch:title>
+    <sch:title>[WaterHeatingSystemType=Instantaneous]</sch:title>
     <sch:rule context='/h:HPXML/h:Building/h:BuildingDetails/h:Systems/h:WaterHeating/h:WaterHeatingSystem[h:WaterHeaterType="instantaneous water heater"]'>
       <sch:assert role='ERROR' test='count(h:FuelType) = 1'>Expected 1 element(s) for xpath: FuelType</sch:assert>
       <sch:assert role='ERROR' test='h:FuelType[text()="natural gas" or text()="fuel oil" or text()="fuel oil 1" or text()="fuel oil 2" or text()="fuel oil 4" or text()="fuel oil 5/6" or text()="diesel" or text()="propane" or text()="kerosene" or text()="coal" or text()="coke" or text()="bituminous coal" or text()="anthracite coal" or text()="electricity" or text()="wood" or text()="wood pellets"] or not(h:FuelType)'>Expected FuelType to be 'natural gas' or 'fuel oil' or 'fuel oil 1' or 'fuel oil 2' or 'fuel oil 4' or 'fuel oil 5/6' or 'diesel' or 'propane' or 'kerosene' or 'coal' or 'coke' or 'bituminous coal' or 'anthracite coal' or 'electricity' or 'wood' or 'wood pellets'</sch:assert>
diff --git a/HPXMLtoOpenStudio/resources/waterheater.rb b/HPXMLtoOpenStudio/resources/waterheater.rb
index 003b113a8f..551f8a5fa3 100644
--- a/HPXMLtoOpenStudio/resources/waterheater.rb
+++ b/HPXMLtoOpenStudio/resources/waterheater.rb
@@ -21,8 +21,8 @@ def self.apply_dhw_appliances(runner, model, weather, spaces, hpxml_bldg, hpxml_
     hpxml_bldg.water_heating_systems.each do |dhw_system|
       if dhw_system.water_heater_type == HPXML::WaterHeaterTypeStorage
         apply_tank(model, runner, spaces, hpxml_bldg, hpxml_header, dhw_system, schedules_file, unavailable_periods, plantloop_map)
-      elsif dhw_system.water_heater_type == HPXML::WaterHeaterTypeTankless
-        apply_tankless(model, runner, spaces, hpxml_bldg, hpxml_header, dhw_system, schedules_file, unavailable_periods, plantloop_map)
+      elsif dhw_system.water_heater_type == HPXML::WaterHeaterTypeInstantaneous
+        apply_instantaneous(model, runner, spaces, hpxml_bldg, hpxml_header, dhw_system, schedules_file, unavailable_periods, plantloop_map)
       elsif dhw_system.water_heater_type == HPXML::WaterHeaterTypeHeatPump
         apply_heatpump(model, runner, spaces, hpxml_bldg, hpxml_header, dhw_system, schedules_file, unavailable_periods, plantloop_map)
       elsif [HPXML::WaterHeaterTypeCombiStorage, HPXML::WaterHeaterTypeCombiTankless].include? dhw_system.water_heater_type
@@ -95,7 +95,7 @@ def self.apply_tank(model, runner, spaces, hpxml_bldg, hpxml_header, water_heati
   # @param unavailable_periods [HPXML::UnavailablePeriods] Object that defines periods for, e.g., power outages or vacancies
   # @param plantloop_map [Hash] Map of HPXML System ID => OpenStudio PlantLoop objects
   # @return [nil]
-  def self.apply_tankless(model, runner, spaces, hpxml_bldg, hpxml_header, water_heating_system, schedules_file, unavailable_periods, plantloop_map)
+  def self.apply_instantaneous(model, runner, spaces, hpxml_bldg, hpxml_header, water_heating_system, schedules_file, unavailable_periods, plantloop_map)
     loc_space, loc_schedule = Geometry.get_space_or_schedule_from_location(water_heating_system.location, model, spaces)
     unit_multiplier = hpxml_bldg.building_construction.number_of_units
     water_heating_system.heating_capacity = 100000000000.0 * unit_multiplier
@@ -1573,7 +1573,7 @@ def self.calc_ef_from_uef(water_heating_system)
     if water_heating_system.fuel_type == HPXML::FuelTypeElectricity
       if water_heating_system.water_heater_type == HPXML::WaterHeaterTypeStorage
         return [2.4029 * water_heating_system.uniform_energy_factor - 1.2844, 0.96].min
-      elsif water_heating_system.water_heater_type == HPXML::WaterHeaterTypeTankless
+      elsif water_heating_system.water_heater_type == HPXML::WaterHeaterTypeInstantaneous
         return water_heating_system.uniform_energy_factor
       elsif water_heating_system.water_heater_type == HPXML::WaterHeaterTypeHeatPump
         return 1.2101 * water_heating_system.uniform_energy_factor - 0.6052
@@ -1581,7 +1581,7 @@ def self.calc_ef_from_uef(water_heating_system)
     else # Fuel
       if water_heating_system.water_heater_type == HPXML::WaterHeaterTypeStorage
         return 0.9066 * water_heating_system.uniform_energy_factor + 0.0711
-      elsif water_heating_system.water_heater_type == HPXML::WaterHeaterTypeTankless
+      elsif water_heating_system.water_heater_type == HPXML::WaterHeaterTypeInstantaneous
         return water_heating_system.uniform_energy_factor
       end
     end
@@ -1816,7 +1816,7 @@ def self.calc_tank_UA(act_vol, water_heating_system, solar_fraction, nbeds)
     #   Calculates the U value, UA of the tank and conversion efficiency (eta_c)
     #   based on the Uniform Energy Factor, First Hour Rating, and Recovery Efficiency of the tank
     #   Source: Maguire and Roberts 2020 - https://www.ashrae.org/file%20library/conferences/specialty%20conferences/2020%20building%20performance/papers/d-bsc20-c039.pdf
-    if water_heating_system.water_heater_type == HPXML::WaterHeaterTypeTankless
+    if water_heating_system.water_heater_type == HPXML::WaterHeaterTypeInstantaneous
       if not water_heating_system.energy_factor.nil?
         eta_c = water_heating_system.energy_factor * water_heating_system.performance_adjustment
       elsif not water_heating_system.uniform_energy_factor.nil?
@@ -2002,7 +2002,7 @@ def self.create_new_heater(name:, water_heating_system: nil, act_vol:, t_set_c:
       new_heater.setTankVolume(UnitConversions.convert(act_vol, 'gal', 'm^3'))
       new_heater.setHeaterThermalEfficiency(eta_c) unless eta_c.nil?
       new_heater.setMaximumTemperatureLimit(99.0)
-      if [HPXML::WaterHeaterTypeTankless, HPXML::WaterHeaterTypeCombiTankless].include? tank_type
+      if [HPXML::WaterHeaterTypeInstantaneous, HPXML::WaterHeaterTypeCombiTankless].include? tank_type
         new_heater.setHeaterControlType('Modulate')
       else
         new_heater.setHeaterControlType('Cycle')
diff --git a/HPXMLtoOpenStudio/tests/test_defaults.rb b/HPXMLtoOpenStudio/tests/test_defaults.rb
index ebc5cd8371..9fb167353f 100644
--- a/HPXMLtoOpenStudio/tests/test_defaults.rb
+++ b/HPXMLtoOpenStudio/tests/test_defaults.rb
@@ -3234,19 +3234,19 @@ def test_storage_water_heaters
     assert_equal(HPXML::WaterHeaterTankModelTypeMixed, default_hpxml_bldg.water_heating_systems[0].tank_model_type)
   end
 
-  def test_tankless_water_heaters
+  def test_instantaneous_water_heaters
     # Test inputs not overridden by defaults
-    hpxml, hpxml_bldg = _create_hpxml('base-dhw-tankless-gas.xml')
+    hpxml, hpxml_bldg = _create_hpxml('base-dhw-instantaneous-gas.xml')
     hpxml_bldg.water_heating_systems[0].performance_adjustment = 0.88
     XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
     _default_hpxml, default_hpxml_bldg = _test_measure()
-    _test_default_tankless_water_heater_values(default_hpxml_bldg, [0.88])
+    _test_default_instantaneous_water_heater_values(default_hpxml_bldg, [0.88])
 
     # Test defaults w/ EF
     hpxml_bldg.water_heating_systems[0].performance_adjustment = nil
     XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
     _default_hpxml, default_hpxml_bldg = _test_measure()
-    _test_default_tankless_water_heater_values(default_hpxml_bldg, [0.92])
+    _test_default_instantaneous_water_heater_values(default_hpxml_bldg, [0.92])
 
     # Test defaults w/ UEF
     hpxml_bldg.water_heating_systems[0].energy_factor = nil
@@ -3254,7 +3254,7 @@ def test_tankless_water_heaters
     hpxml_bldg.water_heating_systems[0].first_hour_rating = 5.7
     XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
     _default_hpxml, default_hpxml_bldg = _test_measure()
-    _test_default_tankless_water_heater_values(default_hpxml_bldg, [0.94])
+    _test_default_instantaneous_water_heater_values(default_hpxml_bldg, [0.94])
   end
 
   def test_heat_pump_water_heaters
@@ -5518,10 +5518,10 @@ def _test_default_storage_water_heater_values(hpxml_bldg, *expected_wh_values)
     end
   end
 
-  def _test_default_tankless_water_heater_values(hpxml_bldg, *expected_wh_values)
-    tankless_water_heaters = hpxml_bldg.water_heating_systems.select { |w| w.water_heater_type == HPXML::WaterHeaterTypeTankless }
-    assert_equal(expected_wh_values.size, tankless_water_heaters.size)
-    tankless_water_heaters.each_with_index do |wh_system, idx|
+  def _test_default_instantaneous_water_heater_values(hpxml_bldg, *expected_wh_values)
+    instantaneous_water_heaters = hpxml_bldg.water_heating_systems.select { |w| w.water_heater_type == HPXML::WaterHeaterTypeInstantaneous }
+    assert_equal(expected_wh_values.size, instantaneous_water_heaters.size)
+    instantaneous_water_heaters.each_with_index do |wh_system, idx|
       performance_adjustment, = expected_wh_values[idx]
 
       assert_equal(performance_adjustment, wh_system.performance_adjustment)
diff --git a/HPXMLtoOpenStudio/tests/test_validation.rb b/HPXMLtoOpenStudio/tests/test_validation.rb
index 538f12a0f1..a05c8fa61d 100644
--- a/HPXMLtoOpenStudio/tests/test_validation.rb
+++ b/HPXMLtoOpenStudio/tests/test_validation.rb
@@ -918,7 +918,7 @@ def test_schema_schematron_warning_messages
         hpxml, hpxml_bldg = _create_hpxml('base-dhw-multiple.xml')
         hpxml_bldg.water_heating_systems.each do |water_heating_system|
           if [HPXML::WaterHeaterTypeStorage,
-              HPXML::WaterHeaterTypeTankless].include? water_heating_system.water_heater_type
+              HPXML::WaterHeaterTypeInstantaneous].include? water_heating_system.water_heater_type
             water_heating_system.energy_factor = 0.1
           end
         end
diff --git a/HPXMLtoOpenStudio/tests/test_water_heater.rb b/HPXMLtoOpenStudio/tests/test_water_heater.rb
index 50677c78d3..33b8023a32 100644
--- a/HPXMLtoOpenStudio/tests/test_water_heater.rb
+++ b/HPXMLtoOpenStudio/tests/test_water_heater.rb
@@ -235,9 +235,9 @@ def test_tank_electric_uef
     assert_equal(1.0, wh.offCycleLossFractiontoThermalZone)
   end
 
-  def test_tankless_electric
+  def test_instantaneous_electric
     args_hash = {}
-    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-dhw-tankless-electric.xml'))
+    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-dhw-instantaneous-electric.xml'))
     model, _hpxml, hpxml_bldg = _test_measure(args_hash)
 
     # Get HPXML values
@@ -266,9 +266,9 @@ def test_tankless_electric
     assert_equal(1.0, wh.offCycleLossFractiontoThermalZone)
   end
 
-  def test_tankless_electric_uef
+  def test_instantaneous_electric_uef
     args_hash = {}
-    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-dhw-tankless-electric-uef.xml'))
+    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-dhw-instantaneous-electric-uef.xml'))
     model, _hpxml, hpxml_bldg = _test_measure(args_hash)
 
     # Get HPXML values
@@ -297,9 +297,9 @@ def test_tankless_electric_uef
     assert_equal(1.0, wh.offCycleLossFractiontoThermalZone)
   end
 
-  def test_tankless_gas_uef
+  def test_instantaneous_gas_uef
     args_hash = {}
-    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-dhw-tankless-gas-uef.xml'))
+    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-dhw-instantaneous-gas-uef.xml'))
     model, _hpxml, hpxml_bldg = _test_measure(args_hash)
 
     # Get HPXML values
diff --git a/docs/source/workflow_inputs.rst b/docs/source/workflow_inputs.rst
index abc2601f34..815b008a57 100644
--- a/docs/source/workflow_inputs.rst
+++ b/docs/source/workflow_inputs.rst
@@ -3917,7 +3917,7 @@ HPXML Water Heating Systems
 The following water heater types can be modeled:
 
 - :ref:`water_heater_storage`
-- :ref:`water_heater_tankless`
+- :ref:`water_heater_instantaneous`
 - :ref:`water_heater_heat_pump`
 - :ref:`water_heater_combi_storage`
 - :ref:`water_heater_combi_tankless_coil`
@@ -3984,10 +3984,10 @@ Each conventional storage water heater is entered as a ``/HPXML/Building/Buildin
          Tank losses will be apportioned to the dwelling unit using its number of bedrooms divided by the total number of bedrooms served by the water heating system per `ANSI/RESNET/ICC 301-2022 <https://codes.iccsafe.org/content/RESNET3012022P1>`_.
          Each dwelling unit w/zero bedrooms should be counted as 1 bedroom -- e.g., a value of 3 should be entered for a shared system serving 3 studio (zero bedroom) apartments.
 
-.. _water_heater_tankless:
+.. water_heater_instantaneous:
 
-Tankless
-~~~~~~~~
+Instantaneous
+~~~~~~~~~~~~~
 
 Each instantaneous tankless water heater is entered as a ``/HPXML/Building/BuildingDetails/Systems/WaterHeating/WaterHeatingSystem``.
 
diff --git a/tasks.rb b/tasks.rb
index 5f19132219..a1b7e753f2 100644
--- a/tasks.rb
+++ b/tasks.rb
@@ -2037,7 +2037,7 @@ def apply_hpxml_modification_sample_files(hpxml_path, hpxml)
     elsif ['base-dhw-tank-gas-uef-fhr.xml'].include? hpxml_file
       hpxml_bldg.water_heating_systems[0].first_hour_rating = 56.0
       hpxml_bldg.water_heating_systems[0].usage_bin = nil
-    elsif ['base-dhw-tankless-electric-outside.xml'].include? hpxml_file
+    elsif ['base-dhw-instantaneous-electric-outside.xml'].include? hpxml_file
       hpxml_bldg.water_heating_systems[0].performance_adjustment = 0.92
     elsif ['base-dhw-multiple.xml'].include? hpxml_file
       hpxml_bldg.water_heating_systems[0].fraction_dhw_load_served = 0.2
@@ -2061,14 +2061,14 @@ def apply_hpxml_modification_sample_files(hpxml_path, hpxml)
                                            temperature: 125.0)
       hpxml_bldg.water_heating_systems.add(id: "WaterHeatingSystem#{hpxml_bldg.water_heating_systems.size + 1}",
                                            fuel_type: HPXML::FuelTypeElectricity,
-                                           water_heater_type: HPXML::WaterHeaterTypeTankless,
+                                           water_heater_type: HPXML::WaterHeaterTypeInstantaneous,
                                            location: HPXML::LocationConditionedSpace,
                                            fraction_dhw_load_served: 0.2,
                                            energy_factor: 0.99,
                                            temperature: 125.0)
       hpxml_bldg.water_heating_systems.add(id: "WaterHeatingSystem#{hpxml_bldg.water_heating_systems.size + 1}",
                                            fuel_type: HPXML::FuelTypeNaturalGas,
-                                           water_heater_type: HPXML::WaterHeaterTypeTankless,
+                                           water_heater_type: HPXML::WaterHeaterTypeInstantaneous,
                                            location: HPXML::LocationConditionedSpace,
                                            fraction_dhw_load_served: 0.1,
                                            energy_factor: 0.82,
diff --git a/workflow/hpxml_inputs.json b/workflow/hpxml_inputs.json
index 342eede201..6399560359 100644
--- a/workflow/hpxml_inputs.json
+++ b/workflow/hpxml_inputs.json
@@ -1320,7 +1320,7 @@
     "parent_hpxml": "sample_files/base-dhw-tank-heat-pump.xml",
     "water_heater_uses_desuperheater": true
   },
-  "sample_files/base-dhw-desuperheater-tankless.xml": {
+  "sample_files/base-dhw-desuperheater-instantaneous.xml": {
     "parent_hpxml": "sample_files/base-hvac-central-ac-only-1-speed.xml",
     "water_heater_type": "instantaneous water heater",
     "water_heater_efficiency": 0.99,
@@ -1558,33 +1558,33 @@
     "parent_hpxml": "sample_files/base-dhw-tank-gas.xml",
     "water_heater_fuel_type": "wood"
   },
-  "sample_files/base-dhw-tankless-electric.xml": {
+  "sample_files/base-dhw-instantaneous-electric.xml": {
     "parent_hpxml": "sample_files/base.xml",
     "water_heater_type": "instantaneous water heater",
     "water_heater_efficiency": 0.99
   },
-  "sample_files/base-dhw-tankless-electric-outside.xml": {
-    "parent_hpxml": "sample_files/base-dhw-tankless-electric.xml",
+  "sample_files/base-dhw-instantaneous-electric-outside.xml": {
+    "parent_hpxml": "sample_files/base-dhw-instantaneous-electric.xml",
     "water_heater_location": "other exterior"
   },
-  "sample_files/base-dhw-tankless-electric-uef.xml": {
-    "parent_hpxml": "sample_files/base-dhw-tankless-electric.xml",
+  "sample_files/base-dhw-instantaneous-electric-uef.xml": {
+    "parent_hpxml": "sample_files/base-dhw-instantaneous-electric.xml",
     "water_heater_efficiency_type": "UniformEnergyFactor",
     "water_heater_efficiency": 0.98
   },
-  "sample_files/base-dhw-tankless-gas.xml": {
+  "sample_files/base-dhw-instantaneous-gas.xml": {
     "parent_hpxml": "sample_files/base.xml",
     "water_heater_type": "instantaneous water heater",
     "water_heater_fuel_type": "natural gas",
     "water_heater_efficiency": 0.82
   },
-  "sample_files/base-dhw-tankless-gas-uef.xml": {
-    "parent_hpxml": "sample_files/base-dhw-tankless-gas.xml",
+  "sample_files/base-dhw-instantaneous-gas-uef.xml": {
+    "parent_hpxml": "sample_files/base-dhw-instantaneous-gas.xml",
     "water_heater_efficiency_type": "UniformEnergyFactor",
     "water_heater_efficiency": 0.93
   },
-  "sample_files/base-dhw-tankless-gas-with-solar.xml": {
-    "parent_hpxml": "sample_files/base-dhw-tankless-gas.xml",
+  "sample_files/base-dhw-instantaneous-gas-with-solar.xml": {
+    "parent_hpxml": "sample_files/base-dhw-instantaneous-gas.xml",
     "solar_thermal_system_type": "hot water",
     "solar_thermal_collector_area": 40,
     "solar_thermal_collector_azimuth": 180,
@@ -1593,17 +1593,17 @@
     "solar_thermal_collector_rated_thermal_losses": 0.793,
     "solar_thermal_storage_volume": 60
   },
-  "sample_files/base-dhw-tankless-gas-with-solar-fraction.xml": {
-    "parent_hpxml": "sample_files/base-dhw-tankless-gas.xml",
+  "sample_files/base-dhw-instantaneous-gas-with-solar-fraction.xml": {
+    "parent_hpxml": "sample_files/base-dhw-instantaneous-gas.xml",
     "solar_thermal_system_type": "hot water",
     "solar_thermal_solar_fraction": 0.65
   },
-  "sample_files/base-dhw-tankless-propane.xml": {
-    "parent_hpxml": "sample_files/base-dhw-tankless-gas.xml",
+  "sample_files/base-dhw-instantaneous-propane.xml": {
+    "parent_hpxml": "sample_files/base-dhw-instantaneous-gas.xml",
     "water_heater_fuel_type": "propane"
   },
-  "sample_files/base-dhw-tankless-detailed-setpoints.xml": {
-    "parent_hpxml": "sample_files/base-dhw-tankless-gas.xml",
+  "sample_files/base-dhw-instantaneous-detailed-setpoints.xml": {
+    "parent_hpxml": "sample_files/base-dhw-instantaneous-gas.xml",
     "water_heater_setpoint_temperature": null,
     "schedules_filepaths": "../../HPXMLtoOpenStudio/resources/schedule_files/water-heater-setpoints.csv"
   },
diff --git a/workflow/sample_files/base-dhw-desuperheater-tankless.xml b/workflow/sample_files/base-dhw-desuperheater-instantaneous.xml
similarity index 100%
rename from workflow/sample_files/base-dhw-desuperheater-tankless.xml
rename to workflow/sample_files/base-dhw-desuperheater-instantaneous.xml
diff --git a/workflow/sample_files/base-dhw-tankless-detailed-setpoints.xml b/workflow/sample_files/base-dhw-instantaneous-detailed-setpoints.xml
similarity index 100%
rename from workflow/sample_files/base-dhw-tankless-detailed-setpoints.xml
rename to workflow/sample_files/base-dhw-instantaneous-detailed-setpoints.xml
diff --git a/workflow/sample_files/base-dhw-tankless-electric-outside.xml b/workflow/sample_files/base-dhw-instantaneous-electric-outside.xml
similarity index 100%
rename from workflow/sample_files/base-dhw-tankless-electric-outside.xml
rename to workflow/sample_files/base-dhw-instantaneous-electric-outside.xml
diff --git a/workflow/sample_files/base-dhw-tankless-electric-uef.xml b/workflow/sample_files/base-dhw-instantaneous-electric-uef.xml
similarity index 100%
rename from workflow/sample_files/base-dhw-tankless-electric-uef.xml
rename to workflow/sample_files/base-dhw-instantaneous-electric-uef.xml
diff --git a/workflow/sample_files/base-dhw-tankless-electric.xml b/workflow/sample_files/base-dhw-instantaneous-electric.xml
similarity index 100%
rename from workflow/sample_files/base-dhw-tankless-electric.xml
rename to workflow/sample_files/base-dhw-instantaneous-electric.xml
diff --git a/workflow/sample_files/base-dhw-tankless-gas-uef.xml b/workflow/sample_files/base-dhw-instantaneous-gas-uef.xml
similarity index 100%
rename from workflow/sample_files/base-dhw-tankless-gas-uef.xml
rename to workflow/sample_files/base-dhw-instantaneous-gas-uef.xml
diff --git a/workflow/sample_files/base-dhw-tankless-gas-with-solar-fraction.xml b/workflow/sample_files/base-dhw-instantaneous-gas-with-solar-fraction.xml
similarity index 100%
rename from workflow/sample_files/base-dhw-tankless-gas-with-solar-fraction.xml
rename to workflow/sample_files/base-dhw-instantaneous-gas-with-solar-fraction.xml
diff --git a/workflow/sample_files/base-dhw-tankless-gas-with-solar.xml b/workflow/sample_files/base-dhw-instantaneous-gas-with-solar.xml
similarity index 100%
rename from workflow/sample_files/base-dhw-tankless-gas-with-solar.xml
rename to workflow/sample_files/base-dhw-instantaneous-gas-with-solar.xml
diff --git a/workflow/sample_files/base-dhw-tankless-gas.xml b/workflow/sample_files/base-dhw-instantaneous-gas.xml
similarity index 100%
rename from workflow/sample_files/base-dhw-tankless-gas.xml
rename to workflow/sample_files/base-dhw-instantaneous-gas.xml
diff --git a/workflow/sample_files/base-dhw-tankless-propane.xml b/workflow/sample_files/base-dhw-instantaneous-propane.xml
similarity index 100%
rename from workflow/sample_files/base-dhw-tankless-propane.xml
rename to workflow/sample_files/base-dhw-instantaneous-propane.xml

From a30571029e48040c1ffcb43763e0eef2e6f6cd11 Mon Sep 17 00:00:00 2001
From: Scott Horowitz <scott.horowitz@nrel.gov>
Date: Wed, 16 Oct 2024 17:19:57 -0600
Subject: [PATCH 2/3] Fix docs.

---
 docs/source/workflow_inputs.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/workflow_inputs.rst b/docs/source/workflow_inputs.rst
index 815b008a57..cfc98dc9be 100644
--- a/docs/source/workflow_inputs.rst
+++ b/docs/source/workflow_inputs.rst
@@ -3984,12 +3984,12 @@ Each conventional storage water heater is entered as a ``/HPXML/Building/Buildin
          Tank losses will be apportioned to the dwelling unit using its number of bedrooms divided by the total number of bedrooms served by the water heating system per `ANSI/RESNET/ICC 301-2022 <https://codes.iccsafe.org/content/RESNET3012022P1>`_.
          Each dwelling unit w/zero bedrooms should be counted as 1 bedroom -- e.g., a value of 3 should be entered for a shared system serving 3 studio (zero bedroom) apartments.
 
-.. water_heater_instantaneous:
+.. _water_heater_instantaneous:
 
 Instantaneous
 ~~~~~~~~~~~~~
 
-Each instantaneous tankless water heater is entered as a ``/HPXML/Building/BuildingDetails/Systems/WaterHeating/WaterHeatingSystem``.
+Each instantaneous water heater is entered as a ``/HPXML/Building/BuildingDetails/Systems/WaterHeating/WaterHeatingSystem``.
 
   ===========================================  =======  ============  ==========================  ============  ========  ==========================================================
   Element                                      Type     Units         Constraints                 Required      Default   Notes

From a669aea5e3b13d138608166106a8fa32f61e3070 Mon Sep 17 00:00:00 2001
From: GitHub Action <github-action@users.noreply.github.com>
Date: Thu, 17 Oct 2024 00:10:29 +0000
Subject: [PATCH 3/3] Latest results.

---
 .../results_simulations_bills.csv             | 20 +++++++++----------
 .../results_simulations_energy.csv            | 20 +++++++++----------
 .../base_results/results_simulations_hvac.csv | 20 +++++++++----------
 .../results_simulations_loads.csv             | 20 +++++++++----------
 .../base_results/results_simulations_misc.csv | 20 +++++++++----------
 5 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/workflow/tests/base_results/results_simulations_bills.csv b/workflow/tests/base_results/results_simulations_bills.csv
index 53776741fb..859d2d356b 100644
--- a/workflow/tests/base_results/results_simulations_bills.csv
+++ b/workflow/tests/base_results/results_simulations_bills.csv
@@ -73,7 +73,7 @@ base-dhw-combi-tankless.xml,1389.23,144.0,777.72,0.0,921.72,144.0,323.51,467.51,
 base-dhw-desuperheater-2-speed.xml,1292.55,144.0,1148.55,0.0,1292.55,0.0,0.0,0.0,0.0,0.0,0.0,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-gshp.xml,1537.08,144.0,1393.08,0.0,1537.08,0.0,0.0,0.0,0.0,0.0,0.0,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-hpwh.xml,1666.17,144.0,1082.08,0.0,1226.08,144.0,296.09,440.09,0.0,0.0,0.0,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-tankless.xml,1352.71,144.0,1208.71,0.0,1352.71,0.0,0.0,0.0,0.0,0.0,0.0,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-instantaneous.xml,1352.71,144.0,1208.71,0.0,1352.71,0.0,0.0,0.0,0.0,0.0,0.0,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-var-speed.xml,1266.3,144.0,1122.3,0.0,1266.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,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 base-dhw-desuperheater.xml,1353.92,144.0,1209.92,0.0,1353.92,0.0,0.0,0.0,0.0,0.0,0.0,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,1757.79,144.0,1220.48,0.0,1364.48,144.0,249.31,393.31,0.0,0.0,0.0,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,6 +83,15 @@ base-dhw-indirect-outside.xml,1434.45,144.0,777.72,0.0,921.72,144.0,368.73,512.7
 base-dhw-indirect-standbyloss.xml,1409.37,144.0,777.57,0.0,921.57,144.0,343.8,487.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,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 base-dhw-indirect-with-solar-fraction.xml,1325.32,144.0,777.68,0.0,921.68,144.0,259.64,403.64,0.0,0.0,0.0,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,1406.88,144.0,777.59,0.0,921.59,144.0,341.29,485.29,0.0,0.0,0.0,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-instantaneous-detailed-setpoints.xml,1631.88,144.0,973.19,0.0,1117.19,144.0,370.69,514.69,0.0,0.0,0.0,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-instantaneous-electric-outside.xml,1852.37,144.0,1310.57,0.0,1454.57,144.0,253.8,397.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,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+base-dhw-instantaneous-electric-uef.xml,1848.56,144.0,1306.76,0.0,1450.76,144.0,253.8,397.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,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+base-dhw-instantaneous-electric.xml,1852.37,144.0,1310.57,0.0,1454.57,144.0,253.8,397.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,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+base-dhw-instantaneous-gas-uef.xml,1616.08,144.0,973.19,0.0,1117.19,144.0,354.89,498.89,0.0,0.0,0.0,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-instantaneous-gas-with-solar-fraction.xml,1555.99,144.0,973.19,0.0,1117.19,144.0,294.8,438.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,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+base-dhw-instantaneous-gas-with-solar.xml,1542.7,144.0,988.7,0.0,1132.7,144.0,266.0,410.0,0.0,0.0,0.0,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-instantaneous-gas.xml,1632.13,144.0,973.19,0.0,1117.19,144.0,370.94,514.94,0.0,0.0,0.0,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-instantaneous-propane.xml,1813.1,144.0,973.19,0.0,1117.19,144.0,253.8,397.8,0.0,0.0,0.0,0.0,298.11,298.11,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 base-dhw-jacket-electric.xml,1831.0,144.0,1291.36,0.0,1435.36,144.0,251.64,395.64,0.0,0.0,0.0,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,1671.05,144.0,978.94,0.0,1122.94,144.0,404.11,548.11,0.0,0.0,0.0,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,1661.77,144.0,1077.42,0.0,1221.42,144.0,296.35,440.35,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
@@ -121,15 +130,6 @@ base-dhw-tank-model-type-stratified-detailed-occupancy-stochastic.xml,1822.92,14
 base-dhw-tank-model-type-stratified.xml,1827.03,144.0,1285.92,0.0,1429.92,144.0,253.11,397.11,0.0,0.0,0.0,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-tank-oil.xml,1951.29,144.0,980.72,0.0,1124.72,144.0,251.16,395.16,0.0,431.41,431.41,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-tank-wood.xml,1694.09,144.0,980.72,0.0,1124.72,144.0,251.16,395.16,0.0,0.0,0.0,0.0,0.0,0.0,0.0,174.21,174.21,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-base-dhw-tankless-detailed-setpoints.xml,1631.88,144.0,973.19,0.0,1117.19,144.0,370.69,514.69,0.0,0.0,0.0,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-tankless-electric-outside.xml,1852.37,144.0,1310.57,0.0,1454.57,144.0,253.8,397.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,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-base-dhw-tankless-electric-uef.xml,1848.56,144.0,1306.76,0.0,1450.76,144.0,253.8,397.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,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-base-dhw-tankless-electric.xml,1852.37,144.0,1310.57,0.0,1454.57,144.0,253.8,397.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,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-base-dhw-tankless-gas-uef.xml,1616.08,144.0,973.19,0.0,1117.19,144.0,354.89,498.89,0.0,0.0,0.0,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-tankless-gas-with-solar-fraction.xml,1555.99,144.0,973.19,0.0,1117.19,144.0,294.8,438.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,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-base-dhw-tankless-gas-with-solar.xml,1542.7,144.0,988.7,0.0,1132.7,144.0,266.0,410.0,0.0,0.0,0.0,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-tankless-gas.xml,1632.13,144.0,973.19,0.0,1117.19,144.0,370.94,514.94,0.0,0.0,0.0,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-tankless-propane.xml,1813.1,144.0,973.19,0.0,1117.19,144.0,253.8,397.8,0.0,0.0,0.0,0.0,298.11,298.11,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 base-enclosure-2stories-garage.xml,2044.9,144.0,1483.74,0.0,1627.74,144.0,273.16,417.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-enclosure-2stories-infil-leakiness-description.xml,2156.35,144.0,1606.57,0.0,1750.57,144.0,261.78,405.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-enclosure-2stories.xml,2217.93,144.0,1605.64,0.0,1749.64,144.0,324.29,468.29,0.0,0.0,0.0,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 ba35da4c6c..1c70310036 100644
--- a/workflow/tests/base_results/results_simulations_energy.csv
+++ b/workflow/tests/base_results/results_simulations_energy.csv
@@ -73,7 +73,7 @@ base-dhw-combi-tankless.xml,52.271,52.271,21.366,21.366,30.904,0.0,0.0,0.0,0.0,0
 base-dhw-desuperheater-2-speed.xml,31.554,31.554,31.554,31.554,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,3.168,0.581,6.839,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,1.901,0.0,0.0,0.319,0.365,1.513,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-gshp.xml,38.272,38.272,38.272,38.272,0.0,0.0,0.0,0.0,0.0,0.0,5.965,0.921,0.0,0.0,2.959,0.675,6.614,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.071,0.0,0.0,0.319,0.365,1.513,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-hpwh.xml,58.014,58.014,29.728,29.728,28.286,0.0,0.0,0.0,0.0,0.0,0.0,0.702,0.0,0.0,4.506,0.683,2.707,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.064,0.0,0.0,0.319,0.365,1.513,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,28.286,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-tankless.xml,33.207,33.207,33.207,33.207,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,4.479,0.939,6.826,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,1.896,0.0,0.0,0.319,0.365,1.513,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-instantaneous.xml,33.207,33.207,33.207,33.207,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,4.479,0.939,6.826,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,1.896,0.0,0.0,0.319,0.365,1.513,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-var-speed.xml,30.833,30.833,30.833,30.833,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,2.817,0.246,6.803,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,1.901,0.0,0.0,0.319,0.365,1.513,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,33.24,33.24,33.24,33.24,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,4.534,0.954,6.786,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,1.901,0.0,0.0,0.319,0.365,1.513,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,57.346,57.346,33.53,33.53,23.816,0.0,0.0,0.0,0.0,0.0,0.0,0.591,0.0,0.0,4.398,0.662,6.742,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.072,0.0,0.0,0.319,0.365,1.513,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,23.816,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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,6 +83,15 @@ base-dhw-indirect-outside.xml,56.591,56.591,21.366,21.366,35.225,0.0,0.0,0.0,0.0
 base-dhw-indirect-standbyloss.xml,54.205,54.205,21.362,21.362,32.843,0.0,0.0,0.0,0.0,0.0,0.0,0.143,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.154,0.0,0.0,0.319,0.365,1.513,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,18.938,0.0,13.905,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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,46.168,46.168,21.365,21.365,24.803,0.0,0.0,0.0,0.0,0.0,0.0,0.152,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.147,0.0,0.0,0.319,0.365,1.513,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.125,0.0,4.679,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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,53.966,53.966,21.363,21.363,32.604,0.0,0.0,0.0,0.0,0.0,0.0,0.145,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.152,0.0,0.0,0.319,0.365,1.513,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,19.2,0.0,13.403,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-instantaneous-detailed-setpoints.xml,62.148,62.148,26.736,26.736,35.412,0.0,0.0,0.0,0.0,0.0,0.0,0.602,0.0,0.0,4.347,0.652,0.0,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.071,0.0,0.0,0.319,0.365,1.513,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,24.245,0.0,11.166,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-instantaneous-electric-outside.xml,60.251,60.251,36.005,36.005,24.245,0.0,0.0,0.0,0.0,0.0,0.0,0.602,0.0,0.0,4.347,0.652,9.269,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.071,0.0,0.0,0.319,0.365,1.513,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,24.245,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-instantaneous-electric-uef.xml,60.146,60.146,35.901,35.901,24.245,0.0,0.0,0.0,0.0,0.0,0.0,0.602,0.0,0.0,4.347,0.652,9.164,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.071,0.0,0.0,0.319,0.365,1.513,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,24.245,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-instantaneous-electric.xml,60.251,60.251,36.005,36.005,24.245,0.0,0.0,0.0,0.0,0.0,0.0,0.602,0.0,0.0,4.347,0.652,9.269,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.071,0.0,0.0,0.319,0.365,1.513,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,24.245,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-instantaneous-gas-uef.xml,60.639,60.639,26.736,26.736,33.902,0.0,0.0,0.0,0.0,0.0,0.0,0.602,0.0,0.0,4.347,0.652,0.0,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.071,0.0,0.0,0.319,0.365,1.513,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,24.245,0.0,9.657,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-instantaneous-gas-with-solar-fraction.xml,54.898,54.898,26.736,26.736,28.162,0.0,0.0,0.0,0.0,0.0,0.0,0.602,0.0,0.0,4.347,0.652,0.0,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.071,0.0,0.0,0.319,0.365,1.513,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,24.245,0.0,3.917,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-instantaneous-gas-with-solar.xml,52.573,52.573,27.162,27.162,25.41,0.0,0.0,0.0,0.0,0.0,0.0,0.592,0.0,0.0,4.456,0.673,0.0,0.0,0.304,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.072,0.0,0.0,0.319,0.365,1.513,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,23.86,0.0,1.551,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-instantaneous-gas.xml,62.172,62.172,26.736,26.736,35.436,0.0,0.0,0.0,0.0,0.0,0.0,0.602,0.0,0.0,4.347,0.652,0.0,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.071,0.0,0.0,0.319,0.365,1.513,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,24.245,0.0,11.19,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-instantaneous-propane.xml,62.172,62.172,26.736,26.736,24.245,0.0,11.19,0.0,0.0,0.0,0.0,0.602,0.0,0.0,4.347,0.652,0.0,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.071,0.0,0.0,0.319,0.365,1.513,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,24.245,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,11.19,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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,59.517,59.517,35.478,35.478,24.039,0.0,0.0,0.0,0.0,0.0,0.0,0.596,0.0,0.0,4.371,0.657,8.716,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.071,0.0,0.0,0.319,0.365,1.513,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,24.039,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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,65.499,65.499,26.894,26.894,38.605,0.0,0.0,0.0,0.0,0.0,0.0,0.605,0.0,0.0,4.475,0.676,0.0,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.072,0.0,0.0,0.319,0.365,1.513,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,24.404,0.0,14.2,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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,57.91,57.91,29.6,29.6,28.31,0.0,0.0,0.0,0.0,0.0,0.0,0.702,0.0,0.0,3.922,0.572,3.274,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.063,0.0,0.0,0.319,0.365,1.513,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,28.31,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
@@ -121,15 +130,6 @@ base-dhw-tank-model-type-stratified-detailed-occupancy-stochastic.xml,58.892,58.
 base-dhw-tank-model-type-stratified.xml,59.508,59.508,35.328,35.328,24.18,0.0,0.0,0.0,0.0,0.0,0.0,0.6,0.0,0.0,4.355,0.654,8.584,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.071,0.0,0.0,0.319,0.365,1.513,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,24.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,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-tank-oil.xml,66.219,66.219,26.943,26.943,23.994,15.282,0.0,0.0,0.0,0.0,0.0,0.595,0.0,0.0,4.524,0.686,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.319,0.365,1.513,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,23.994,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,15.282,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-tank-wood.xml,66.219,66.219,26.943,26.943,23.994,0.0,0.0,15.282,0.0,0.0,0.0,0.595,0.0,0.0,4.524,0.686,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.319,0.365,1.513,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,23.994,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,15.282,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-tankless-detailed-setpoints.xml,62.148,62.148,26.736,26.736,35.412,0.0,0.0,0.0,0.0,0.0,0.0,0.602,0.0,0.0,4.347,0.652,0.0,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.071,0.0,0.0,0.319,0.365,1.513,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,24.245,0.0,11.166,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-tankless-electric-outside.xml,60.251,60.251,36.005,36.005,24.245,0.0,0.0,0.0,0.0,0.0,0.0,0.602,0.0,0.0,4.347,0.652,9.269,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.071,0.0,0.0,0.319,0.365,1.513,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,24.245,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-tankless-electric-uef.xml,60.146,60.146,35.901,35.901,24.245,0.0,0.0,0.0,0.0,0.0,0.0,0.602,0.0,0.0,4.347,0.652,9.164,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.071,0.0,0.0,0.319,0.365,1.513,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,24.245,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-tankless-electric.xml,60.251,60.251,36.005,36.005,24.245,0.0,0.0,0.0,0.0,0.0,0.0,0.602,0.0,0.0,4.347,0.652,9.269,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.071,0.0,0.0,0.319,0.365,1.513,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,24.245,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-tankless-gas-uef.xml,60.639,60.639,26.736,26.736,33.902,0.0,0.0,0.0,0.0,0.0,0.0,0.602,0.0,0.0,4.347,0.652,0.0,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.071,0.0,0.0,0.319,0.365,1.513,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,24.245,0.0,9.657,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-tankless-gas-with-solar-fraction.xml,54.898,54.898,26.736,26.736,28.162,0.0,0.0,0.0,0.0,0.0,0.0,0.602,0.0,0.0,4.347,0.652,0.0,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.071,0.0,0.0,0.319,0.365,1.513,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,24.245,0.0,3.917,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-tankless-gas-with-solar.xml,52.573,52.573,27.162,27.162,25.41,0.0,0.0,0.0,0.0,0.0,0.0,0.592,0.0,0.0,4.456,0.673,0.0,0.0,0.304,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.072,0.0,0.0,0.319,0.365,1.513,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,23.86,0.0,1.551,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-tankless-gas.xml,62.172,62.172,26.736,26.736,35.436,0.0,0.0,0.0,0.0,0.0,0.0,0.602,0.0,0.0,4.347,0.652,0.0,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.071,0.0,0.0,0.319,0.365,1.513,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,24.245,0.0,11.19,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-tankless-propane.xml,62.172,62.172,26.736,26.736,24.245,0.0,11.19,0.0,0.0,0.0,0.0,0.602,0.0,0.0,4.347,0.652,0.0,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.071,0.0,0.0,0.319,0.365,1.513,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,24.245,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,11.19,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-enclosure-2stories-garage.xml,66.857,66.857,40.763,40.763,26.094,0.0,0.0,0.0,0.0,0.0,0.0,0.51,0.0,0.0,6.457,1.026,8.972,0.0,0.0,5.266,0.142,0.373,0.0,0.0,0.0,0.0,2.084,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,10.091,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,26.094,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-enclosure-2stories-infil-leakiness-description.xml,69.145,69.145,44.137,44.137,25.008,0.0,0.0,0.0,0.0,0.0,0.0,0.489,0.0,0.0,6.465,1.03,8.856,0.0,0.0,6.369,0.0,0.43,0.0,0.0,0.0,0.0,2.083,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,12.575,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,25.008,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-enclosure-2stories.xml,75.091,75.091,44.112,44.112,30.979,0.0,0.0,0.0,0.0,0.0,0.0,0.606,0.0,0.0,6.35,1.007,8.858,0.0,0.0,6.369,0.0,0.43,0.0,0.0,0.0,0.0,2.077,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,12.575,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,30.979,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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_hvac.csv b/workflow/tests/base_results/results_simulations_hvac.csv
index 0cf2dec354..e8b054de71 100644
--- a/workflow/tests/base_results/results_simulations_hvac.csv
+++ b/workflow/tests/base_results/results_simulations_hvac.csv
@@ -73,7 +73,7 @@ base-dhw-combi-tankless.xml,6.8,91.76,36000.0,0.0,0.0,23530.0,0.0,7508.0,0.0,575
 base-dhw-desuperheater-2-speed.xml,6.8,91.76,0.0,24000.0,0.0,23530.0,0.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
 base-dhw-desuperheater-gshp.xml,6.8,91.76,36000.0,36000.0,0.0,31131.0,7600.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
 base-dhw-desuperheater-hpwh.xml,6.8,91.76,36000.0,24000.0,0.0,32239.0,8709.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
-base-dhw-desuperheater-tankless.xml,6.8,91.76,0.0,24000.0,0.0,23530.0,0.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
+base-dhw-desuperheater-instantaneous.xml,6.8,91.76,0.0,24000.0,0.0,23530.0,0.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
 base-dhw-desuperheater-var-speed.xml,6.8,91.76,0.0,24000.0,0.0,23530.0,0.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
 base-dhw-desuperheater.xml,6.8,91.76,0.0,24000.0,0.0,23530.0,0.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
 base-dhw-dwhr.xml,6.8,91.76,36000.0,24000.0,0.0,32239.0,8709.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
@@ -83,6 +83,15 @@ base-dhw-indirect-outside.xml,6.8,91.76,36000.0,0.0,0.0,23530.0,0.0,7508.0,0.0,5
 base-dhw-indirect-standbyloss.xml,6.8,91.76,36000.0,0.0,0.0,23530.0,0.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,13927.0,0.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
 base-dhw-indirect-with-solar-fraction.xml,6.8,91.76,36000.0,0.0,0.0,23530.0,0.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,13927.0,0.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
 base-dhw-indirect.xml,6.8,91.76,36000.0,0.0,0.0,23530.0,0.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,13927.0,0.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
+base-dhw-instantaneous-detailed-setpoints.xml,6.8,91.76,36000.0,24000.0,0.0,32239.0,8709.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
+base-dhw-instantaneous-electric-outside.xml,6.8,91.76,36000.0,24000.0,0.0,32239.0,8709.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
+base-dhw-instantaneous-electric-uef.xml,6.8,91.76,36000.0,24000.0,0.0,32239.0,8709.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
+base-dhw-instantaneous-electric.xml,6.8,91.76,36000.0,24000.0,0.0,32239.0,8709.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
+base-dhw-instantaneous-gas-uef.xml,6.8,91.76,36000.0,24000.0,0.0,32239.0,8709.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
+base-dhw-instantaneous-gas-with-solar-fraction.xml,6.8,91.76,36000.0,24000.0,0.0,32239.0,8709.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
+base-dhw-instantaneous-gas-with-solar.xml,6.8,91.76,36000.0,24000.0,0.0,32239.0,8709.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
+base-dhw-instantaneous-gas.xml,6.8,91.76,36000.0,24000.0,0.0,32239.0,8709.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
+base-dhw-instantaneous-propane.xml,6.8,91.76,36000.0,24000.0,0.0,32239.0,8709.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
 base-dhw-jacket-electric.xml,6.8,91.76,36000.0,24000.0,0.0,32239.0,8709.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
 base-dhw-jacket-gas.xml,6.8,91.76,36000.0,24000.0,0.0,32239.0,8709.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
 base-dhw-jacket-hpwh.xml,6.8,91.76,36000.0,24000.0,0.0,32239.0,8709.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
@@ -121,15 +130,6 @@ base-dhw-tank-model-type-stratified-detailed-occupancy-stochastic.xml,6.8,91.76,
 base-dhw-tank-model-type-stratified.xml,6.8,91.76,36000.0,24000.0,0.0,32239.0,8709.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
 base-dhw-tank-oil.xml,6.8,91.76,36000.0,24000.0,0.0,32239.0,8709.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
 base-dhw-tank-wood.xml,6.8,91.76,36000.0,24000.0,0.0,32239.0,8709.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
-base-dhw-tankless-detailed-setpoints.xml,6.8,91.76,36000.0,24000.0,0.0,32239.0,8709.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
-base-dhw-tankless-electric-outside.xml,6.8,91.76,36000.0,24000.0,0.0,32239.0,8709.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
-base-dhw-tankless-electric-uef.xml,6.8,91.76,36000.0,24000.0,0.0,32239.0,8709.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
-base-dhw-tankless-electric.xml,6.8,91.76,36000.0,24000.0,0.0,32239.0,8709.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
-base-dhw-tankless-gas-uef.xml,6.8,91.76,36000.0,24000.0,0.0,32239.0,8709.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
-base-dhw-tankless-gas-with-solar-fraction.xml,6.8,91.76,36000.0,24000.0,0.0,32239.0,8709.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
-base-dhw-tankless-gas-with-solar.xml,6.8,91.76,36000.0,24000.0,0.0,32239.0,8709.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
-base-dhw-tankless-gas.xml,6.8,91.76,36000.0,24000.0,0.0,32239.0,8709.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
-base-dhw-tankless-propane.xml,6.8,91.76,36000.0,24000.0,0.0,32239.0,8709.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
 base-enclosure-2stories-garage.xml,6.8,91.76,48000.0,36000.0,0.0,44005.0,7753.0,15016.0,0.0,575.0,9476.0,0.0,592.0,1223.0,2171.0,7199.0,0.0,0.0,27026.0,5061.0,14074.0,0.0,207.0,918.0,0.0,181.0,0.0,2293.0,972.0,0.0,3320.0,0.0,0.0,-233.0,0.0,-1033.0,0.0,800.0
 base-enclosure-2stories-infil-leakiness-description.xml,6.8,91.76,48000.0,36000.0,0.0,39396.0,7789.0,15016.0,0.0,575.0,9226.0,0.0,0.0,1738.0,2171.0,2881.0,0.0,0.0,26238.0,5190.0,14074.0,0.0,207.0,742.0,0.0,0.0,0.0,2293.0,411.0,0.0,3320.0,0.0,0.0,363.0,0.0,-437.0,0.0,800.0
 base-enclosure-2stories.xml,6.8,91.76,48000.0,36000.0,0.0,45791.0,7774.0,15016.0,0.0,575.0,9545.0,0.0,0.0,1738.0,2171.0,8971.0,0.0,0.0,26936.0,5047.0,14074.0,0.0,207.0,783.0,0.0,0.0,0.0,2293.0,1212.0,0.0,3320.0,0.0,0.0,-487.0,0.0,-1287.0,0.0,800.0
diff --git a/workflow/tests/base_results/results_simulations_loads.csv b/workflow/tests/base_results/results_simulations_loads.csv
index 91a83e765a..1e5f9c6282 100644
--- a/workflow/tests/base_results/results_simulations_loads.csv
+++ b/workflow/tests/base_results/results_simulations_loads.csv
@@ -73,7 +73,7 @@ base-dhw-combi-tankless.xml,17.43,0.0,0.0,9.173,0.0,0.0,0.0,0.0,4.078,3.855,0.54
 base-dhw-desuperheater-2-speed.xml,0.0,0.0,14.46,9.07,0.666,2.801,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.054,-0.145,-0.008,2.769,0.048,-0.499,10.57,0.0,0.0,0.0,-6.334,-0.132,-0.793,-3.787,-0.108,0.0,3.598,7.54,1.801
 base-dhw-desuperheater-gshp.xml,21.647,0.0,13.539,9.07,0.614,2.833,0.0,0.0,3.878,3.884,0.546,7.565,0.683,10.77,-13.602,0.0,0.0,0.0,8.365,-0.118,5.233,0.0,0.77,0.0,4.148,-8.163,-2.669,0.0,0.061,-0.184,-0.013,2.832,0.036,-0.613,10.811,0.0,0.0,0.0,-6.125,-0.114,-0.849,-3.911,-0.115,0.0,2.311,7.701,1.838
 base-dhw-desuperheater-hpwh.xml,26.724,0.0,14.224,9.088,1.792,2.917,0.0,0.0,3.829,3.932,0.552,7.521,0.689,10.897,-14.007,0.0,0.0,0.0,8.398,-0.127,5.354,0.0,0.781,0.0,6.196,-4.927,-2.747,0.0,0.129,-0.091,-0.001,2.936,0.054,-0.347,10.406,0.0,0.0,0.0,-5.911,-0.123,-0.734,-3.689,-0.094,0.0,3.182,6.859,1.76
-base-dhw-desuperheater-tankless.xml,0.0,0.0,13.89,9.076,0.0,2.831,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.083,-0.133,-0.007,2.776,0.05,-0.463,10.508,0.0,0.0,0.0,-6.293,-0.135,-0.781,-3.747,-0.106,0.0,3.187,7.276,1.791
+base-dhw-desuperheater-instantaneous.xml,0.0,0.0,13.89,9.076,0.0,2.831,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.083,-0.133,-0.007,2.776,0.05,-0.463,10.508,0.0,0.0,0.0,-6.293,-0.135,-0.781,-3.747,-0.106,0.0,3.187,7.276,1.791
 base-dhw-desuperheater-var-speed.xml,0.0,0.0,15.432,9.069,0.666,2.854,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.02,-0.144,-0.008,2.769,0.048,-0.499,10.57,0.0,0.0,0.0,-6.334,-0.132,-0.797,-3.795,-0.108,0.0,4.605,7.555,1.801
 base-dhw-desuperheater.xml,0.0,0.0,14.111,9.07,0.666,2.88,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.068,-0.145,-0.008,2.768,0.048,-0.5,10.57,0.0,0.0,0.0,-6.335,-0.132,-0.797,-3.789,-0.108,0.0,3.226,7.563,1.801
 base-dhw-dwhr.xml,22.503,0.0,13.745,6.631,0.615,0.0,0.0,0.0,3.819,3.882,0.545,7.57,0.682,10.76,-13.574,0.0,0.0,0.0,8.363,-0.116,5.259,0.0,0.77,0.0,5.323,-8.475,-2.662,0.0,0.029,-0.188,-0.014,2.827,0.035,-0.632,10.839,0.0,0.0,0.0,-6.138,-0.112,-0.847,-3.884,-0.117,0.0,3.113,7.106,1.845
@@ -83,6 +83,15 @@ base-dhw-indirect-outside.xml,17.43,0.0,0.0,9.101,3.299,0.0,0.0,0.0,4.078,3.855,
 base-dhw-indirect-standbyloss.xml,15.979,0.0,0.0,9.1,2.703,0.0,0.0,0.0,4.041,3.822,0.537,7.581,0.671,10.601,-13.336,0.0,0.0,0.0,8.239,-0.096,5.02,0.0,0.761,0.0,0.0,-9.583,-2.619,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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.004,0.0,0.0,9.076,0.787,0.0,5.9,0.0,4.069,3.847,0.541,7.543,0.675,10.655,-13.443,0.0,0.0,0.0,8.203,-0.104,5.042,0.0,0.765,0.0,0.0,-8.503,-2.638,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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.205,0.0,0.0,9.098,2.278,0.0,0.0,0.0,4.046,3.827,0.538,7.571,0.672,10.613,-13.349,0.0,0.0,0.0,8.224,-0.099,5.024,0.0,0.762,0.0,0.0,-9.342,-2.624,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,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-instantaneous-detailed-setpoints.xml,22.909,0.0,13.535,9.052,0.0,0.0,0.0,0.0,3.816,3.885,0.546,7.568,0.683,10.77,-13.61,0.0,0.0,0.0,8.371,-0.116,5.266,0.0,0.77,0.0,5.409,-8.135,-2.67,0.0,0.038,-0.18,-0.013,2.843,0.037,-0.604,10.803,0.0,0.0,0.0,-6.108,-0.113,-0.836,-3.842,-0.115,0.0,3.076,6.83,1.837
+base-dhw-instantaneous-electric-outside.xml,22.909,0.0,13.535,9.071,0.0,0.0,0.0,0.0,3.816,3.885,0.546,7.568,0.683,10.77,-13.61,0.0,0.0,0.0,8.371,-0.116,5.266,0.0,0.77,0.0,5.409,-8.135,-2.67,0.0,0.038,-0.18,-0.013,2.843,0.037,-0.604,10.803,0.0,0.0,0.0,-6.108,-0.113,-0.836,-3.842,-0.115,0.0,3.076,6.83,1.837
+base-dhw-instantaneous-electric-uef.xml,22.909,0.0,13.535,9.071,0.0,0.0,0.0,0.0,3.816,3.885,0.546,7.568,0.683,10.77,-13.61,0.0,0.0,0.0,8.371,-0.116,5.266,0.0,0.77,0.0,5.409,-8.135,-2.67,0.0,0.038,-0.18,-0.013,2.843,0.037,-0.604,10.803,0.0,0.0,0.0,-6.108,-0.113,-0.836,-3.842,-0.115,0.0,3.076,6.83,1.837
+base-dhw-instantaneous-electric.xml,22.909,0.0,13.535,9.071,0.0,0.0,0.0,0.0,3.816,3.885,0.546,7.568,0.683,10.77,-13.61,0.0,0.0,0.0,8.371,-0.116,5.266,0.0,0.77,0.0,5.409,-8.135,-2.67,0.0,0.038,-0.18,-0.013,2.843,0.037,-0.604,10.803,0.0,0.0,0.0,-6.108,-0.113,-0.836,-3.842,-0.115,0.0,3.076,6.83,1.837
+base-dhw-instantaneous-gas-uef.xml,22.909,0.0,13.535,9.071,0.0,0.0,0.0,0.0,3.816,3.885,0.546,7.568,0.683,10.77,-13.61,0.0,0.0,0.0,8.371,-0.116,5.266,0.0,0.77,0.0,5.409,-8.135,-2.67,0.0,0.038,-0.18,-0.013,2.843,0.037,-0.604,10.803,0.0,0.0,0.0,-6.108,-0.113,-0.836,-3.842,-0.115,0.0,3.076,6.83,1.837
+base-dhw-instantaneous-gas-with-solar-fraction.xml,22.909,0.0,13.535,9.071,0.0,0.0,5.896,0.0,3.816,3.885,0.546,7.568,0.683,10.77,-13.61,0.0,0.0,0.0,8.371,-0.116,5.266,0.0,0.77,0.0,5.409,-8.135,-2.67,0.0,0.038,-0.18,-0.013,2.843,0.037,-0.604,10.803,0.0,0.0,0.0,-6.108,-0.113,-0.836,-3.842,-0.115,0.0,3.076,6.83,1.837
+base-dhw-instantaneous-gas-with-solar.xml,22.544,0.0,13.98,9.262,0.0,0.0,8.0,0.0,3.817,3.881,0.545,7.573,0.682,10.759,-13.559,0.0,0.0,0.0,8.357,-0.115,5.258,0.0,0.77,0.0,5.332,-8.45,-2.661,0.0,0.022,-0.192,-0.015,2.82,0.034,-0.644,10.854,0.0,0.0,0.0,-6.159,-0.111,-0.852,-3.913,-0.117,0.0,3.158,7.364,1.846
+base-dhw-instantaneous-gas.xml,22.909,0.0,13.535,9.071,0.0,0.0,0.0,0.0,3.816,3.885,0.546,7.568,0.683,10.77,-13.61,0.0,0.0,0.0,8.371,-0.116,5.266,0.0,0.77,0.0,5.409,-8.135,-2.67,0.0,0.038,-0.18,-0.013,2.843,0.037,-0.604,10.803,0.0,0.0,0.0,-6.108,-0.113,-0.836,-3.842,-0.115,0.0,3.076,6.83,1.837
+base-dhw-instantaneous-propane.xml,22.909,0.0,13.535,9.071,0.0,0.0,0.0,0.0,3.816,3.885,0.546,7.568,0.683,10.77,-13.61,0.0,0.0,0.0,8.371,-0.116,5.266,0.0,0.77,0.0,5.409,-8.135,-2.67,0.0,0.038,-0.18,-0.013,2.843,0.037,-0.604,10.803,0.0,0.0,0.0,-6.108,-0.113,-0.836,-3.842,-0.115,0.0,3.076,6.83,1.837
 base-dhw-jacket-electric.xml,22.713,0.0,13.636,9.071,0.296,0.0,0.0,0.0,3.82,3.885,0.546,7.568,0.683,10.772,-13.598,0.0,0.0,0.0,8.37,-0.118,5.265,0.0,0.771,0.0,5.368,-8.305,-2.668,0.0,0.036,-0.182,-0.013,2.834,0.037,-0.611,10.815,0.0,0.0,0.0,-6.121,-0.114,-0.839,-3.863,-0.115,0.0,3.094,6.956,1.839
 base-dhw-jacket-gas.xml,23.058,0.0,14.047,9.071,2.73,0.0,0.0,0.0,3.82,3.89,0.546,7.572,0.684,10.777,-13.588,0.0,0.0,0.0,8.348,-0.113,6.393,0.0,0.771,0.0,5.448,-9.178,-2.669,0.0,0.032,-0.182,-0.013,2.826,0.036,-0.619,10.825,0.0,0.0,0.0,-6.16,-0.109,-1.053,-3.894,-0.115,0.0,3.176,7.569,1.838
 base-dhw-jacket-hpwh.xml,26.748,0.0,11.906,9.135,1.281,0.0,0.0,0.0,3.85,3.947,0.553,7.505,0.691,10.903,-14.096,0.0,0.0,0.0,8.438,-0.119,5.362,0.0,0.783,0.0,6.199,-4.89,-2.753,0.0,0.175,-0.069,0.002,2.94,0.058,-0.318,10.318,0.0,0.0,0.0,-5.838,-0.115,-0.718,-3.54,-0.091,0.0,2.772,4.713,1.754
@@ -121,15 +130,6 @@ base-dhw-tank-model-type-stratified-detailed-occupancy-stochastic.xml,22.176,0.0
 base-dhw-tank-model-type-stratified.xml,22.847,0.0,13.568,9.12,0.094,0.0,0.0,0.0,3.818,3.885,0.546,7.567,0.683,10.773,-13.606,0.0,0.0,0.0,8.367,-0.118,5.267,0.0,0.771,0.0,5.396,-8.189,-2.669,0.0,0.038,-0.18,-0.013,2.839,0.037,-0.604,10.808,0.0,0.0,0.0,-6.116,-0.114,-0.836,-3.849,-0.115,0.0,3.082,6.871,1.838
 base-dhw-tank-oil.xml,22.67,0.0,14.249,9.071,3.629,0.0,0.0,0.0,3.814,3.88,0.545,7.574,0.683,10.763,-13.523,0.0,0.0,0.0,8.331,-0.119,6.38,0.0,0.77,0.0,5.365,-9.486,-2.657,0.0,0.015,-0.197,-0.015,2.811,0.033,-0.651,10.89,0.0,0.0,0.0,-6.197,-0.115,-1.071,-3.933,-0.118,0.0,3.211,7.852,1.85
 base-dhw-tank-wood.xml,22.67,0.0,14.249,9.071,3.629,0.0,0.0,0.0,3.814,3.88,0.545,7.574,0.683,10.763,-13.523,0.0,0.0,0.0,8.331,-0.119,6.38,0.0,0.77,0.0,5.365,-9.486,-2.657,0.0,0.015,-0.197,-0.015,2.811,0.033,-0.651,10.89,0.0,0.0,0.0,-6.197,-0.115,-1.071,-3.933,-0.118,0.0,3.211,7.852,1.85
-base-dhw-tankless-detailed-setpoints.xml,22.909,0.0,13.535,9.052,0.0,0.0,0.0,0.0,3.816,3.885,0.546,7.568,0.683,10.77,-13.61,0.0,0.0,0.0,8.371,-0.116,5.266,0.0,0.77,0.0,5.409,-8.135,-2.67,0.0,0.038,-0.18,-0.013,2.843,0.037,-0.604,10.803,0.0,0.0,0.0,-6.108,-0.113,-0.836,-3.842,-0.115,0.0,3.076,6.83,1.837
-base-dhw-tankless-electric-outside.xml,22.909,0.0,13.535,9.071,0.0,0.0,0.0,0.0,3.816,3.885,0.546,7.568,0.683,10.77,-13.61,0.0,0.0,0.0,8.371,-0.116,5.266,0.0,0.77,0.0,5.409,-8.135,-2.67,0.0,0.038,-0.18,-0.013,2.843,0.037,-0.604,10.803,0.0,0.0,0.0,-6.108,-0.113,-0.836,-3.842,-0.115,0.0,3.076,6.83,1.837
-base-dhw-tankless-electric-uef.xml,22.909,0.0,13.535,9.071,0.0,0.0,0.0,0.0,3.816,3.885,0.546,7.568,0.683,10.77,-13.61,0.0,0.0,0.0,8.371,-0.116,5.266,0.0,0.77,0.0,5.409,-8.135,-2.67,0.0,0.038,-0.18,-0.013,2.843,0.037,-0.604,10.803,0.0,0.0,0.0,-6.108,-0.113,-0.836,-3.842,-0.115,0.0,3.076,6.83,1.837
-base-dhw-tankless-electric.xml,22.909,0.0,13.535,9.071,0.0,0.0,0.0,0.0,3.816,3.885,0.546,7.568,0.683,10.77,-13.61,0.0,0.0,0.0,8.371,-0.116,5.266,0.0,0.77,0.0,5.409,-8.135,-2.67,0.0,0.038,-0.18,-0.013,2.843,0.037,-0.604,10.803,0.0,0.0,0.0,-6.108,-0.113,-0.836,-3.842,-0.115,0.0,3.076,6.83,1.837
-base-dhw-tankless-gas-uef.xml,22.909,0.0,13.535,9.071,0.0,0.0,0.0,0.0,3.816,3.885,0.546,7.568,0.683,10.77,-13.61,0.0,0.0,0.0,8.371,-0.116,5.266,0.0,0.77,0.0,5.409,-8.135,-2.67,0.0,0.038,-0.18,-0.013,2.843,0.037,-0.604,10.803,0.0,0.0,0.0,-6.108,-0.113,-0.836,-3.842,-0.115,0.0,3.076,6.83,1.837
-base-dhw-tankless-gas-with-solar-fraction.xml,22.909,0.0,13.535,9.071,0.0,0.0,5.896,0.0,3.816,3.885,0.546,7.568,0.683,10.77,-13.61,0.0,0.0,0.0,8.371,-0.116,5.266,0.0,0.77,0.0,5.409,-8.135,-2.67,0.0,0.038,-0.18,-0.013,2.843,0.037,-0.604,10.803,0.0,0.0,0.0,-6.108,-0.113,-0.836,-3.842,-0.115,0.0,3.076,6.83,1.837
-base-dhw-tankless-gas-with-solar.xml,22.544,0.0,13.98,9.262,0.0,0.0,8.0,0.0,3.817,3.881,0.545,7.573,0.682,10.759,-13.559,0.0,0.0,0.0,8.357,-0.115,5.258,0.0,0.77,0.0,5.332,-8.45,-2.661,0.0,0.022,-0.192,-0.015,2.82,0.034,-0.644,10.854,0.0,0.0,0.0,-6.159,-0.111,-0.852,-3.913,-0.117,0.0,3.158,7.364,1.846
-base-dhw-tankless-gas.xml,22.909,0.0,13.535,9.071,0.0,0.0,0.0,0.0,3.816,3.885,0.546,7.568,0.683,10.77,-13.61,0.0,0.0,0.0,8.371,-0.116,5.266,0.0,0.77,0.0,5.409,-8.135,-2.67,0.0,0.038,-0.18,-0.013,2.843,0.037,-0.604,10.803,0.0,0.0,0.0,-6.108,-0.113,-0.836,-3.842,-0.115,0.0,3.076,6.83,1.837
-base-dhw-tankless-propane.xml,22.909,0.0,13.535,9.071,0.0,0.0,0.0,0.0,3.816,3.885,0.546,7.568,0.683,10.77,-13.61,0.0,0.0,0.0,8.371,-0.116,5.266,0.0,0.77,0.0,5.409,-8.135,-2.67,0.0,0.038,-0.18,-0.013,2.843,0.037,-0.604,10.803,0.0,0.0,0.0,-6.108,-0.113,-0.836,-3.842,-0.115,0.0,3.076,6.83,1.837
 base-enclosure-2stories-garage.xml,24.503,0.0,21.255,9.049,0.611,0.0,0.0,0.0,4.091,7.657,1.114,4.964,0.78,21.791,-23.603,0.0,0.0,0.83,4.983,-0.987,9.333,0.0,0.767,0.0,3.655,-8.65,-2.876,0.0,-0.094,-0.892,-0.073,1.032,0.079,0.008,24.731,0.0,0.0,-0.161,-6.38,-0.979,-1.589,-7.584,-0.144,0.0,2.885,8.4,2.39
 base-enclosure-2stories-infil-leakiness-description.xml,23.483,0.0,21.307,8.985,0.612,0.0,0.0,0.0,4.059,8.226,0.558,7.396,0.742,21.894,-24.905,0.0,0.0,0.0,7.857,-0.663,6.613,0.0,0.771,0.0,3.661,-9.918,-3.562,0.0,-0.067,-0.691,-0.027,2.133,0.052,-0.698,23.656,0.0,0.0,0.0,-7.651,-0.654,-1.119,-8.212,-0.136,0.0,2.996,9.255,2.806
 base-enclosure-2stories.xml,29.094,0.0,20.796,8.985,0.614,0.0,0.0,0.0,4.092,8.321,1.129,7.441,0.745,22.122,-25.809,0.0,0.0,0.0,7.984,-0.645,11.862,0.0,0.784,0.0,4.285,-10.247,-3.683,0.0,0.036,-0.506,-0.03,2.306,0.067,-0.219,22.757,0.0,0.0,0.0,-7.335,-0.636,-1.765,-7.887,-0.114,0.0,2.814,8.922,2.685
diff --git a/workflow/tests/base_results/results_simulations_misc.csv b/workflow/tests/base_results/results_simulations_misc.csv
index 65f1d410ed..e67a3e1c19 100644
--- a/workflow/tests/base_results/results_simulations_misc.csv
+++ b/workflow/tests/base_results/results_simulations_misc.csv
@@ -73,7 +73,7 @@ base-dhw-combi-tankless.xml,0.0,0.0,1070.0,776.6,8411.2,1930.1,1295.7,1162.9,129
 base-dhw-desuperheater-2-speed.xml,0.0,0.0,1354.7,998.0,11183.5,2566.3,1972.2,2835.0,2835.0,0.0,19.341,0.0
 base-dhw-desuperheater-gshp.xml,0.0,0.0,1354.7,998.0,11183.0,2566.1,3519.1,2365.7,3519.1,22.937,16.708,0.0
 base-dhw-desuperheater-hpwh.xml,0.0,0.0,1354.6,997.9,11091.1,2545.1,1847.6,3240.4,3240.4,26.483,19.348,0.0
-base-dhw-desuperheater-tankless.xml,0.0,0.0,1354.7,998.0,11132.7,2554.6,1833.9,3314.1,3314.1,0.0,18.88,0.0
+base-dhw-desuperheater-instantaneous.xml,0.0,0.0,1354.7,998.0,11132.7,2554.6,1833.9,3314.1,3314.1,0.0,18.88,0.0
 base-dhw-desuperheater-var-speed.xml,0.0,0.0,1354.7,998.0,11185.5,2566.7,1972.4,2618.2,2618.2,0.0,19.141,0.0
 base-dhw-desuperheater.xml,0.0,0.0,1354.7,998.0,11184.1,2566.4,1972.4,3326.4,3326.4,0.0,18.989,0.0
 base-dhw-dwhr.xml,0.0,0.0,1354.7,998.0,10014.1,2297.9,2024.1,3480.6,3480.6,23.708,18.744,0.0
@@ -83,6 +83,15 @@ base-dhw-indirect-outside.xml,0.0,0.0,1066.2,768.7,8830.9,2026.4,1295.7,1162.9,1
 base-dhw-indirect-standbyloss.xml,0.0,0.0,1060.3,765.2,8819.5,2023.8,1294.7,1163.3,1294.7,16.463,0.0,0.0
 base-dhw-indirect-with-solar-fraction.xml,0.0,0.0,390.1,285.6,3157.8,724.6,1295.4,1163.0,1295.4,16.729,0.0,0.0
 base-dhw-indirect.xml,0.0,0.0,1070.2,771.5,8872.7,2036.0,1294.9,1163.3,1294.9,16.535,0.0,0.0
+base-dhw-instantaneous-detailed-setpoints.xml,0.0,0.0,1354.7,998.0,11342.7,2602.8,1426.1,3161.8,3161.8,23.814,18.643,0.0
+base-dhw-instantaneous-electric-outside.xml,0.0,0.0,1354.7,998.0,11169.0,2562.9,1962.5,3557.7,3557.7,23.814,18.643,0.0
+base-dhw-instantaneous-electric-uef.xml,0.0,0.0,1354.7,998.0,11169.0,2562.9,1956.2,3553.2,3553.2,23.814,18.643,0.0
+base-dhw-instantaneous-electric.xml,0.0,0.0,1354.7,998.0,11169.0,2562.9,1962.5,3557.7,3557.7,23.814,18.643,0.0
+base-dhw-instantaneous-gas-uef.xml,0.0,0.0,1354.7,998.0,11169.0,2562.9,1426.1,3161.8,3161.8,23.814,18.643,0.0
+base-dhw-instantaneous-gas-with-solar-fraction.xml,0.0,0.0,474.2,349.3,3909.2,897.0,1426.1,3161.8,3161.8,23.814,18.643,0.0
+base-dhw-instantaneous-gas-with-solar.xml,0.0,0.0,1344.7,989.2,9817.5,2252.8,1425.8,3191.7,3191.7,23.847,18.922,0.0
+base-dhw-instantaneous-gas.xml,0.0,0.0,1354.7,998.0,11169.0,2562.9,1426.1,3161.8,3161.8,23.814,18.643,0.0
+base-dhw-instantaneous-propane.xml,0.0,0.0,1354.7,998.0,11169.0,2562.9,1426.1,3161.8,3161.8,23.814,18.643,0.0
 base-dhw-jacket-electric.xml,0.0,0.0,1354.7,998.0,11171.5,2563.5,2077.4,3480.3,3480.3,23.764,18.692,0.0
 base-dhw-jacket-gas.xml,0.0,0.0,1354.7,998.0,11171.7,2563.6,1429.0,3213.8,3213.8,24.233,19.126,0.0
 base-dhw-jacket-hpwh.xml,0.0,0.0,1354.7,998.0,10683.2,2451.5,1849.6,3635.2,3635.2,24.22,18.777,0.0
@@ -121,15 +130,6 @@ base-dhw-tank-model-type-stratified-detailed-occupancy-stochastic.xml,0.0,0.0,13
 base-dhw-tank-model-type-stratified.xml,0.0,0.0,1354.7,998.0,10775.1,2472.6,1958.7,3512.1,3512.1,23.798,18.659,0.0
 base-dhw-tank-oil.xml,0.0,0.0,1354.7,998.0,11171.8,2563.6,1428.2,3224.1,3224.1,24.125,19.223,0.0
 base-dhw-tank-wood.xml,0.0,0.0,1354.7,998.0,11171.8,2563.6,1428.2,3224.1,3224.1,24.125,19.223,0.0
-base-dhw-tankless-detailed-setpoints.xml,0.0,0.0,1354.7,998.0,11342.7,2602.8,1426.1,3161.8,3161.8,23.814,18.643,0.0
-base-dhw-tankless-electric-outside.xml,0.0,0.0,1354.7,998.0,11169.0,2562.9,1962.5,3557.7,3557.7,23.814,18.643,0.0
-base-dhw-tankless-electric-uef.xml,0.0,0.0,1354.7,998.0,11169.0,2562.9,1956.2,3553.2,3553.2,23.814,18.643,0.0
-base-dhw-tankless-electric.xml,0.0,0.0,1354.7,998.0,11169.0,2562.9,1962.5,3557.7,3557.7,23.814,18.643,0.0
-base-dhw-tankless-gas-uef.xml,0.0,0.0,1354.7,998.0,11169.0,2562.9,1426.1,3161.8,3161.8,23.814,18.643,0.0
-base-dhw-tankless-gas-with-solar-fraction.xml,0.0,0.0,474.2,349.3,3909.2,897.0,1426.1,3161.8,3161.8,23.814,18.643,0.0
-base-dhw-tankless-gas-with-solar.xml,0.0,0.0,1344.7,989.2,9817.5,2252.8,1425.8,3191.7,3191.7,23.847,18.922,0.0
-base-dhw-tankless-gas.xml,0.0,0.0,1354.7,998.0,11169.0,2562.9,1426.1,3161.8,3161.8,23.814,18.643,0.0
-base-dhw-tankless-propane.xml,0.0,0.0,1354.7,998.0,11169.0,2562.9,1426.1,3161.8,3161.8,23.814,18.643,0.0
 base-enclosure-2stories-garage.xml,0.0,0.0,1354.7,998.0,11171.6,2524.9,2244.5,5018.3,5018.3,31.364,28.29,0.0
 base-enclosure-2stories-infil-leakiness-description.xml,0.0,0.0,1354.7,998.0,11171.6,2410.9,2445.2,5147.9,5147.9,30.738,28.042,0.0
 base-enclosure-2stories.xml,0.0,0.0,1354.7,998.0,11171.5,2410.9,2482.4,4873.2,4873.2,34.666,28.474,0.0