Bugfix, cleanup.

Author: shorowit

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>05d1c691-8e2f-4b24-ac72-37ed91ce927f</version_id>
-  <version_modified>2024-11-26T18:31:43Z</version_modified>
+  <version_id>292ac47f-8279-4f3c-bf8c-1381bebc8724</version_id>
+  <version_modified>2024-11-26T18:46:54Z</version_modified>
   <xml_checksum>D8922A73</xml_checksum>
   <class_name>HPXMLtoOpenStudio</class_name>
   <display_name>HPXML to OpenStudio Translator</display_name>
@@ -357,7 +357,7 @@
       <filename>hpxml.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>68D7F8FA</checksum>
+      <checksum>490E065F</checksum>
     </file>
     <file>
       <filename>hpxml_schema/HPXML.xsd</filename>

HPXMLtoOpenStudio/resources/hpxml.rb

@@ -665,30 +665,31 @@ def set_unique_hpxml_ids(hpxml_doc, last_building_only = false)
   # @param building_id [String] If provided, only search the single HPXML Building with the given ID
   # @return [Hash] Map of HPXML::FuelTypeXXX => boolean
   def has_fuels(building_id = nil)
-    has_fuels = {}
+    has_fuel = {}
+    has_fuel[HPXML::FuelTypeElectricity] = true
 
     HPXML::fossil_fuels.each do |fuel|
-      has_fuels[fuel] = false
+      has_fuel[fuel] = false
 
       buildings.each do |hpxml_bldg|
-        next if (not building_id.nil? && hpxml_bldg.building_id != building_id)
+        next if (not building_id.nil?) && (hpxml_bldg.building_id != building_id)
 
         # Check HVAC systems
         hpxml_bldg.hvac_systems.each do |hvac_system|
           if hvac_system.respond_to?(:heating_system_fuel) && hvac_system.heating_system_fuel == fuel
-            has_fuels[fuel] = true
+            has_fuel[fuel] = true
           end
           if hvac_system.respond_to?(:cooling_system_fuel) && hvac_system.cooling_system_fuel == fuel
-            has_fuels[fuel] = true
+            has_fuel[fuel] = true
           end
           if hvac_system.respond_to?(:heat_pump_fuel) && hvac_system.heat_pump_fuel == fuel
-            has_fuels[fuel] = true
+            has_fuel[fuel] = true
           end
           if hvac_system.respond_to?(:backup_heating_fuel) && hvac_system.backup_heating_fuel == fuel
-            has_fuels[fuel] = true
+            has_fuel[fuel] = true
           end
           if hvac_system.respond_to?(:integrated_heating_system_fuel) && hvac_system.integrated_heating_system_fuel == fuel
-            has_fuels[fuel] = true
+            has_fuel[fuel] = true
           end
         end
 
@@ -699,24 +700,24 @@ def has_fuels(building_id = nil)
          hpxml_bldg.cooking_ranges +
          hpxml_bldg.fuel_loads).each do |appliance|
           if appliance.fuel_type == fuel
-            has_fuels[fuel] = true
+            has_fuel[fuel] = true
           end
         end
 
         # Check pool/spa heaters
         if fuel == HPXML::FuelTypeNaturalGas
           (hpxml_bldg.pools + hpxml_bldg.permanent_spas).each do |pool_or_spa|
             if pool_or_spa.heater_type == HPXML::HeaterTypeGas
-              has_fuels[fuel] = true
+              has_fuel[fuel] = true
             end
           end
         end
 
-        break if has_fuels[fuel]
+        break if has_fuel[fuel]
       end
     end
 
-    return has_fuels
+    return has_fuel
   end
 
   # Delete any shared HVAC systems that are actually modeled as systems serving multiple dwelling units.
@@ -1767,7 +1768,6 @@ def has_fuel_access
     #
     # @return [Hash] Map of HPXML::FuelTypeXXX => boolean
     def has_fuels()
-      # Returns a hash with whether each fuel exists in the HPXML Building
       return @parent_object.has_fuels(@building_id)
     end
 

ReportUtilityBills/measure.rb

@@ -200,7 +200,6 @@ def energyPlusOutputRequests(runner, user_arguments)
 
     # Check for presence of fuels once
     has_fuel = hpxml.has_fuels()
-    has_fuel[HPXML::FuelTypeElectricity] = true
 
     # Has production
     has_pv = @hpxml_buildings.count { |hpxml_bldg| !hpxml_bldg.pv_systems.empty? } > 0

ReportUtilityBills/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>report_utility_bills</name>
   <uid>ca88a425-e59a-4bc4-af51-c7e7d1e960fe</uid>
-  <version_id>cb110d70-a630-47c6-85be-56fd13ce3603</version_id>
-  <version_modified>2024-11-26T18:31:47Z</version_modified>
+  <version_id>b93dbb48-5955-47f6-a379-b56ac2c3b1d2</version_id>
+  <version_modified>2024-11-26T18:46:57Z</version_modified>
   <xml_checksum>15BF4E57</xml_checksum>
   <class_name>ReportUtilityBills</class_name>
   <display_name>Utility Bills Report</display_name>
@@ -180,7 +180,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>4D969F72</checksum>
+      <checksum>209AE1AD</checksum>
     </file>
     <file>
       <filename>detailed_rates/README.md</filename>