tbd 3.4.5 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '088489dd7b5163709bef87c140b053593cca33f27fff736a553ec2c734ace460'
-  data.tar.gz: 0e5a5ed2af0d1d4c9d0b50d625147bd519b5944b923ae12d0ef414d88818c0a9
+  metadata.gz: 551371a237284715450e716fba2b269ae37d1f54f348311acbf50245c8df0b29
+  data.tar.gz: ea3e0c6489c60e354518c3a38516fb70fda77d9250772e5db2995c32e6bc17c5
 SHA512:
-  metadata.gz: 708b50fde62e4990344e51eb46390607ee193338d59e3539c61f80fd53850acfb37dc6659bfe77ef23a3820f1339266fa02425ad719f9f940b948b6564bc6d22
-  data.tar.gz: 69c846ef8d3663436b726566dfc3b78e44e6a9ba30431d00b724c6c5778150a8e6b950abdbf18af6bf5e8ed0276d0fa008e683f1c6ee3656c2ca6436c0c74af3
+  metadata.gz: 2779d70ffa38269af0eea2cd7cd83bab7223f55b0c22a198fc2b0c612454441bda39eb9ef129c2480109a83060da6a84ee81901fad42c3b19691ef6bb297f1d1
+  data.tar.gz: 7cab12e47384c1aad5b86960a21c042f96b07b8912c910314925e235c817c3e2618c4d3a90155834294c31831943e3c4c3124178afe27c1dc540cb92b77aa825

data/LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2025 Denis Bourgeois & Dan Macumber
+Copyright (c) 2020-2026 Denis Bourgeois & Dan Macumber
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/measures/tbd/LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2025 Denis Bourgeois & Dan Macumber
+Copyright (c) 2020-2026 Denis Bourgeois & Dan Macumber
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/measures/tbd/measure.rb

@@ -1,6 +1,6 @@
 # MIT License
 #
-# Copyright (c) 2020-2025 Denis Bourgeois & Dan Macumber
+# Copyright (c) 2020-2026 Denis Bourgeois & Dan Macumber
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

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>7a2d773a-7a50-4c69-aa1f-93ed796e9ace</version_id>
-  <version_modified>2025-08-15T13:39:31Z</version_modified>
+  <version_id>8649cb7e-2e58-4a6d-ba67-911b6e0a41a6</version_id>
+  <version_modified>2026-01-04T12:08:45Z</version_modified>
   <xml_checksum>99772807</xml_checksum>
   <class_name>TBDMeasure</class_name>
   <display_name>Thermal Bridging and Derating - TBD</display_name>
@@ -464,7 +464,7 @@
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>3EBCA5DB</checksum>
+      <checksum>98D54646</checksum>
     </file>
     <file>
       <filename>README.md</filename>
@@ -493,13 +493,13 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>3FBDA0C2</checksum>
+      <checksum>489D7CFA</checksum>
     </file>
     <file>
       <filename>geo.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>EF3BA8F7</checksum>
+      <checksum>9CA80CEB</checksum>
     </file>
     <file>
       <filename>geometry.rb</filename>
@@ -523,13 +523,13 @@
       <filename>psi.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>71AED953</checksum>
+      <checksum>B9FB5E02</checksum>
     </file>
     <file>
       <filename>tbd.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>9E26251E</checksum>
+      <checksum>3919B9B0</checksum>
     </file>
     <file>
       <filename>transformation.rb</filename>
@@ -541,13 +541,13 @@
       <filename>ua.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>022F6D10</checksum>
+      <checksum>69C2A886</checksum>
     </file>
     <file>
       <filename>utils.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>3CD8019A</checksum>
+      <checksum>BDF50D67</checksum>
     </file>
     <file>
       <filename>version.rb</filename>
@@ -565,7 +565,7 @@
       <filename>tbd_tests.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>9C76CD98</checksum>
+      <checksum>90CE962F</checksum>
     </file>
   </files>
 </measure>

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

@@ -1,6 +1,6 @@
 # MIT License
 #
-# Copyright (c) 2020-2025 Denis Bourgeois & Dan Macumber
+# Copyright (c) 2020-2026 Denis Bourgeois & Dan Macumber
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -310,23 +310,24 @@ module TBD
     end
 
     unless surface.construction.empty?
-      construction = surface.construction.get.to_LayeredConstruction
+      lc = surface.construction.get.to_LayeredConstruction
 
-      unless construction.empty?
-        construction = construction.get
-        lyr          = insulatingLayer(construction)
-        lyr[:index]  = nil unless lyr[:index].is_a?(Numeric)
-        lyr[:index]  = nil unless lyr[:index] >= 0
-        lyr[:index]  = nil unless lyr[:index] < construction.layers.size
+      unless lc.empty?
+        lc  = lc.get
+        lyr = insulatingLayer(lc)
 
-        if lyr[:index]
-          surf[:construction] = construction
+        if lyr[:index].is_a?(Integer) && lyr[:index].between?(0, lc.numLayers - 1)
+          surf[:construction] = lc
           # index: ... of layer/material (to derate) within construction
           # ltype: either :massless (RSi) or :standard (k + d)
           # r    : initial RSi value of the indexed layer to derate
           surf[:index] = lyr[:index]
           surf[:ltype] = lyr[:type ]
           surf[:r    ] = lyr[:r    ]
+        else
+          surf[:index] = nil
+          surf[:ltype] = nil
+          surf[:r    ] = 0.0
         end
       end
     end

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

@@ -1,6 +1,6 @@
 # MIT License
 #
-# Copyright (c) 2020-2025 Denis Bourgeois & Dan Macumber
+# Copyright (c) 2020-2026 Denis Bourgeois & Dan Macumber
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -1355,103 +1355,103 @@ module TBD
   ##
   # Thermally derates insulating material within construction.
   #
-  # @param id [#to_s] surface identifier
+  # @param id [#to_sym] surface identifier
   # @param [Hash] s TBD surface parameters
-  # @option s [#to_f] :heatloss heat loss from major thermal bridging, in W/K
-  # @option s [#to_f] :net surface net area, in m2
+  # @option s [Numeric] :heatloss heat loss from major thermal bridging, in W/K
+  # @option s [Numeric] :net surface net area, in m2
   # @option s [:massless, :standard] :ltype indexed layer type
-  # @option s [#to_i] :index deratable construction layer index
-  # @option s [#to_f] :r deratable layer Rsi-factor, in m2•K/W
+  # @option s [Integer] :index deratable construction layer index
+  # @option s [Numeric] :r deratable layer Rsi-factor, in m2•K/W
   # @param lc [OpenStudio::Model::LayeredConstruction] a layered construction
   #
-  # @return [OpenStudio::Model::Material] derated (cloned) material
+  # @return [OpenStudio::Model::OpaqueMaterial] derated (cloned) material
   # @return [nil] if invalid input (see logs)
   def derate(id = "", s = {}, lc = nil)
     mth = "TBD::#{__callee__}"
     m   = nil
-    id  = trim(id)
     kys = [:heatloss, :net, :ltype, :index, :r]
-    ck1 = s.is_a?(Hash)
-    ck2 = lc.is_a?(OpenStudio::Model::LayeredConstruction)
-    return mismatch("id"                , id, cl6, mth)     if id.empty?
-    return mismatch("#{id} surface"     , s , cl1, mth) unless ck1
-    return mismatch("#{id} construction", lc, cl2, mth) unless ck2
+    cl  = OpenStudio::Model::LayeredConstruction
+    return mismatch("lc", lc, cl, mth) unless lc.respond_to?(NS)
+    return mismatch("id", id, String, mth) unless id.respond_to?(:to_sym)
+
+    id  = trim(id)
+    nom = lc.nameString
+    return invalid("id", mth, 1) if id.empty?
+    return mismatch(nom, lc, cl, mth) unless lc.is_a?(cl)
+    return mismatch("#{nom} surface", s, Hash, mth) unless s.is_a?(Hash)
+
+    if nom.downcase.include?(" tbd")
+      log(WRN, "Won't derate '#{nom}': tagged as derated (#{mth})")
+      return m
+    end
 
     kys.each do |k|
       tag = "#{id} #{k}"
-      return hashkey(tag, s, k, mth, ERR) unless s.key?(k)
+      return hashkey(tag, s, k, mth) unless s.key?(k)
 
       case k
-      when :heatloss
-        return mismatch(tag, s[k], Numeric, mth) unless s[k].respond_to?(:to_f)
-        return zero(tag, mth, WRN)                   if s[k].to_f.abs < 0.001
-      when :net, :r
-        return mismatch(tag, s[k], Numeric, mth) unless s[k].respond_to?(:to_f)
-        return negative(tag, mth, 2, ERR)            if s[k].to_f < 0
-        return zero(tag, mth, WRN)                   if s[k].to_f.abs < 0.001
-      when :index
-        return mismatch(tag, s[k], Numeric, mth) unless s[k].respond_to?(:to_i)
-        return negative(tag, mth, 2, ERR)            if s[k].to_f < 0
-      else # :ltype
+      when :ltype
         next if [:massless, :standard].include?(s[k])
-        return invalid(tag, mth, 2, ERR)
-      end
-    end
+        return invalid(tag, mth, 2)
+      when :index
+        return mismatch(tag, s[k], Integer, mth) unless s[k].is_a?(Integer)
+        return invalid(tag, mth, 2) unless s[k].between?(0, lc.numLayers - 1)
+      else
+        return mismatch(tag, s[k], Numeric, mth) unless s[k].is_a?(Numeric)
+        next if k == :heatloss
 
-    if lc.nameString.downcase.include?(" tbd")
-      log(WRN, "Won't derate '#{id}': tagged as derated (#{mth})")
-      return m
+        return negative(tag, mth, 2) if s[k] < 0
+        return zero(tag, mth) if s[k].abs < 0.001
+      end
     end
 
     model = lc.model
-    ltype = s[:ltype   ]
-    index = s[:index   ].to_i
-    net   = s[:net     ].to_f
-    r     = s[:r       ].to_f
-    u     = s[:heatloss].to_f / net
+    ltype = s[:ltype]
+    index = s[:index]
+    net   = s[:net]
+    r     = s[:r]
+    u     = s[:heatloss] / net
     loss  = 0
-    de_u  = 1 / r + u # derated U
-    de_r  = 1 / de_u  # derated R
+    de_u  = 1 / r + u # derated insulating material U
+    de_r  = 1 / de_u  # derated insulating material R
 
     if ltype == :massless
-      m    = lc.getLayer(index).to_MasslessOpaqueMaterial
+      m = lc.getLayer(index).to_MasslessOpaqueMaterial
       return invalid("#{id} massless layer?", mth, 0) if m.empty?
-      m    = m.get
-      up   = ""
-      up   = "uprated " if m.nameString.downcase.include?(" uprated")
-      m    = m.clone(model).to_MasslessOpaqueMaterial.get
-             m.setName("#{id} #{up}m tbd")
-      de_r = 0.001                   unless de_r > 0.001
-      loss = (de_u - 1 / de_r) * net unless de_r > 0.001
-             m.setThermalResistance(de_r)
+
+      m  = m.get
+      up = m.nameString.downcase.include?(" uprated") ? "uprated " : ""
+      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
+
+      unless m.setThermalResistance(de_r)
+        return invalid("Can't derate #{id}: RSi#{de_r.round(2)}", mth)
+      end
     else
-      m    = lc.getLayer(index).to_StandardOpaqueMaterial
+      m = lc.getLayer(index).to_StandardOpaqueMaterial
       return invalid("#{id} standard layer?", mth, 0) if m.empty?
-      m    = m.get
-      up   = ""
-      up   = "uprated " if m.nameString.downcase.include?(" uprated")
-      m    = m.clone(model).to_StandardOpaqueMaterial.get
-             m.setName("#{id} #{up}m tbd")
-      k    = m.thermalConductivity
-
-      if de_r > 0.001
-        d  = de_r * k
-
-        unless d > 0.003
-          d    = 0.003
-          k    = d / de_r
-          k    = 3                    unless k < 3
-          loss = (de_u - k / d) * net unless k < 3
-        end
-      else # de_r < 0.001 m2•K/W
-        d    = 0.001 * k
-        d    = 0.003                  unless d > 0.003
-        k    = d / 0.001              unless d > 0.003
-        loss = (de_u - k / d) * net
+
+      m  = m.get
+      up = m.nameString.downcase.include?(" uprated") ? "uprated " : ""
+      m  = m.clone(model).to_StandardOpaqueMaterial.get
+      m.setName("#{id} #{up}m tbd")
+
+      d  = m.thickness
+      k  = (d / de_r).clamp(KMIN, KMAX)
+      d  = (k * de_r).clamp(DMIN, DMAX)
+
+      loss = (de_u - k / d) * net unless d / k > RMIN
+
+      unless m.setThermalConductivity(k)
+        return invalid("Can't derate #{id}: K#{k.round(3)}", mth)
       end
 
-      m.setThickness(d)
-      m.setThermalConductivity(k)
+      unless m.setThickness(d)
+        return invalid("Can't derate #{id}: #{(d*1000).to_i}mm", mth)
+      end
     end
 
     if m && loss > TOL
@@ -1941,14 +1941,38 @@ module TBD
             ids = windows.keys + doors.keys + skylights.keys
           end
 
-          unless ids.include?(i)
-            log(ERR, "Orphaned subsurface #{i} (mth)")
+          adj = nil
+
+          unless ids.include?(i) # adjacent sub surface?
+            sb = model.getSubSurfaceByName(i)
+
+            if sb.empty?
+              log(DBG, "Orphaned subsurface #{i} (#{mth})?")
+            else
+              sb  = sb.get
+              adj = sb.adjacentSubSurface
+
+              if adj.empty?
+                log(DBG, "Orphaned sub #{i} (#{mth})?")
+              end
+            end
+
             next
           end
 
-          window   =   windows.key?(i) ?   windows[i] : {}
-          door     =     doors.key?(i) ?     doors[i] : {}
-          skylight = skylights.key?(i) ? skylights[i] : {}
+          if adj
+            window   =   windows.key?(i) ?   windows[i] : {}
+            door     =     doors.key?(i) ?     doors[i] : {}
+            skylight = skylights.key?(i) ? skylights[i] : {}
+          else
+            window   =   windows.key?(i) ?   windows[i] : {}
+            door     =     doors.key?(i) ?     doors[i] : {}
+            skylight = skylights.key?(i) ? skylights[i] : {}
+          end
+
+          # window   =   windows.key?(i) ?   windows[i] : {}
+          # door     =     doors.key?(i) ?     doors[i] : {}
+          # skylight = skylights.key?(i) ? skylights[i] : {}
 
           sub = window   unless window.empty?
           sub = door     unless door.empty?
@@ -2939,12 +2963,12 @@ module TBD
     up = argh[:uprate_walls] || argh[:uprate_roofs] || argh[:uprate_floors]
     uprate(model, tbd[:surfaces], argh) if up
 
-    # Derated (cloned) constructions are unique to each deratable surface.
-    # Unique construction names are prefixed with the surface name,
-    # and suffixed with " tbd", indicating that the construction is
-    # henceforth thermally derated. The " tbd" expression is also key in
-    # avoiding inadvertent derating - TBD will not derate constructions
-    # (or rather layered materials) having " tbd" in their OpenStudio name.
+    # A derated (cloned) construction and (cloned) insulating layer are unique
+    # to each deratable surface. Unique construction and material names are
+    # prefixed with the surface name, and suffixed with " tbd", indicating that
+    # the construction is henceforth thermally derated. The " tbd" expression
+    # is also key in avoiding inadvertent sequential derating - TBD will not
+    # 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?(:index)
@@ -3138,9 +3162,9 @@ module TBD
     argh[:uprate_walls ] = false unless argh.key?(:uprate_walls )
     argh[:uprate_roofs ] = false unless argh.key?(:uprate_roofs )
     argh[:uprate_floors] = false unless argh.key?(:uprate_floors)
-    argh[:wall_ut      ] = 5.678 unless argh.key?(:wall_ut      )
-    argh[:roof_ut      ] = 5.678 unless argh.key?(:roof_ut      )
-    argh[:floor_ut     ] = 5.678 unless argh.key?(:floor_ut     )
+    argh[:wall_ut      ] = UMAX  unless argh.key?(:wall_ut      )
+    argh[:roof_ut      ] = UMAX  unless argh.key?(:roof_ut      )
+    argh[:floor_ut     ] = UMAX  unless argh.key?(:floor_ut     )
     argh[:wall_option  ] = ""    unless argh.key?(:wall_option  )
     argh[:roof_option  ] = ""    unless argh.key?(:roof_option  )
     argh[:floor_option ] = ""    unless argh.key?(:floor_option )

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

@@ -1,6 +1,6 @@
 # MIT License
 #
-# Copyright (c) 2020-2025 Denis Bourgeois & Dan Macumber
+# Copyright (c) 2020-2026 Denis Bourgeois & Dan Macumber
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal