more fix

NREL · Oct 24, 2024 · 774b737 · 774b737
1 parent 4f0e0dd
commit 774b737
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 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>5b258b6c-0bac-4b63-8535-04f8ee2debc2</version_id>
-  <version_modified>2024-10-24T02:53:39Z</version_modified>
+  <version_id>b29223e9-1788-4896-a93f-5cf34514bf06</version_id>
+  <version_modified>2024-10-24T03:21:51Z</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>77A2949D</checksum>
+      <checksum>3FDD009D</checksum>
     </file>
     <file>
       <filename>energyplus.rb</filename>
@@ -345,7 +345,7 @@
       <filename>geometry.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>3CFFBB4C</checksum>
+      <checksum>38FFA79F</checksum>
     </file>
     <file>
       <filename>hotwater_appliances.rb</filename>
@@ -357,7 +357,7 @@
       <filename>hpxml.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>552E74B6</checksum>
+      <checksum>D73BD151</checksum>
     </file>
     <file>
       <filename>hpxml_schema/HPXML.xsd</filename>

diff --git a/HPXMLtoOpenStudio/resources/defaults.rb b/HPXMLtoOpenStudio/resources/defaults.rb
@@ -1240,6 +1240,8 @@ def self.apply_roofs(hpxml_bldg)
   # @return [nil]
   def self.apply_rim_joists(hpxml_bldg)
     hpxml_bldg.rim_joists.each do |rim_joist|
+      next if rim_joist.sameas_id
+
       if rim_joist.azimuth.nil?
         rim_joist.azimuth = get_azimuth_from_orientation(rim_joist.orientation)
         rim_joist.azimuth_isdefaulted = true

diff --git a/HPXMLtoOpenStudio/resources/geometry.rb b/HPXMLtoOpenStudio/resources/geometry.rb
@@ -985,7 +985,6 @@ def self.apply_conditioned_floor_area(model, spaces, hpxml_bldg)
     sum_cfa = 0.0
     hpxml_bldg.floors.each do |floor|
       next unless floor.is_floor
-      # FIXME: If the hpxml Building that represents an unconditioned space (without HVACPlant), does the hpxml_bldg.building_construction.conditioned_floor_area accounts to the total cfa? Is E+ reporting the correct total cfa? (Need to double-check)
       next unless [HPXML::LocationConditionedSpace, HPXML::LocationBasementConditioned].include?(floor.interior_adjacent_to) ||
                   [HPXML::LocationConditionedSpace, HPXML::LocationBasementConditioned].include?(floor.exterior_adjacent_to)
 

diff --git a/HPXMLtoOpenStudio/resources/hpxml.rb b/HPXMLtoOpenStudio/resources/hpxml.rb
@@ -5100,10 +5100,14 @@ def net_area
     #
     # @return [Boolean] True if the surface is a ceiling
     def is_ceiling
-      if @floor_or_ceiling.nil?
-        return HPXML::is_floor_a_ceiling(self, true)
+      if @sameas_id.nil?
+        if @floor_or_ceiling.nil?
+          return HPXML::is_floor_a_ceiling(self, true)
+        else
+          return @floor_or_ceiling == FloorOrCeilingCeiling
+        end
       else
-        return @floor_or_ceiling == FloorOrCeilingCeiling
+        return !sameas.is_ceiling
       end
     end