Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio…

…-HPXML into one_and_two_speed_hvac # Conflicts: # HPXMLtoOpenStudio/measure.xml # workflow/tests/base_results/results_simulations_bills.csv # workflow/tests/base_results/results_simulations_energy.csv # workflow/tests/base_results/results_simulations_loads.csv # workflow/tests/base_results/results_simulations_misc.csv
NREL · Mar 1, 2025 · 9944a55 · 9944a55
2 parents 99e1de8 + 36950fe
commit 9944a55
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git 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>e522b287-72a8-4bce-9483-f2153cbb4988</version_id>
-  <version_modified>2025-02-27T00:41:37Z</version_modified>
+  <version_id>aeafb84f-a74c-4125-9bf9-4ae4d76e0958</version_id>
+  <version_modified>2025-03-01T00:01:36Z</version_modified>
   <xml_checksum>D8922A73</xml_checksum>
   <class_name>HPXMLtoOpenStudio</class_name>
   <display_name>HPXML to OpenStudio Translator</display_name>
@@ -207,7 +207,7 @@
       <filename>constants.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>FBAECE4C</checksum>
+      <checksum>797B58A9</checksum>
     </file>
     <file>
       <filename>constructions.rb</filename>
@@ -387,7 +387,7 @@
       <filename>hvac.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>EF93CEDE</checksum>
+      <checksum>F2AE7131</checksum>
     </file>
     <file>
       <filename>hvac_sizing.rb</filename>

diff --git a/HPXMLtoOpenStudio/resources/constants.rb b/HPXMLtoOpenStudio/resources/constants.rb
@@ -9,7 +9,6 @@ module Constants
 
   # Object types
   ObjectTypeAirSourceHeatPump = 'air source heat pump'
-  ObjectTypeBackupSuppHeat = 'back up supp heat'
   ObjectTypeBEVDischargeProgram = 'bev discharge program'
   ObjectTypeBattery = 'battery'
   ObjectTypeBatteryLossesAdjustment = 'battery losses adjustment'
@@ -40,6 +39,7 @@ module Constants
   ObjectTypeGroundSourceHeatPump = 'ground source heat pump'
   ObjectTypeGSHPSharedPump = 'gshp shared loop pump'
   ObjectTypeHotWaterRecircPump = 'dhw recirc pump'
+  ObjectTypeHPDefrostSupplHeat = 'hp defrost suppl heat'
   ObjectTypeHVACAvailabilitySensor = 'hvac availability sensor'
   ObjectTypeIdealAirSystem = 'ideal air system'
   ObjectTypeInfiltration = 'infil'

diff --git a/HPXMLtoOpenStudio/resources/hvac.rb b/HPXMLtoOpenStudio/resources/hvac.rb
@@ -5295,11 +5295,11 @@ def self.apply_advanced_defrost(model, htg_coil, air_loop_unitary, conditioned_s
       comp_type_and_control: EPlus::EMSActuatorOtherEquipmentPower
     )
 
-    cnt = model.getOtherEquipments.count { |e| e.endUseSubcategory.start_with? Constants::ObjectTypeBackupSuppHeat } # Ensure unique meter for each heat pump
+    cnt = model.getOtherEquipments.count { |e| e.endUseSubcategory.start_with? Constants::ObjectTypeHPDefrostSupplHeat } # Ensure unique meter for each heat pump
     defrost_supp_heat_energy_oe = Model.add_other_equipment(
       model,
       name: "#{air_loop_unitary.name} defrost supp heat energy",
-      end_use: "#{Constants::ObjectTypeBackupSuppHeat}#{cnt + 1}",
+      end_use: "#{Constants::ObjectTypeHPDefrostSupplHeat}#{cnt + 1}",
       space: conditioned_space,
       design_level: 0,
       frac_radiant: 0,
@@ -5452,7 +5452,7 @@ def self.apply_pan_heater_ems_program(model, htg_coil, air_loop_unitary, conditi
     Model.add_ems_program_calling_manager(
       model,
       name: "#{program.name} calling manager",
-      calling_point: 'BeginTimestepBeforePredictor',
+      calling_point: 'InsideHVACSystemIterationLoop',
       ems_programs: [program]
     )
   end

diff --git a/ReportSimulationOutput/measure.rb b/ReportSimulationOutput/measure.rb
@@ -3087,7 +3087,7 @@ def get_object_outputs_by_key(model, object, class_name)
           Constants::ObjectTypeMiscPermanentSpaHeater => EUT::PermanentSpaHeater,
           Constants::ObjectTypeMechanicalVentilationPreheating => EUT::MechVentPreheat,
           Constants::ObjectTypeMechanicalVentilationPrecooling => EUT::MechVentPrecool,
-          Constants::ObjectTypeBackupSuppHeat => EUT::HeatingHeatPumpBackup,
+          Constants::ObjectTypeHPDefrostSupplHeat => EUT::HeatingHeatPumpBackup,
           Constants::ObjectTypePanHeater => EUT::Heating,
           Constants::ObjectTypeWaterHeaterAdjustment => EUT::HotWater,
           Constants::ObjectTypeBatteryLossesAdjustment => EUT::Battery }.each do |obj_name, eut|

diff --git a/ReportSimulationOutput/measure.xml b/ReportSimulationOutput/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>report_simulation_output</name>
   <uid>df9d170c-c21a-4130-866d-0d46b06073fd</uid>
-  <version_id>27efb08c-430c-4acb-978d-5ecd876d6068</version_id>
-  <version_modified>2025-02-21T02:14:43Z</version_modified>
+  <version_id>95242a2c-ec46-4775-8528-920e82ee6ccf</version_id>
+  <version_modified>2025-02-28T21:31:04Z</version_modified>
   <xml_checksum>9BF1E6AC</xml_checksum>
   <class_name>ReportSimulationOutput</class_name>
   <display_name>HPXML Simulation Output Report</display_name>
@@ -1972,7 +1972,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>C04171B1</checksum>
+      <checksum>CFF4CA57</checksum>
     </file>
     <file>
       <filename>test_report_sim_output.rb</filename>