tbd 3.4.2 → 3.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abfbf89a3f613a331c4bf58b25832bc2d9e8942a4872e73f76d534ee015eae57
-  data.tar.gz: a7c0be9d974075a0f7f1e2b661c5a2e2afffb3793f81b232d14a914bd79acc71
+  metadata.gz: 24c3c1ce27d2513d0f1529795e7016ad07a69e3499d5e79f7164698e1a16dc48
+  data.tar.gz: f23f7f85a54bcc551179ba751e826dc2951520e4ad0e17eaafad8fac01cea9fc
 SHA512:
-  metadata.gz: 2b685fbad6b1964db44f7afeb782cc2a59b7a4e8322ee3b14ec402cc3fc0cbe4e7a6d177cb4dc07deab1c184dd3afd0fe66b4d49f5b985c4296138b24889aa48
-  data.tar.gz: 1f153539250dc61b2da7f5b7badb8bcbe5e6fbdaa8ae316a20bf3b743e57bee27b3cd061b9cbf49cc867db7d9fb867f21f6fcb32252ab60fade7e1e17131ab6e
+  metadata.gz: 02cb220811ddcc388c7ae20d17ffc2cfc0b64322605d5c571c2fbd1e325018ec44c7801b7aa0b0d7f2481ec0f0ebee25061130ccd7814f5badf7cb3b01fce625
+  data.tar.gz: 7cf328dca053b90d53c05f070c36f13a7ac9b9813435276ddaf9c14a4bc24e4d287ed7ffb698a6e3f1e5a71822b0f568bfa48155053620a3297d497a4cac5c21

data/.github/workflows/pull_request.yml

@@ -134,3 +134,19 @@ jobs:
         docker exec -t test bundle update
         docker exec -t test bundle exec rake
         docker kill test
+  test_390x:
+    runs-on: ubuntu-22.04
+    steps:
+    - name: Check out repository
+      uses: actions/checkout@v2
+    - name: Run Tests
+      run: |
+        echo $(pwd)
+        echo $(ls)
+        docker pull nrel/openstudio:3.9.0
+        docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.9.0
+        docker exec -t test pwd
+        docker exec -t test ls
+        docker exec -t test bundle update
+        docker exec -t test bundle exec rake
+        docker kill test

data/Rakefile

@@ -15,7 +15,7 @@ task :libraries do
 
   libs  = ["topolys", "osut", "oslg", "tbd"]
   files = {}
-  
+
   $:.each do |path|
     libs.each do |l|
       next unless path.include?(l)

data/lib/measures/tbd/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>tbd_measure</name>
   <uid>8890787b-8c25-4dc8-8641-b6be1b6c2357</uid>
-  <version_id>3ebf3217-230b-4420-b679-4bdf8cc51519</version_id>
-  <version_modified>2024-05-22T14:33:33Z</version_modified>
+  <version_id>70223737-c3ea-4df0-8506-67083c92fb6e</version_id>
+  <version_modified>2024-11-20T20:02:15Z</version_modified>
   <xml_checksum>99772807</xml_checksum>
   <class_name>TBDMeasure</class_name>
   <display_name>Thermal Bridging and Derating - TBD</display_name>
@@ -499,7 +499,7 @@
       <filename>geo.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>6C7ACC99</checksum>
+      <checksum>9FAC0CDC</checksum>
     </file>
     <file>
       <filename>geometry.rb</filename>
@@ -523,13 +523,13 @@
       <filename>psi.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>5ABDA733</checksum>
+      <checksum>4B7F3586</checksum>
     </file>
     <file>
       <filename>tbd.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>E8D38E59</checksum>
+      <checksum>FCCCAE84</checksum>
     </file>
     <file>
       <filename>transformation.rb</filename>
@@ -541,13 +541,13 @@
       <filename>ua.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>4133AC61</checksum>
+      <checksum>626D3BE0</checksum>
     </file>
     <file>
       <filename>utils.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>E3B4AF4B</checksum>
+      <checksum>CBC3935D</checksum>
     </file>
     <file>
       <filename>version.rb</filename>

data/lib/measures/tbd/resources/geo.rb

@@ -722,15 +722,10 @@ module TBD
       kva = true unless surface.surfacePropertyExposedFoundationPerimeter.empty?
       surface.resetAdjacentFoundation
       surface.resetSurfacePropertyExposedFoundationPerimeter
-      next unless surface.isGroundSurface
       next     if surface.outsideBoundaryCondition.capitalize == boundary
+      next unless surface.outsideBoundaryCondition.capitalize == "Foundation"
 
-      lc = surface.construction.empty? ? nil : surface.construction.get
       surface.setOutsideBoundaryCondition(boundary)
-      next if boundary == "Ground"
-      next if lc.nil?
-
-      surface.setConstruction(lc) if surface.construction.empty?
     end
 
     perimeters = model.getSurfacePropertyExposedFoundationPerimeters
@@ -834,11 +829,16 @@ module TBD
     edges.each do |code1, edge|
       edge[:surfaces].keys.each do |id|
         next unless floors.key?(id)
+
         next unless floors[id][:boundary].downcase == "foundation"
         next     if floors[id].key?(:kiva)
 
-        floors[id][:kiva   ] = :slab # initially slabs-on-grade
-        floors[id][:exposed] = 0.0   # slab-on-grade or walkout perimeter
+        # Initially set as slab-on-grade. Track 'exposed foundation perimeter'.
+        #   - outdoor wall/slab-on-grade edge lengths
+        #   - outdoor wall/basement slab walkout edge lengths
+        #   - basement wall/basement slab edge lengths
+        floors[id][:kiva   ] = :slab
+        floors[id][:exposed] = 0.0
 
         # Loop around current edge.
         edge[:surfaces].keys.each do |i|
@@ -847,8 +847,9 @@ module TBD
           next unless walls[i][:boundary].downcase == "foundation"
           next     if walls[i].key?(:kiva)
 
-          floors[id][:kiva] = :basement
-          walls[i  ][:kiva] = id
+          floors[id][:kiva   ]  = :basement
+          floors[id][:exposed] += edge[:length]
+          walls[i  ][:kiva   ]  = id
         end
 
         # Loop around current edge.
@@ -862,7 +863,7 @@ module TBD
 
         # Loop around other floor edges.
         edges.each do |code2, e|
-          next if code1 == code2 #  skip - same edge
+          next if code1 == code2 # skip - same edge
 
           e[:surfaces].keys.each do |i|
             next unless i == id # good - same floor
@@ -873,8 +874,9 @@ module TBD
               next unless walls[ii][:boundary].downcase == "foundation"
               next     if walls[ii].key?(:kiva)
 
-              floors[id][:kiva] = :basement
-              walls[ii ][:kiva] = id
+              floors[id][:kiva   ]  = :basement
+              walls[ii ][:kiva   ]  = id
+              floors[id][:exposed] += e[:length]
             end
 
             e[:surfaces].keys.each do |ii|
@@ -889,6 +891,7 @@ module TBD
 
         foundation = OpenStudio::Model::FoundationKiva.new(model)
         foundation.setName("KIVA Foundation Floor #{id}")
+
         floor = model.getSurfaceByName(id)
         kiva  = false if floor.empty?
         next          if floor.empty?

data/lib/measures/tbd/resources/psi.rb

@@ -1678,8 +1678,8 @@ module TBD
     # around edge with respect to a reference vector (perpendicular to the
     # edge), +clockwise as one is looking in the opposite position of the edge
     # vector. For instance, a vertical edge has a reference vector pointing
-    # North - surfaces eastward of the edge are (0°,180°], while surfaces
-    # westward of the edge are (180°,360°].
+    # North - surfaces eastward of the edge are (0deg,180deg], while surfaces
+    # westward of the edge are (180deg,360deg].
     #
     # Much of the following code is of a topological nature, and should ideally
     # (or eventually) become available functionality offered by Topolys. Topolys
@@ -1717,54 +1717,31 @@ module TBD
         t_model.wires.each do |wire|
           next unless surface[:wire] == wire.id # should be a unique match
 
-          normal     = tbd[:surfaces][id][:n]   if tbd[:surfaces].key?(id)
-          normal     = holes[id].attributes[:n] if holes.key?(id)
-          normal     = shades[id][:n]           if shades.key?(id)
-          farthest   = Topolys::Point3D.new(origin.x, origin.y, origin.z)
-          farthest_V = farthest - origin # zero magnitude, initially
-          inverted   = false
-          i_origin   = wire.points.index(origin)
-          i_terminal = wire.points.index(terminal)
-          i_last     = wire.points.size - 1
-
-          if i_terminal == 0
-            inverted = true unless i_origin == i_last
-          elsif i_origin == i_last
-            inverted = true unless i_terminal == 0
-          else
-            inverted = true unless i_terminal - i_origin == 1
-          end
+          normal       = tbd[:surfaces][id][:n]   if tbd[:surfaces].key?(id)
+          normal       = holes[id].attributes[:n] if holes.key?(id)
+          normal       = shades[id][:n]           if shades.key?(id)
+          farthest     = Topolys::Point3D.new(origin.x, origin.y, origin.z)
+          farthest_V   = farthest - origin # zero magnitude, initially
+          farthest_mag = 0
 
           wire.points.each do |point|
             next if point == origin
             next if point == terminal
 
-            point_on_plane    = edge_plane.project(point)
-            origin_point_V    = point_on_plane - origin
-            point_V_magnitude = origin_point_V.magnitude
-            next unless point_V_magnitude > TOL
-
-            # Generate a plane between origin, terminal & point. Only consider
-            # planes that share the same normal as wire.
-            if inverted
-              plane = Topolys::Plane3D.from_points(terminal, origin, point)
-            else
-              plane = Topolys::Plane3D.from_points(origin, terminal, point)
-            end
-
-            dnx = (normal.x - plane.normal.x).abs
-            dny = (normal.y - plane.normal.y).abs
-            dnz = (normal.z - plane.normal.z).abs
-            next unless dnx < TOL && dny < TOL && dnz < TOL
+            point_on_plane = edge_plane.project(point)
+            origin_point_V = point_on_plane - origin
+            point_V_mag    = origin_point_V.magnitude
+            next unless point_V_mag > TOL
+            next unless point_V_mag > farthest_mag
 
-            farther    = point_V_magnitude > farthest_V.magnitude
-            farthest   = point          if farther
-            farthest_V = origin_point_V if farther
+            farthest    = point
+            farthest_V  = origin_point_V
+            fathest_mag = point_V_mag
           end
 
           angle  = reference_V.angle(farthest_V)
           angle  = 0 if angle.nil?
-          adjust = false # adjust angle [180°, 360°] if necessary
+          adjust = false # adjust angle [180deg, 360deg] if necessary
 
           if vertical
             adjust = true if east.dot(farthest_V) < -TOL
@@ -2125,7 +2102,7 @@ module TBD
         end
 
         # Label edge as :ceiling if linked to:
-        #   +1 deratable surfaces
+        #   +1 deratable surface(s)
         #   1x underatable CONDITIONED floor linked to an unoccupied space
         #   1x adjacent CONDITIONED ceiling linked to an occupied space
         edge[:surfaces].keys.each do |i|
@@ -2139,9 +2116,9 @@ module TBD
           next      if floors[i][:occupied   ]
 
           ceiling = floors[i][:boundary]
-          next  unless ceilings.key?(ceiling)
-          next  unless ceilings[ceiling][:conditioned]
-          next  unless ceilings[ceiling][:occupied   ]
+          next unless ceilings.key?(ceiling)
+          next unless ceilings[ceiling][:conditioned]
+          next unless ceilings[ceiling][:occupied   ]
 
           other = deratables.first unless deratables.first == id
           other = deratables.last  unless deratables.last  == id

data/lib/measures/tbd/resources/tbd.rb

@@ -40,16 +40,16 @@ require_relative "geo"
 require_relative "ua"
 
 module TBD
-  extend OSut         #                                     OpenStudio utilities
-
-  TOL  = OSut::TOL
-  TOL2 = OSut::TOL2
-  DBG  = OSut::DEBUG  #   mainly to flag invalid arguments for devs (buggy code)
-  INF  = OSut::INFO   #           informs TBD user of measure success or failure
-  WRN  = OSut::WARN   # e.g. WARN users of 'iffy' .osm inputs (yet not critical)
-  ERR  = OSut::ERR    #                            e.g. flag invalid .osm inputs
-  FTL  = OSut::FATAL  #                     e.g. invalid TBD JSON format/entries
-  NS   = "nameString" #                   OpenStudio IdfObject nameString method
+  extend OSut            # OpenStudio utilities
+
+  TOL  = OSut::TOL.dup   # default distance tolerance (m)
+  TOL2 = OSut::TOL2.dup  # default area tolerance (m2)
+  DBG  = OSut::DEBUG.dup # github.com/rd2/oslg
+  INF  = OSut::INFO.dup  # github.com/rd2/oslg
+  WRN  = OSut::WARN.dup  # github.com/rd2/oslg
+  ERR  = OSut::ERR.dup   # github.com/rd2/oslg
+  FTL  = OSut::FATAL.dup # github.com/rd2/oslg
+  NS   = OSut::NS.dup    # OpenStudio IdfObject nameString method
 
   extend TBD
 end

data/lib/measures/tbd/resources/ua.rb

@@ -422,8 +422,8 @@ module TBD
   # @param [Hash] s TBD surfaces (keys: Openstudio surface names)
   # @option s [Bool] :deratable whether surface is deratable, s[][:deratable]
   # @option s [:wall, :ceiling, :floor] :type TBD surface type
-  # @option s [#to_f] :heating applicable heating setpoint temperature in °C
-  # @option s [#to_f] :cooling applicable cooling setpoint temperature in °C
+  # @option s [#to_f] :heating applicable heating setpoint temperature in C
+  # @option s [#to_f] :cooling applicable cooling setpoint temperature in C
   # @option s [Hash] :windows TBD surface-specific windows e.g. s[][:windows]
   # @option s [Hash] :doors TBD surface-specific doors
   # @option s [Hash] :skylights TBD surface-specific skylights
@@ -466,7 +466,7 @@ module TBD
       ref = 1 / 5.46
       ref = 1 / 3.60 if surface[:type] == :wall
 
-      # Adjust for lower heating setpoint (assumes -25°C design conditions).
+      # Adjust for lower heating setpoint (assumes -25C design conditions).
       ref *= 43 / (heating + 25) if heating < 18 && cooling > 40
 
       surface[:ref] = ref
@@ -628,8 +628,8 @@ module TBD
     end
 
     # Set up 2x heating setpoint (HSTP) "blocks" (or bins):
-    #   bloc1: spaces/zones with HSTP >= 18°C
-    #   bloc2: spaces/zones with HSTP < 18°C
+    #   bloc1: spaces/zones with HSTP >= 18C
+    #   bloc2: spaces/zones with HSTP < 18C
     #   (ref: 2021 Quebec energy code 3.3. UA' trade-off methodology)
     #   (... can be extended in the future to cover other standards)
     #
@@ -799,8 +799,8 @@ module TBD
       blc.each do |b|
         bloc    = b1
         bloc    = b2 if b == :b2
-        pro_sum = bloc[:pro].values.reduce(:+)
-        ref_sum = bloc[:ref].values.reduce(:+)
+        pro_sum = bloc[:pro].values.sum
+        ref_sum = bloc[:ref].values.sum
 
         if pro_sum > TOL || ref_sum > TOL
           ratio = nil
@@ -1000,7 +1000,7 @@ module TBD
       model  = "* modèle : #{ua[:file]}"    if ua.key?(:file)  && lang == :fr
       model += " (v#{ua[:version]})"        if ua.key?(:version)
       report << model                   unless model.empty?
-      report << "* TBD : v3.4.2"
+      report << "* TBD : v3.4.4"
       report << "* date : #{ua[:date]}"
 
       if lang == :en