tbd 3.5.2 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05fd880203531a590b7200877de77c8128a19cd1576430fc19b06c2fa6fa5c9a
-  data.tar.gz: 5359fb5300c59237c5f3c29e7d8dbe4e961ebedeb5e1b8a7b693ea7e7525c8d1
+  metadata.gz: 6b9460ab560b9bdac3d2f291a4ca25bb1a84c1e0d54c8cc89ad6d332de741f33
+  data.tar.gz: fa685b2b11943a07aa8baae1dcec90be333a5bb0d33f091e2ea80414556ac1e1
 SHA512:
-  metadata.gz: 7a16de918bbf66ee2306dab6459db400af37fb5734f7a8e9203dbb934252cb9f27aa084149790a9b8349de67e9d46381f8460b32ef1432d938ec3e06644136f0
-  data.tar.gz: d40f3b5d24e7450f7695c0d8d68bd5a463efeec002b399a6a181a0b1c936f6608f81c7556365a79e4d7434785b4c9bac1046255700772ffc07667c2baa6a7403
+  metadata.gz: fa07d25024543f65b3d57b235ef451a18c8f0ca20d85c803d2aa7fb7df635734f7c84ce4224e0ffa8c38294176a6d6cce0dcbaadc20f4c021632dcf0c758d22a
+  data.tar.gz: 5220cf57a68114d592a82a2d3516fcc01cdb9b9281ea0e5665077f25119cbf185b5f2b40b1555aedbb37e2d5a75f4bc41e95a1909d990a3998a2bdd6fab06e7f

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>833dbf17-e51f-43c7-9c8b-a79ef0e6bd3b</version_id>
-  <version_modified>2026-02-03T13:53:54Z</version_modified>
+  <version_id>51c8811e-5901-4d36-a106-9bd4e377d0bb</version_id>
+  <version_modified>2026-08-27T12:41:28Z</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>16067F9B</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>7AE7FE72</checksum>
     </file>
     <file>
       <filename>tbd.rb</filename>
@@ -541,13 +541,13 @@
       <filename>ua.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>D3A2A391</checksum>
+      <checksum>666C0F59</checksum>
     </file>
     <file>
       <filename>utils.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>118F3A32</checksum>
+      <checksum>61243A64</checksum>
     </file>
     <file>
       <filename>version.rb</filename>

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

@@ -38,7 +38,6 @@ module TBD
     a   = false
     return mismatch("e1", e1, Hash, mth, DBG, a)       unless e1.is_a?(Hash)
     return mismatch("e2", e2, Hash, mth, DBG, a)       unless e2.is_a?(Hash)
-    return mismatch("e2", e2, Hash, mth, DBG, a)       unless e2.is_a?(Hash)
 
     return hashkey("e1", e1, :v0, mth, DBG, a)         unless e1.key?(:v0)
     return hashkey("e1", e1, :v1, mth, DBG, a)         unless e1.key?(:v1)
@@ -299,14 +298,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 +316,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 +360,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 +516,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})")
@@ -635,8 +643,8 @@ module TBD
 
     valid1 = s1[:angle].is_a?(Numeric)
     valid2 = s2[:angle].is_a?(Numeric)
-    return mismatch("s1 angle", s1[:angle], Numeric, DBG, false) unless valid1
-    return mismatch("s1 angle", s1[:angle], Numeric, DBG, false) unless valid2
+    return mismatch("s1 angle", s1[:angle], Numeric, mth, DBG, false) unless valid1
+    return mismatch("s2 angle", s2[:angle], Numeric, mth, DBG, false) unless valid2
 
     angle = 0
     angle = s2[:angle] - s1[:angle] if s2[:angle] > s1[:angle]
@@ -678,8 +686,8 @@ module TBD
 
     valid1 = s1[:angle].is_a?(Numeric)
     valid2 = s2[:angle].is_a?(Numeric)
-    return mismatch("s1 angle", s1[:angle], Numeric, DBG, false) unless valid1
-    return mismatch("s1 angle", s1[:angle], Numeric, DBG, false) unless valid2
+    return mismatch("s1 angle", s1[:angle], Numeric, mth, DBG, false) unless valid1
+    return mismatch("s2 angle", s2[:angle], Numeric, mth, DBG, false) unless valid2
 
     angle = 0
     angle = s2[:angle] - s1[:angle] if s2[:angle] > s1[:angle]
@@ -752,8 +760,8 @@ module TBD
   # boundary conditions.
   #
   # @param model [OpenStudio::Model::Model] a model
-  # @param floors [Hash] TBD floors
   # @param walls [Hash] TBD walls
+  # @param floors [Hash] TBD floors
   # @param edges [Hash] TBD edges (many linking floors & walls
   #
   # @return [Bool] true if Kiva foundations are successfully generated
@@ -831,7 +839,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 +853,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 +865,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 +880,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 +891,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

@@ -542,7 +542,7 @@ module TBD
       h[:partyconcave          ] = @set[id].key?(:partyconcave)
       h[:partyconvex           ] = @set[id].key?(:partyconvex)
       h[:parapet               ] = @set[id].key?(:parapet)
-      h[:partyconcave          ] = @set[id].key?(:parapetconcave)
+      h[:parapetconcave        ] = @set[id].key?(:parapetconcave)
       h[:parapetconvex         ] = @set[id].key?(:parapetconvex)
       h[:roof                  ] = @set[id].key?(:roof)
       h[:roofconcave           ] = @set[id].key?(:roofconcave)
@@ -557,10 +557,10 @@ module TBD
       h[:balconyconcave        ] = @set[id].key?(:balconyconcave)
       h[:balconyconvex         ] = @set[id].key?(:balconyconvex)
       h[:balconysill           ] = @set[id].key?(:balconysill)
-      h[:balconysillconcave    ] = @set[id].key?(:balconysillconvex)
+      h[:balconysillconcave    ] = @set[id].key?(:balconysillconcave)
       h[:balconysillconvex     ] = @set[id].key?(:balconysillconvex)
       h[:balconydoorsill       ] = @set[id].key?(:balconydoorsill)
-      h[:balconydoorsillconcave] = @set[id].key?(:balconydoorsillconvex)
+      h[:balconydoorsillconcave] = @set[id].key?(:balconydoorsillconcave)
       h[:balconydoorsillconvex ] = @set[id].key?(:balconydoorsillconvex)
       h[:rimjoist              ] = @set[id].key?(:rimjoist)
       h[:rimjoistconcave       ] = @set[id].key?(:rimjoistconcave)
@@ -572,10 +572,10 @@ module TBD
       v[:head           ] = 0; v[:headconcave           ] = 0; v[:headconvex           ] = 0
       v[:sill           ] = 0; v[:sillconcave           ] = 0; v[:sillconvex           ] = 0
       v[:jamb           ] = 0; v[:jambconcave           ] = 0; v[:jambconvex           ] = 0
-      v[:doorhead       ] = 0; v[:doorheadconcave       ] = 0; v[:doorconvex           ] = 0
+      v[:doorhead       ] = 0; v[:doorheadconcave       ] = 0; v[:doorheadconvex       ] = 0
       v[:doorsill       ] = 0; v[:doorsillconcave       ] = 0; v[:doorsillconvex       ] = 0
       v[:doorjamb       ] = 0; v[:doorjambconcave       ] = 0; v[:doorjambconvex       ] = 0
-      v[:skylighthead   ] = 0; v[:skylightheadconcave   ] = 0; v[:skylightconvex       ] = 0
+      v[:skylighthead   ] = 0; v[:skylightheadconcave   ] = 0; v[:skylightheadconvex   ] = 0
       v[:skylightsill   ] = 0; v[:skylightsillconcave   ] = 0; v[:skylightsillconvex   ] = 0
       v[:skylightjamb   ] = 0; v[:skylightjambconcave   ] = 0; v[:skylightjambconvex   ] = 0
       v[:spandrel       ] = 0; v[:spandrelconcave       ] = 0; v[:spandrelconvex       ] = 0
@@ -712,7 +712,7 @@ module TBD
       v[:roofconcave           ] = @set[id][:parapet               ] if h[:parapet               ]
       v[:roofconvex            ] = @set[id][:parapet               ] if h[:parapet               ]
       v[:roofconcave           ] = @set[id][:parapetconcave        ] if h[:parapetconcave        ]
-      v[:roofconvex            ] = @set[id][:parapetxonvex         ] if h[:parapetconvex         ]
+      v[:roofconvex            ] = @set[id][:parapetconvex         ] if h[:parapetconvex         ]
       v[:roof                  ] = @set[id][:roof                  ] if h[:roof                  ]
       v[:roofconcave           ] = @set[id][:roof                  ] if h[:roof                  ]
       v[:roofconvex            ] = @set[id][:roof                  ] if h[:roof                  ]
@@ -758,12 +758,12 @@ module TBD
       v[:balconysillconcave    ] = @set[id][:balcony               ] if h[:balcony               ]
       v[:balconysillconvex     ] = @set[id][:balcony               ] if h[:balcony               ]
       v[:balconysillconcave    ] = @set[id][:balconyconcave        ] if h[:balconyconcave        ]
-      v[:balconysillconvex     ] = @set[id][:balconyconvex         ] if h[:balconycinvex         ]
+      v[:balconysillconvex     ] = @set[id][:balconyconvex         ] if h[:balconyconvex         ]
       v[:balconydoorsill       ] = @set[id][:balcony               ] if h[:balcony               ]
       v[:balconydoorsillconcave] = @set[id][:balcony               ] if h[:balcony               ]
       v[:balconydoorsillconvex ] = @set[id][:balcony               ] if h[:balcony               ]
       v[:balconydoorsillconcave] = @set[id][:balconyconcave        ] if h[:balconyconcave        ]
-      v[:balconydoorsillconvex ] = @set[id][:balconyconvex         ] if h[:balconycinvex         ]
+      v[:balconydoorsillconvex ] = @set[id][:balconyconvex         ] if h[:balconyconvex         ]
       v[:balconysill           ] = @set[id][:balconysill           ] if h[:balconysill           ]
       v[:balconysillconcave    ] = @set[id][:balconysill           ] if h[:balconysill           ]
       v[:balconysillconvex     ] = @set[id][:balconysill           ] if h[:balconysill           ]
@@ -786,10 +786,10 @@ module TBD
       v[:rimjoistconvex        ] = @set[id][:rimjoistconvex        ] if h[:rimjoistconvex        ]
 
       max = [v[:parapetconcave], v[:parapetconvex]].max
-      v[:parapet] = max unless @has[:parapet]
+      v[:parapet] = max unless h[:parapet]
 
       max = [v[:roofconcave], v[:roofconvex]].max
-      v[:roof] = max unless @has[:roof]
+      v[:roof] = max unless h[:roof]
 
       @val[id] = v
 
@@ -982,7 +982,7 @@ module TBD
       mth = "TBD::#{__callee__}"
       sh  = { has: {}, val: {} }
       id  = trim(id)
-      return mismatch("set ID", id, String, mth, ERR, a)      if id.empty?
+      return mismatch("set ID", id, String, mth, ERR, sh)     if id.empty?
       return hashkey(id, @set , id,         mth, ERR, sh) unless @set.key?(id)
       return hashkey(id, @has , id,         mth, ERR, sh) unless @has.key?(id)
       return hashkey(id, @val , id,         mth, ERR, sh) unless @val.key?(id)
@@ -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
@@ -1734,9 +1736,9 @@ module TBD
             next unless point_V_mag > TOL
             next unless point_V_mag > farthest_mag
 
-            farthest    = point
-            farthest_V  = origin_point_V
-            fathest_mag = point_V_mag
+            farthest     = point
+            farthest_V   = origin_point_V
+            farthest_mag = point_V_mag
           end
 
           angle  = reference_V.angle(farthest_V)
@@ -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