tbd 3.5.1 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 551371a237284715450e716fba2b269ae37d1f54f348311acbf50245c8df0b29
-  data.tar.gz: ea3e0c6489c60e354518c3a38516fb70fda77d9250772e5db2995c32e6bc17c5
+  metadata.gz: cb6b147213a6c055e7b7970c44786b22ba050f0aa2f935079fcd33d1b692a874
+  data.tar.gz: a19bb5aa01a18c44cca0b7048a1cd5dfcbb287d2f746a08363f9951edfc1c585
 SHA512:
-  metadata.gz: 2779d70ffa38269af0eea2cd7cd83bab7223f55b0c22a198fc2b0c612454441bda39eb9ef129c2480109a83060da6a84ee81901fad42c3b19691ef6bb297f1d1
-  data.tar.gz: 7cab12e47384c1aad5b86960a21c042f96b07b8912c910314925e235c817c3e2618c4d3a90155834294c31831943e3c4c3124178afe27c1dc540cb92b77aa825
+  metadata.gz: 962a2c9d02edfd6eae2b0dd81fcd1e4b84e5ab437328c3bde0705942a3697131d7c8136d05d706903574837b4fb5fccf1a54d89773b51f5010ee0ad4e4279f75
+  data.tar.gz: 980abb816039d7acd1ba61a30cc19cef98d5bf131249e4c04084975660ee5b7154ea81af661149119c32f261344f507402c8b492b36c3be9ebdd57fdfc3861ce

data/.github/workflows/pull_request.yml

@@ -70,7 +70,7 @@ jobs:
         docker exec -t test bundle update
         docker exec -t test bundle exec rake
         docker kill test
-  test_380x:
+  test_390x:
     runs-on: ubuntu-22.04
     steps:
     - name: Check out repository
@@ -79,14 +79,14 @@ jobs:
       run: |
         echo $(pwd)
         echo $(ls)
-        docker pull nrel/openstudio:3.8.0
-        docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.8.0
+        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
-  test_390x:
+  test_310x:
     runs-on: ubuntu-22.04
     steps:
     - name: Check out repository
@@ -95,14 +95,14 @@ jobs:
       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 pull nrel/openstudio:3.10.0
+        docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.10.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
-  test_3100x:
+  test_311x:
     runs-on: ubuntu-22.04
     steps:
     - name: Check out repository
@@ -111,8 +111,8 @@ jobs:
       run: |
         echo $(pwd)
         echo $(ls)
-        docker pull nrel/openstudio:3.10.0
-        docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.10.0
+        docker pull nrel/openstudio:3.11.0
+        docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.11.0
         docker exec -t test pwd
         docker exec -t test ls
         docker exec -t test bundle update

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>8649cb7e-2e58-4a6d-ba67-911b6e0a41a6</version_id>
-  <version_modified>2026-01-04T12:08:45Z</version_modified>
+  <version_id>4934dc58-443d-436f-9358-2d221b4de65a</version_id>
+  <version_modified>2026-04-17T10:47:02Z</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>9CA80CEB</checksum>
+      <checksum>AD9546E1</checksum>
     </file>
     <file>
       <filename>geometry.rb</filename>
@@ -523,7 +523,7 @@
       <filename>psi.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>B9FB5E02</checksum>
+      <checksum>9F7B97ED</checksum>
     </file>
     <file>
       <filename>tbd.rb</filename>
@@ -541,13 +541,13 @@
       <filename>ua.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>69C2A886</checksum>
+      <checksum>0FB3F654</checksum>
     </file>
     <file>
       <filename>utils.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>BDF50D67</checksum>
+      <checksum>26EC8C4F</checksum>
     </file>
     <file>
       <filename>version.rb</filename>

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

@@ -299,14 +299,16 @@ module TBD
     return   invalid("#{nom} normal", mth, 0, ERR) unless n
 
     type   = surface.surfaceType.downcase
-    facing = surface.outsideBoundaryCondition
+    facing = surface.outsideBoundaryCondition.downcase
+    interz = false
     setpts = setpoints(space)
 
-    if facing.downcase == "surface"
-      empty = surface.adjacentSurface.empty?
-      return invalid("#{nom}: adjacent surface", mth, 0, ERR) if empty
+    if facing == "surface"
+      adj = surface.adjacentSurface
+      return invalid("#{nom}: adjacent surface", mth, 0, ERR) if adj.empty?
 
-      facing = surface.adjacentSurface.get.nameString
+      facing = adj.get.nameString
+      interz = true
     end
 
     unless surface.construction.empty?
@@ -315,8 +317,9 @@ module TBD
       unless lc.empty?
         lc  = lc.get
         lyr = insulatingLayer(lc)
+        idx = lyr[:index]
 
-        if lyr[:index].is_a?(Integer) && lyr[:index].between?(0, lc.numLayers - 1)
+        if idx.is_a?(Integer) && idx.between?(0, lc.numLayers - 1)
           surf[:construction] = lc
           # index: ... of layer/material (to derate) within construction
           # ltype: either :massless (RSi) or :standard (k + d)
@@ -358,8 +361,14 @@ module TBD
     surf[:story      ] = story.get unless story.empty?
     surf[:n          ] = n
     surf[:gross      ] = surface.grossArea
-    surf[:filmRSI    ] = surface.filmResistance
     surf[:spandrel   ] = spandrel?(surface)
+    surf[:filmRSI    ] = surface.filmResistance
+
+    if interz
+      typ = :ceiling # interzone roof or ceiling
+      typ = :partition if surf[:type] == :wall
+      surf[:filmRSI] = TBD.filmResistances(typ, surface.tilt)
+    end
 
     surface.subSurfaces.sort_by { |s| s.nameString }.each do |s|
       next if poly(s).empty?
@@ -508,7 +517,7 @@ module TBD
       end
 
       unless u.is_a?(Numeric)
-        r = rsi(c, surface.filmResistance)
+        r = rsi(c, surf[:filmRSI])
 
         if r < TOL
           log(ERR, "Skipping '#{id}': U-factor unavailable (#{mth})")
@@ -831,7 +840,7 @@ module TBD
       edge[:surfaces].keys.each do |id|
         next unless floors.key?(id)
 
-        next unless floors[id][:boundary].downcase == "foundation"
+        next unless floors[id][:boundary] == "foundation"
         next     if floors[id].key?(:kiva)
 
         # Initially set as slab-on-grade. Track 'exposed foundation perimeter'.
@@ -845,7 +854,7 @@ module TBD
         edge[:surfaces].keys.each do |i|
           next     if i == id
           next unless walls.key?(i)
-          next unless walls[i][:boundary].downcase == "foundation"
+          next unless walls[i][:boundary] == "foundation"
           next     if walls[i].key?(:kiva)
 
           floors[id][:kiva   ]  = :basement
@@ -857,7 +866,7 @@ module TBD
         edge[:surfaces].keys.each do |i|
           next     if i == id
           next unless walls.key?(i)
-          next unless walls[i][:boundary].downcase == "outdoors"
+          next unless walls[i][:boundary] == "outdoors"
 
           floors[id][:exposed] += edge[:length]
         end
@@ -872,7 +881,7 @@ module TBD
             e[:surfaces].keys.each do |ii|
               next     if i == ii
               next unless walls.key?(ii)
-              next unless walls[ii][:boundary].downcase == "foundation"
+              next unless walls[ii][:boundary] == "foundation"
               next     if walls[ii].key?(:kiva)
 
               floors[id][:kiva   ]  = :basement
@@ -883,7 +892,7 @@ module TBD
             e[:surfaces].keys.each do |ii|
               next    if i == ii
               next unless walls.key?(ii)
-              next unless walls[ii][:boundary].downcase == "outdoors"
+              next unless walls[ii][:boundary] == "outdoors"
 
               floors[id][:exposed] += e[:length]
             end

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

@@ -1424,8 +1424,10 @@ module TBD
       m  = m.clone(model).to_MasslessOpaqueMaterial.get
       m.setName("#{id} #{up}m tbd")
 
-      de_r = RMIN                    unless de_r > RMIN
-      loss = (de_u - 1 / de_r) * net unless de_r > RMIN
+      if de_r < RMIN
+        de_r = RMIN
+        loss = (de_u - 1 / de_r) * net
+      end
 
       unless m.setThermalResistance(de_r)
         return invalid("Can't derate #{id}: RSi#{de_r.round(2)}", mth)
@@ -1555,7 +1557,7 @@ module TBD
       next unless surface[:conditioned]
       next     if surface[:ground     ]
 
-      unless surface[:boundary].downcase == "outdoors"
+      unless surface[:boundary] == "outdoors"
         next unless tbd[:surfaces].key?(surface[:boundary])
         next     if tbd[:surfaces][surface[:boundary]][:conditioned]
       end
@@ -2202,7 +2204,7 @@ module TBD
           next      if holes.key?(i)
           next      if shades.key?(i)
 
-          facing = tbd[:surfaces][i][:boundary].downcase
+          facing = tbd[:surfaces][i][:boundary]
           next unless facing == "othersidecoefficients"
 
           s1      = edge[:surfaces][id]
@@ -2971,6 +2973,7 @@ module TBD
     # derate a construction/material pair having " tbd" in their OpenStudio name.
     tbd[:surfaces].each do |id, surface|
       next unless surface.key?(:construction)
+      next unless surface.key?(:filmRSI)
       next unless surface.key?(:index)
       next unless surface.key?(:ltype)
       next unless surface.key?(:r)
@@ -2981,8 +2984,7 @@ module TBD
       s = model.getSurfaceByName(id)
       next if s.empty?
 
-      s = s.get
-
+      s         = s.get
       index     = surface[:index       ]
       current_c = surface[:construction]
       c         = current_c.clone(model).to_LayeredConstruction.get
@@ -2995,7 +2997,7 @@ module TBD
       if m
         c.setLayer(index, m)
         c.setName("#{id} c tbd")
-        current_R = rsi(current_c, s.filmResistance)
+        current_R = rsi(current_c, surface[:filmRSI])
 
         # In principle, the derated "ratio" could be calculated simply by
         # accessing a surface's uFactor. Yet air layers within constructions
@@ -3035,7 +3037,7 @@ module TBD
 
         # Compute updated RSi value from layers.
         updated_c = s.construction.get.to_LayeredConstruction.get
-        updated_R = rsi(updated_c, s.filmResistance)
+        updated_R = rsi(updated_c, surface[:filmRSI])
         ratio     = -(current_R - updated_R) * 100 / current_R
 
         surface[:ratio] = ratio if ratio.abs > TOL
@@ -3047,14 +3049,10 @@ module TBD
     tbd[:surfaces].each do |id, surface|
       next unless surface[:deratable]
       next unless surface.key?(:construction)
+      next unless surface.key?(:filmRSI)
       next     if surface.key?(:u)
 
-      s   = model.getSurfaceByName(id)
-      msg = "Skipping missing surface '#{id}' (#{mth})"
-      log(ERR, msg) if s.empty?
-      next          if s.empty?
-
-      surface[:u] = 1.0 / rsi(surface[:construction], s.get.filmResistance)
+      surface[:u] = 1.0 / rsi(surface[:construction], surface[:filmRSI])
     end
 
     json[:io][:edges] = []
@@ -3204,8 +3202,8 @@ module TBD
 
       uo     = format("%.3f", g[:uo])
       ut     = format("%.3f", g[:ut])
-      output = "An initial #{label.to_s} Uo of #{uo} W/m2•K is required to " \
-               "achieve an overall Ut of #{ut} W/m2•K for #{g[:op]}"
+      output = "An area-weighted #{label.to_s} Uo of #{uo} W/m2•K is " \
+               "required to meet an overall Ut of #{ut} W/m2•K for #{g[:op]}"
       u_t << output
       runner.registerInfo(output)
     end