tbd 3.2.0 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92789b60b438d1518f82d2596a12314ea5c6903de2bd902f1cbbea1a2379fd1d
-  data.tar.gz: e0e17c13b6db89a38fe39a9f8a6f4e2249e09976c08049250da3d6546689064f
+  metadata.gz: 858b576df6d2a7c00b547c1bcb86fcae917f441c236f012610309b5df96f2d19
+  data.tar.gz: ee47f03ce21e7ef8d95968aa0d159a39875ca546c32b48c8f96d7779b1ef341d
 SHA512:
-  metadata.gz: a054444e9871a6a6844c4535913b50700b94588f338434e47b8dd41ec6d73c78df8f2efd773a4bc1f86d25cd37216b7ebe48ba94e18a6f4e8547b2be987c5ecb
-  data.tar.gz: 360c811de3c35599d73741985d80df474379a29fbad16714a0afa553b4719d50b41415f18006462176f9adc26377980507e535c616a64b77f0398b24d3fa435c
+  metadata.gz: 1d7d4ad54c0d8d06776b868037a717d8efc11d4f1e1290cbf972202bae04ef4e6e6ea21cf227a8405c508c1d31f1bbb9e5667a21af9186984b28eee19a5e4395
+  data.tar.gz: eaae502337964abffe89643e4c1e6070f3a228db3ef6d87983f0cc7c9218f124e72eae6e502bd06ff7119fd594ed784d3f4232a3bd1ddb03c1d23f7bcce1c951

data/README.md

@@ -32,9 +32,7 @@ TBD is systematically tested against updated OpenStudio versions (since v3.0.0).
 
 ### Windows Installation
 
-Install Ruby using the [RubyInstaller](https://rubyinstaller.org/downloads/archives/) for [Ruby 2.7.2 (x64)](https://github.com/oneclick/rubyinstaller2/releases/tag/RubyInstaller-2.7.2-1/rubyinstaller-2.7.2-1-x64.exe).
-
-From the command line, check that the ruby installation returns the correct Ruby version:
+Either install Ruby using the [RubyInstaller](https://rubyinstaller.org/downloads/archives/) for [Ruby 2.7.2 (x64)](https://github.com/oneclick/rubyinstaller2/releases/tag/RubyInstaller-2.7.2-1/rubyinstaller-2.7.2-1-x64.exe), or preferably under [WSL2](https://gist.github.com/brgix/0d968d8f32c41f13300dc6769414df79). Run the following steps if going down the _RubyInstaller_ route. From the command line, check that the ruby installation returns the correct Ruby version:
 ```
 ruby -v
 ```
@@ -57,9 +55,6 @@ Verify your OpenStudio and Ruby configuration:
 ruby -e "require 'openstudio'" -e "puts OpenStudio::Model::Model.new"
 ```
 
-`git clone` the TBD repo, then run basic tests to ensure the measure operates properly (see end of this README).
-
-
 ### MacOS Installation
 
 MacOS already comes with Ruby, but likely not the right Ruby version for the desired OpenStudio measure development [environment](https://github.com/NREL/OpenStudio/wiki/OpenStudio-SDK-Version-Compatibility-Matrix). Instructions here show how to install Ruby v2.7.2 alongside MacOS's own Ruby version. Although no longer officially supported, instructions for an OpenStudio v2.9.1 setup is described [here](https://github.com/rd2/tbd/blob/master/v291_MacOS.md).
@@ -117,8 +112,9 @@ cd ~/Documents/sandbox340
 ruby -e "require 'openstudio'" -e "puts OpenStudio::Model::Model.new"
 ```
 
-Install the latest version of _git_ (e.g. through Homebrew), then ```git clone``` the TBD repo, e.g. under "sandbox340". Run the basic tests below to ensure the measure operates as expected.
+## Clone TBD
 
+Once done with either the Windows or MacOS setup, install the latest version of _git_ (e.g. through Homebrew), then ```git clone``` the TBD repo, e.g. under "sandbox340". Run the basic tests below to ensure the measure operates as expected.
 
 ## Complete list of test commands
 

data/Rakefile

@@ -2,28 +2,29 @@ require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec) do |t|
-    t.rspec_opts = '--exclude-pattern \'spec/**/*suite_spec.rb\''
+  t.rspec_opts = "--exclude-pattern \'spec/**/*suite_spec.rb\'"
 end
 
 task default: :spec
 
 desc "Update Library Files"
 task :libraries do
-  puts "Updating Library Files"
+  # puts "Updating Library Files"
 
   require "fileutils"
 
   libs  = ["topolys", "osut", "oslg", "tbd"]
   files = {}
-
+  
   $:.each do |path|
     libs.each do |l|
       next unless path.include?(l)
+
       files[l] = Dir.glob(File.join(path, "#{l}/*.rb"))
       files[l].delete_if { |f| f.include?("version.rb") }  unless l == "topolys"
-      puts "#{l} lib files:"
-      files[l].each { |lf| puts "... #{lf}" }
-      puts
+      # puts "#{l} lib files:"
+      # files[l].each { |lf| puts "... #{lf}" }
+      # puts
     end
   end
 
@@ -38,7 +39,7 @@ end
 
 desc "Update Measure"
 task measure: [:libraries] do
-  puts "Updating Measure"
+  # puts "Updating Measure"
 
   require "openstudio"
   require "open3"

data/lib/measures/tbd/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>tbd_measure</name>
   <uid>8890787b-8c25-4dc8-8641-b6be1b6c2357</uid>
-  <version_id>216d4e2e-fab7-49c6-95e9-7262edbf3277</version_id>
-  <version_modified>20230111T223650Z</version_modified>
+  <version_id>ca5db4f4-8624-4699-a544-609690a03d14</version_id>
+  <version_modified>20230322T224647Z</version_modified>
   <xml_checksum>99772807</xml_checksum>
   <class_name>TBDMeasure</class_name>
   <display_name>Thermal Bridging and Derating - TBD</display_name>
@@ -388,18 +388,6 @@
       <usage_type>resource</usage_type>
       <checksum>D80E9AE6</checksum>
     </file>
-    <file>
-      <filename>model.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>57ED37BF</checksum>
-    </file>
-    <file>
-      <filename>version.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>05CC939E</checksum>
-    </file>
     <file>
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
@@ -442,28 +430,40 @@
       <checksum>58ED6635</checksum>
     </file>
     <file>
-      <filename>ua.rb</filename>
+      <filename>README.md</filename>
+      <filetype>md</filetype>
+      <usage_type>readme</usage_type>
+      <checksum>B836C43A</checksum>
+    </file>
+    <file>
+      <filename>psi.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>9EBACA60</checksum>
+      <checksum>1045EF38</checksum>
     </file>
     <file>
-      <filename>geo.rb</filename>
+      <filename>model.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>F447D8CE</checksum>
+      <checksum>8E9A76C7</checksum>
     </file>
     <file>
-      <filename>README.md</filename>
-      <filetype>md</filetype>
-      <usage_type>readme</usage_type>
-      <checksum>B836C43A</checksum>
+      <filename>version.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>A3BB982A</checksum>
     </file>
     <file>
-      <filename>psi.rb</filename>
+      <filename>geo.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>8242FCEF</checksum>
+    </file>
+    <file>
+      <filename>ua.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>E6ED8157</checksum>
+      <checksum>695F5AC2</checksum>
     </file>
   </files>
 </measure>

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

@@ -292,28 +292,31 @@ module TBD
 
     return mismatch("model", model, cl1, mth)          unless model.is_a?(cl1)
     return mismatch("surface", surface, cl2, mth)      unless surface.is_a?(cl2)
-
-    return nil unless validate(surface)
+    return nil                                         unless validate(surface)
 
     nom    = surface.nameString
     surf   = {}
     subs   = {}
     fd     = false
     return   empty("'#{nom}' space", mth, ERR)           if surface.space.empty?
+
     space  = surface.space.get
     stype  = space.spaceType
     story  = space.buildingStory
     tr     = transforms(model, space)
     return   invalid("'#{nom}' transform", mth, 0, FTL)  unless tr[:t] && tr[:r]
+
     t      = tr[:t]
     n      = trueNormal(surface, tr[:r])
     return   invalid("'#{nom}' normal", mth, 0, FTL)     unless n
+
     type   = surface.surfaceType.downcase
     facing = surface.outsideBoundaryCondition
 
     if facing.downcase == "surface"
       empty = surface.adjacentSurface.empty?
-      return invalid("'#{nom}': adjacent surface", mth, 0, ERR)         if empty
+      return invalid("'#{nom}': adjacent surface", mth, 0, ERR) if empty
+
       facing = surface.adjacentSurface.get.nameString
     end
 
@@ -350,6 +353,7 @@ module TBD
     surf[:story      ] = story.get               unless story.empty?
     surf[:n          ] = n
     surf[:gross      ] = surface.grossArea
+    surf[:filmRSI    ] = surface.filmResistance
 
     surface.subSurfaces.sort_by { |s| s.nameString }.each do |s|
       next unless validate(s)

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

@@ -1,9 +1,3 @@
-begin
-  require "topolys/version"
-rescue LoadError
-  require File.join(File.dirname(__FILE__), 'version.rb')
-end
-
 require 'json'
 require 'securerandom'
 require 'set'

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

@@ -975,8 +975,9 @@ module TBD
         end
       end
 
-      surface[:heating] = heat[:spt] if heat[:spt]  # if valid heating setpoints
-      surface[:cooling] = cool[:spt] if cool[:spt]  # if valid cooling setpoints
+      # Recover if valid setpoints.
+      surface[:heating] = heat[:spt] if heat && heat[:spt]
+      surface[:cooling] = cool[:spt] if cool && cool[:spt]
 
       tbd[:surfaces][s.nameString] = surface
     end                                            # (opaque) surfaces populated
@@ -1486,7 +1487,7 @@ module TBD
 
         edge[:surfaces].keys.each do |i|
           break     if is[:rimjoist] || is[:balcony]
-          break unless deratables.size == 2
+          break unless deratables.size > 0
           break     if floors.key?(id)
           next      if i == id
           next  unless floors.key?(i)

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

@@ -39,13 +39,14 @@ module TBD
     cl1 = OpenStudio::Model::Model
     cl2 = OpenStudio::Model::LayeredConstruction
     cl3 = Numeric
+    cl4 = String
 
-    return mismatch("model", model, cl1, mth, DBG, res)  unless model.is_a?(cl1)
-    return mismatch("id", id, String, mth, DBG, res)     unless id.is_a?(String)
-    return mismatch("lc", lc, cl2, mth, DBG, res)        unless lc.is_a?(cl2)
-    return mismatch("hloss", hloss, cl3, mth, DBG, res)  unless hloss.is_a?(cl3)
-    return mismatch("film", film, cl3, mth, DBG, res)    unless film.is_a?(cl3)
-    return mismatch("Ut", ut, cl3, mth, DBG, res)        unless ut.is_a?(cl3)
+    return mismatch("model", model, cl1, mth, DBG, res) unless model.is_a?(cl1)
+    return mismatch("id"   ,    id, cl4, mth, DBG, res) unless id.is_a?(cl4)
+    return mismatch("lc"   ,    lc, cl2, mth, DBG, res) unless lc.is_a?(cl2)
+    return mismatch("hloss", hloss, cl3, mth, DBG, res) unless hloss.is_a?(cl3)
+    return mismatch("film" ,  film, cl3, mth, DBG, res) unless film.is_a?(cl3)
+    return mismatch("Ut"   ,    ut, cl3, mth, DBG, res) unless ut.is_a?(cl3)
 
     loss        = 0.0                   # residual heatloss (not assigned) [W/K]
     area        = lc.getNetArea
@@ -54,12 +55,12 @@ module TBD
     lyr[:index] = nil unless lyr[:index] >= 0
     lyr[:index] = nil unless lyr[:index] < lc.layers.size
 
-    return invalid("'#{id}' layer index", mth, 0, ERR, res)   unless lyr[:index]
-    return zero("'#{id}': heatloss", mth, WRN, res)           unless hloss > TOL
-    return zero("'#{id}': films", mth, WRN, res)              unless film > TOL
-    return zero("'#{id}': Ut", mth, WRN, res)                 unless ut > TOL
-    return invalid("'#{id}': Ut", mth, 0, WRN, res)           unless ut < 5.678
-    return zero("'#{id}': net area (m2)", mth, ERR, res)      unless area > TOL
+    return invalid("'#{id}' layer index", mth, 0, ERR, res) unless lyr[:index]
+    return zero("'#{id}': heatloss"     , mth,    WRN, res) unless hloss > TOL
+    return zero("'#{id}': films"        , mth,    WRN, res) unless film  > TOL
+    return zero("'#{id}': Ut"           , mth,    WRN, res) unless ut    > TOL
+    return invalid("'#{id}': Ut"        , mth, 0, WRN, res) unless ut    < 5.678
+    return zero("'#{id}': net area (m2)", mth,    ERR, res) unless area  > TOL
 
     # First, calculate initial layer RSi to initially meet Ut target.
     rt     = 1 / ut                      #                target construction Rt
@@ -76,7 +77,7 @@ module TBD
 
     if lyr[:type] == :massless
       m     = lc.getLayer(lyr[:index]).to_MasslessOpaqueMaterial
-      return  invalid("'#{id}' massless layer?", mth, 0)             if m.empty?
+      return  invalid("'#{id}' massless layer?", mth, 0, DBG, res)   if m.empty?
 
       m     = m.get.clone(model).to_MasslessOpaqueMaterial.get
               m.setName("#{id} uprated")
@@ -85,7 +86,7 @@ module TBD
               m.setThermalResistance(new_r)
     else # type == :standard
       m     = lc.getLayer(lyr[:index]).to_StandardOpaqueMaterial
-      return  invalid("'#{id}' standard layer?", mth, 0)             if m.empty?
+      return  invalid("'#{id}' standard layer?", mth, 0, DBG, res)   if m.empty?
 
       m     = m.get.clone(model).to_StandardOpaqueMaterial.get
               m.setName("#{id} uprated")
@@ -141,11 +142,12 @@ module TBD
     mth = "TBD::#{__callee__}"
     cl1 = OpenStudio::Model::Model
     cl2 = Hash
+    cl3 = OpenStudio::Model::LayeredConstruction
     a   = false
 
-    return mismatch("model", model, cl1, mth, DBG, a)    unless model.is_a?(cl1)
-    return mismatch("surfaces", s, cl2, mth, DBG, a)     unless s.is_a?(cl2)
-    return mismatch("argh", model, cl1, mth, DBG, a)     unless argh.is_a?(cl2)
+    return mismatch("model"   , model, cl1, mth, DBG, a) unless model.is_a?(cl1)
+    return mismatch("surfaces",     s, cl2, mth, DBG, a) unless s.is_a?(cl2)
+    return mismatch("argh"    , model, cl1, mth, DBG, a) unless argh.is_a?(cl2)
 
     argh[:uprate_walls ] = false unless argh.key?(:uprate_walls )
     argh[:uprate_roofs ] = false unless argh.key?(:uprate_roofs )
@@ -168,11 +170,13 @@ module TBD
     groups[:roof ][:op] = argh[:roof_option  ]
     groups[:floor][:op] = argh[:floor_option ]
 
-    groups.each do |label, g|
+    groups.each do |type, g|
       next unless g[:up]
       next unless g[:ut].is_a?(Numeric)
       next unless g[:ut] < 5.678
 
+      typ  = type
+      typ  = :ceiling if typ == :roof # fix in future revision. TO-DO.
       coll = {}
       area = 0
       film = 100000000000000
@@ -183,86 +187,81 @@ module TBD
              g[:op].downcase == "all floor constructions"
 
       if g[:op].empty?
-        log(ERR, "Construction to uprate? (#{mth})")
+        log(ERR, "Construction (#{type}) to uprate? (#{mth})")
       elsif all
-        model.getSurfaces.each do |sss|
-          next unless sss.surfaceType.downcase.include?(label.to_s)
-          next unless sss.outsideBoundaryCondition.downcase == "outdoors"
-          next     if sss.construction.empty?
-          next     if sss.construction.get.to_LayeredConstruction.empty?
-
-          c         = sss.construction.get.to_LayeredConstruction.get
-          i         = c.nameString
-
-          # Reliable unless referenced by other surface types e.g. floor vs wall.
-          if c.getNetArea > area
-            area = c.getNetArea
+        s.each do |nom, surface|
+          next unless surface.key?(:deratable   )
+          next unless surface.key?(:type        )
+          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           )
+          next unless surface[:deratable   ]
+          next unless surface[:type        ] == typ
+          next unless surface[:construction].is_a?(cl3)
+          next     if surface[:index       ].nil?
+
+          # Retain lowest surface film resistance (e.g. tilted surfaces).
+          c    = surface[:construction]
+          i    = c.nameString
+          aire = c.getNetArea
+          film = surface[:filmRSI] if surface[:filmRSI] < film
+
+          # Retain construction covering largest area. The following conditional
+          # is reliable UNLESS linked to other deratable surface types e.g. both
+          # floors AND walls (see "elsif lc" corrections below).
+          if aire > area
             lc   = c
+            area = aire
             id   = i
           end
 
-          film    = sss.filmResistance if sss.filmResistance < film
-          nom     = sss.nameString
-          coll[i] = { area: c.getNetArea, lc: c, s: {} } unless coll.key?(i)
-          coll[i][:s][nom] = { a: sss.netArea } unless coll[i][:s].key?(nom)
+          coll[i]          = { area: aire, lc: c, s: {} } unless coll.key?(i)
+          coll[i][:s][nom] = { a: surface[:net] }  unless coll[i][:s].key?(nom)
         end
       else
         id = g[:op]
-        c  = model.getConstructionByName(id)
-
-        if c.empty?
-          log(ERR, "Construction '#{id}'? (#{mth})")
-        else
-          c  = c.get.to_LayeredConstruction
-
-          if c.empty?
-            log(ERR, "'#{id}' layered construction? (#{mth})")
-          else
-            lc       = c.get
-            area     = lc.getNetArea
-            coll[id] = { area: area, lc: lc, s: {} }
-
-            model.getSurfaces.each do |sss|
-              next unless sss.surfaceType.downcase.include?(label.to_s)
-              next unless sss.outsideBoundaryCondition.downcase == "outdoors"
-              next     if sss.construction.empty?
-              next     if sss.construction.get.to_LayeredConstruction.empty?
-              lc   = sss.construction.get.to_LayeredConstruction.get
-              next unless id == lc.nameString
-              nom  = sss.nameString
-              film = sss.filmResistance if sss.filmResistance < film
-              ok   = coll[id][:s].key?(nom)
-              coll[id][:s][nom] = { a: sss.netArea } unless ok
-            end
-          end
+        lc = model.getConstructionByName(id)
+        log(ERR, "Construction '#{id}'? (#{mth})")         if lc.empty?
+        next                                               if lc.empty?
+
+        lc = lc.get.to_LayeredConstruction
+        log(ERR, "'#{id}' layered construction? (#{mth})") if lc.empty?
+        next                                               if lc.empty?
+
+        lc       = lc.get
+        area     = lc.getNetArea
+        coll[id] = { area: area, lc: lc, s: {} }
+
+        s.each do |nom, surface|
+          next unless surface.key?(:deratable   )
+          next unless surface.key?(:type        )
+          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           )
+          next unless surface[:deratable   ]
+          next unless surface[:type        ] == typ
+          next unless surface[:construction].is_a?(cl3)
+          next     if surface[:index       ].nil?
+
+          i = surface[:construction].nameString
+          next unless i == id
+
+          # Retain lowest surface film resistance (e.g. tilted surfaces).
+          film = surface[:filmRSI] if surface[:filmRSI] < film
+
+          coll[i][:s][nom] = { a: surface[:net] } unless coll[i][:s].key?(nom)
         end
       end
 
       if coll.empty?
-        log(ERR, "No #{label} construction to uprate - skipping (#{mth})")
+        log(ERR, "No #{type} construction to uprate - skipping (#{mth})")
         next
-      elsif lc                    # valid layered construction - good to uprate!
-        # Ensure lc is referenced by surface types == label.
-        model.getSurfaces.each do |sss|
-          next if sss.construction.empty?
-          next if sss.construction.get.to_LayeredConstruction.empty?
-          c = sss.construction.get.to_LayeredConstruction.get
-          i = c.nameString
-          next unless coll.key?(i)
-
-          unless sss.surfaceType.downcase.include?(label.to_s)
-            log(ERR, "Uprating #{label.to_s}, not '#{sss.nameString}' (#{mth})")
-            cloned = c.clone(model).to_LayeredConstruction.get
-            cloned.setName("'#{i}' cloned")
-            sss.setConstruction(cloned)
-            ok = s.key?(sss.nameString)
-            s[sss.nameString][:construction] = cloned                      if ok
-            coll[i][:s].delete(sss.nameString)
-            coll[i][:area] = c.getNetArea
-            next
-          end
-        end
-
+      elsif lc
+        # Valid layered construction - good to uprate!
         lyr         = insulatingLayer(lc)
         lyr[:index] = nil unless lyr[:index].is_a?(Numeric)
         lyr[:index] = nil unless lyr[:index] >= 0
@@ -270,64 +269,81 @@ module TBD
 
         log(ERR, "Insulation index for '#{id}'? (#{mth})")    unless lyr[:index]
         next                                                  unless lyr[:index]
-        hloss = 0                    # sum of applicable psi & khi effects [W/K]
 
-        coll.each do |i, col|
-          next unless col.key?(:s)
-          next unless col.is_a?(Hash)
+        # Ensure lc is exclusively linked to deratable surfaces of right type.
+        # If not, assign new lc clone to non-targeted surfaces.
+        s.each do |nom, surface|
+          next unless surface.key?(:type        )
+          next unless surface.key?(:deratable   )
+          next unless surface.key?(:construction)
+          next unless surface[:construction].is_a?(cl3)
+          next unless surface[:construction] == lc
+
+          ok = true
+          ok = false unless surface[:type     ] == typ
+          ok = false unless surface[:deratable]
+          ok = false unless coll.key?(id)
+          ok = false unless coll[id][:s].key?(nom)
+
+          unless ok
+            log(WRN, "Cloning '#{nom}' construction - not '#{id}' (#{mth})")
+            sss    = model.getSurfaceByName(nom)
+            next if sss.empty?
+
+            sss    = sss.get
+            cloned = lc.clone(model).to_LayeredConstruction.get
+            cloned.setName("#{nom} - cloned")
+            sss.setConstruction(cloned)
+            surface[:construction] = cloned
+            coll[id][:s].delete(nom)
+          end
+        end
+
+        hloss           = 0          # sum of applicable psi & khi effects [W/K]
 
+        # Tally applicable psi + khi losses. Possible construction reassignment.
+        coll.each do |i, col|
           col[:s].keys.each do |nom|
             next unless s.key?(nom)
-            next unless s[nom].key?(:deratable   )
             next unless s[nom].key?(:construction)
             next unless s[nom].key?(:index       )
             next unless s[nom].key?(:ltype       )
             next unless s[nom].key?(:r           )
-            next unless s[nom].key?(:type        )
-
-            next unless s[nom][:deratable]
-            type = s[nom][:type].to_s.downcase
-            type = "roof" if type == "ceiling"
-            next unless type.include?(label.to_s)
 
             # Tally applicable psi + khi.
-            hloss += s[nom][:heatloss] if s[nom].key?(:heatloss)
-
-            # Skip construction reassignment if already referencing right one.
-            unless s[nom][:construction] == lc
-              sss = model.getSurfaceByName(nom)
-              next if sss.empty?
-              sss = sss.get
-
-              if sss.isConstructionDefaulted
-                set = defaultConstructionSet(model, sss)
-                constructions = set.defaultExteriorSurfaceConstructions.get
-
-                case sss.surfaceType.downcase
-                when "roofceiling"
-                  constructions.setRoofCeilingConstruction(lc)
-                when "floor"
-                  constructions.setFloorConstruction(lc)
-                else
-                  constructions.setWallConstruction(lc)
-                end
-              else
-                sss.setConstruction(lc)
-              end
+            hloss += s[nom][:heatloss    ] if s[nom].key?(:heatloss)
+            next  if s[nom][:construction] == lc
+
+            # Reassign construction unless referencing lc.
+            sss = model.getSurfaceByName(nom)
+            next if sss.empty?
 
-              s[nom][:construction] = lc                 # reset TBD attributes
-              s[nom][:index       ] = lyr[:index]
-              s[nom][:ltype       ] = lyr[:type ]
-              s[nom][:r           ] = lyr[:r    ]        # temporary
+            sss = sss.get
+
+            if sss.isConstructionDefaulted
+              set = defaultConstructionSet(model, sss) # building? story?
+              constructions = set.defaultExteriorSurfaceConstructions
+
+              unless constructions.empty?
+                constructions = constructions.get
+                constructions.setWallConstruction(lc)        if typ == :wall
+                constructions.setFloorConstruction(lc)       if typ == :floor
+                constructions.setRoofCeilingConstruction(lc) if typ == :ceiling
+              end
+            else
+              sss.setConstruction(lc)
             end
+
+            s[nom][:construction] = lc                 # reset TBD attributes
+            s[nom][:index       ] = lyr[:index]
+            s[nom][:ltype       ] = lyr[:type ]
+            s[nom][:r           ] = lyr[:r    ]        # temporary
           end
         end
 
         # Merge to ensure a single entry for coll Hash.
         coll.each do |i, col|
           next if i == id
-          next unless coll.key?(id)
-          coll[id][:area] += col[:area]
 
           col[:s].each do |nom, sss|
             coll[id][:s][nom] = sss unless coll[id][:s].key?(nom)
@@ -338,6 +354,8 @@ module TBD
         log(DBG, "Collection == 1? for '#{id}' (#{mth})")  unless coll.size == 1
         next                                               unless coll.size == 1
 
+        area = lc.getNetArea
+        coll[id][:area] = area
         res = uo(model, lc, id, hloss, film, g[:ut])
         log(ERR, "Unable to uprate '#{id}' (#{mth})") unless res[:uo] && res[:m]
         next                                          unless res[:uo] && res[:m]
@@ -347,27 +365,18 @@ module TBD
         # Loop through coll :s, and reset :r - likely modified by uo().
         coll.values.first[:s].keys.each do |nom|
           next unless s.key?(nom)
-          next unless s[nom].key?(:deratable   )
-          next unless s[nom].key?(:construction)
-          next unless s[nom].key?(:index       )
-          next unless s[nom].key?(:ltype       )
-          next unless s[nom].key?(:type        )
-
-          next unless s[nom][:deratable   ]
-          next unless s[nom][:construction] == lc
-          next unless s[nom][:index       ] == lyr[:index]
-          next unless s[nom][:ltype       ] == lyr[:type]
-
-          type = s[nom][:type].to_s.downcase
-          type = "roof" if type == "ceiling"
-          next unless type.include?(label.to_s)
-          next unless s[nom].key?(:r)
-          s[nom][:r] = lyr[:r]                                           # final
+          next unless s[nom].key?(:index)
+          next unless s[nom].key?(:ltype)
+          next unless s[nom].key?(:r    )
+          next unless s[nom][:index] == lyr[:index]
+          next unless s[nom][:ltype] == lyr[:type ]
+
+          s[nom][:r] = lyr[:r]  # uprated insulating RSi factor, before derating
         end
 
-        argh[:wall_uo ] = res[:uo] if label == :wall
-        argh[:roof_uo ] = res[:uo] if label == :roof
-        argh[:floor_uo] = res[:uo] if label == :floor
+        argh[:wall_uo ] = res[:uo] if typ == :wall
+        argh[:roof_uo ] = res[:uo] if typ == :ceiling
+        argh[:floor_uo] = res[:uo] if typ == :floor
       else
         log(ERR, "Nilled construction to uprate - (#{mth})")
         return false
@@ -920,7 +929,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.2.0"
+      report << "* TBD : v3.2.2"
       report << "* date : #{ua[:date]}"
 
       if lang == :en

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

@@ -1,3 +1,3 @@
 module Topolys
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/lib/tbd/geo.rb

@@ -292,28 +292,31 @@ module TBD
 
     return mismatch("model", model, cl1, mth)          unless model.is_a?(cl1)
     return mismatch("surface", surface, cl2, mth)      unless surface.is_a?(cl2)
-
-    return nil unless validate(surface)
+    return nil                                         unless validate(surface)
 
     nom    = surface.nameString
     surf   = {}
     subs   = {}
     fd     = false
     return   empty("'#{nom}' space", mth, ERR)           if surface.space.empty?
+
     space  = surface.space.get
     stype  = space.spaceType
     story  = space.buildingStory
     tr     = transforms(model, space)
     return   invalid("'#{nom}' transform", mth, 0, FTL)  unless tr[:t] && tr[:r]
+
     t      = tr[:t]
     n      = trueNormal(surface, tr[:r])
     return   invalid("'#{nom}' normal", mth, 0, FTL)     unless n
+
     type   = surface.surfaceType.downcase
     facing = surface.outsideBoundaryCondition
 
     if facing.downcase == "surface"
       empty = surface.adjacentSurface.empty?
-      return invalid("'#{nom}': adjacent surface", mth, 0, ERR)         if empty
+      return invalid("'#{nom}': adjacent surface", mth, 0, ERR) if empty
+
       facing = surface.adjacentSurface.get.nameString
     end
 
@@ -350,6 +353,7 @@ module TBD
     surf[:story      ] = story.get               unless story.empty?
     surf[:n          ] = n
     surf[:gross      ] = surface.grossArea
+    surf[:filmRSI    ] = surface.filmResistance
 
     surface.subSurfaces.sort_by { |s| s.nameString }.each do |s|
       next unless validate(s)

data/lib/tbd/psi.rb

@@ -975,8 +975,9 @@ module TBD
         end
       end
 
-      surface[:heating] = heat[:spt] if heat[:spt]  # if valid heating setpoints
-      surface[:cooling] = cool[:spt] if cool[:spt]  # if valid cooling setpoints
+      # Recover if valid setpoints.
+      surface[:heating] = heat[:spt] if heat && heat[:spt]
+      surface[:cooling] = cool[:spt] if cool && cool[:spt]
 
       tbd[:surfaces][s.nameString] = surface
     end                                            # (opaque) surfaces populated
@@ -1486,7 +1487,7 @@ module TBD
 
         edge[:surfaces].keys.each do |i|
           break     if is[:rimjoist] || is[:balcony]
-          break unless deratables.size == 2
+          break unless deratables.size > 0
           break     if floors.key?(id)
           next      if i == id
           next  unless floors.key?(i)

data/lib/tbd/ua.rb

@@ -39,13 +39,14 @@ module TBD
     cl1 = OpenStudio::Model::Model
     cl2 = OpenStudio::Model::LayeredConstruction
     cl3 = Numeric
+    cl4 = String
 
-    return mismatch("model", model, cl1, mth, DBG, res)  unless model.is_a?(cl1)
-    return mismatch("id", id, String, mth, DBG, res)     unless id.is_a?(String)
-    return mismatch("lc", lc, cl2, mth, DBG, res)        unless lc.is_a?(cl2)
-    return mismatch("hloss", hloss, cl3, mth, DBG, res)  unless hloss.is_a?(cl3)
-    return mismatch("film", film, cl3, mth, DBG, res)    unless film.is_a?(cl3)
-    return mismatch("Ut", ut, cl3, mth, DBG, res)        unless ut.is_a?(cl3)
+    return mismatch("model", model, cl1, mth, DBG, res) unless model.is_a?(cl1)
+    return mismatch("id"   ,    id, cl4, mth, DBG, res) unless id.is_a?(cl4)
+    return mismatch("lc"   ,    lc, cl2, mth, DBG, res) unless lc.is_a?(cl2)
+    return mismatch("hloss", hloss, cl3, mth, DBG, res) unless hloss.is_a?(cl3)
+    return mismatch("film" ,  film, cl3, mth, DBG, res) unless film.is_a?(cl3)
+    return mismatch("Ut"   ,    ut, cl3, mth, DBG, res) unless ut.is_a?(cl3)
 
     loss        = 0.0                   # residual heatloss (not assigned) [W/K]
     area        = lc.getNetArea
@@ -54,12 +55,12 @@ module TBD
     lyr[:index] = nil unless lyr[:index] >= 0
     lyr[:index] = nil unless lyr[:index] < lc.layers.size
 
-    return invalid("'#{id}' layer index", mth, 0, ERR, res)   unless lyr[:index]
-    return zero("'#{id}': heatloss", mth, WRN, res)           unless hloss > TOL
-    return zero("'#{id}': films", mth, WRN, res)              unless film > TOL
-    return zero("'#{id}': Ut", mth, WRN, res)                 unless ut > TOL
-    return invalid("'#{id}': Ut", mth, 0, WRN, res)           unless ut < 5.678
-    return zero("'#{id}': net area (m2)", mth, ERR, res)      unless area > TOL
+    return invalid("'#{id}' layer index", mth, 0, ERR, res) unless lyr[:index]
+    return zero("'#{id}': heatloss"     , mth,    WRN, res) unless hloss > TOL
+    return zero("'#{id}': films"        , mth,    WRN, res) unless film  > TOL
+    return zero("'#{id}': Ut"           , mth,    WRN, res) unless ut    > TOL
+    return invalid("'#{id}': Ut"        , mth, 0, WRN, res) unless ut    < 5.678
+    return zero("'#{id}': net area (m2)", mth,    ERR, res) unless area  > TOL
 
     # First, calculate initial layer RSi to initially meet Ut target.
     rt     = 1 / ut                      #                target construction Rt
@@ -76,7 +77,7 @@ module TBD
 
     if lyr[:type] == :massless
       m     = lc.getLayer(lyr[:index]).to_MasslessOpaqueMaterial
-      return  invalid("'#{id}' massless layer?", mth, 0)             if m.empty?
+      return  invalid("'#{id}' massless layer?", mth, 0, DBG, res)   if m.empty?
 
       m     = m.get.clone(model).to_MasslessOpaqueMaterial.get
               m.setName("#{id} uprated")
@@ -85,7 +86,7 @@ module TBD
               m.setThermalResistance(new_r)
     else # type == :standard
       m     = lc.getLayer(lyr[:index]).to_StandardOpaqueMaterial
-      return  invalid("'#{id}' standard layer?", mth, 0)             if m.empty?
+      return  invalid("'#{id}' standard layer?", mth, 0, DBG, res)   if m.empty?
 
       m     = m.get.clone(model).to_StandardOpaqueMaterial.get
               m.setName("#{id} uprated")
@@ -141,11 +142,12 @@ module TBD
     mth = "TBD::#{__callee__}"
     cl1 = OpenStudio::Model::Model
     cl2 = Hash
+    cl3 = OpenStudio::Model::LayeredConstruction
     a   = false
 
-    return mismatch("model", model, cl1, mth, DBG, a)    unless model.is_a?(cl1)
-    return mismatch("surfaces", s, cl2, mth, DBG, a)     unless s.is_a?(cl2)
-    return mismatch("argh", model, cl1, mth, DBG, a)     unless argh.is_a?(cl2)
+    return mismatch("model"   , model, cl1, mth, DBG, a) unless model.is_a?(cl1)
+    return mismatch("surfaces",     s, cl2, mth, DBG, a) unless s.is_a?(cl2)
+    return mismatch("argh"    , model, cl1, mth, DBG, a) unless argh.is_a?(cl2)
 
     argh[:uprate_walls ] = false unless argh.key?(:uprate_walls )
     argh[:uprate_roofs ] = false unless argh.key?(:uprate_roofs )
@@ -168,11 +170,13 @@ module TBD
     groups[:roof ][:op] = argh[:roof_option  ]
     groups[:floor][:op] = argh[:floor_option ]
 
-    groups.each do |label, g|
+    groups.each do |type, g|
       next unless g[:up]
       next unless g[:ut].is_a?(Numeric)
       next unless g[:ut] < 5.678
 
+      typ  = type
+      typ  = :ceiling if typ == :roof # fix in future revision. TO-DO.
       coll = {}
       area = 0
       film = 100000000000000
@@ -183,86 +187,81 @@ module TBD
              g[:op].downcase == "all floor constructions"
 
       if g[:op].empty?
-        log(ERR, "Construction to uprate? (#{mth})")
+        log(ERR, "Construction (#{type}) to uprate? (#{mth})")
       elsif all
-        model.getSurfaces.each do |sss|
-          next unless sss.surfaceType.downcase.include?(label.to_s)
-          next unless sss.outsideBoundaryCondition.downcase == "outdoors"
-          next     if sss.construction.empty?
-          next     if sss.construction.get.to_LayeredConstruction.empty?
-
-          c         = sss.construction.get.to_LayeredConstruction.get
-          i         = c.nameString
-
-          # Reliable unless referenced by other surface types e.g. floor vs wall.
-          if c.getNetArea > area
-            area = c.getNetArea
+        s.each do |nom, surface|
+          next unless surface.key?(:deratable   )
+          next unless surface.key?(:type        )
+          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           )
+          next unless surface[:deratable   ]
+          next unless surface[:type        ] == typ
+          next unless surface[:construction].is_a?(cl3)
+          next     if surface[:index       ].nil?
+
+          # Retain lowest surface film resistance (e.g. tilted surfaces).
+          c    = surface[:construction]
+          i    = c.nameString
+          aire = c.getNetArea
+          film = surface[:filmRSI] if surface[:filmRSI] < film
+
+          # Retain construction covering largest area. The following conditional
+          # is reliable UNLESS linked to other deratable surface types e.g. both
+          # floors AND walls (see "elsif lc" corrections below).
+          if aire > area
             lc   = c
+            area = aire
             id   = i
           end
 
-          film    = sss.filmResistance if sss.filmResistance < film
-          nom     = sss.nameString
-          coll[i] = { area: c.getNetArea, lc: c, s: {} } unless coll.key?(i)
-          coll[i][:s][nom] = { a: sss.netArea } unless coll[i][:s].key?(nom)
+          coll[i]          = { area: aire, lc: c, s: {} } unless coll.key?(i)
+          coll[i][:s][nom] = { a: surface[:net] }  unless coll[i][:s].key?(nom)
         end
       else
         id = g[:op]
-        c  = model.getConstructionByName(id)
-
-        if c.empty?
-          log(ERR, "Construction '#{id}'? (#{mth})")
-        else
-          c  = c.get.to_LayeredConstruction
-
-          if c.empty?
-            log(ERR, "'#{id}' layered construction? (#{mth})")
-          else
-            lc       = c.get
-            area     = lc.getNetArea
-            coll[id] = { area: area, lc: lc, s: {} }
-
-            model.getSurfaces.each do |sss|
-              next unless sss.surfaceType.downcase.include?(label.to_s)
-              next unless sss.outsideBoundaryCondition.downcase == "outdoors"
-              next     if sss.construction.empty?
-              next     if sss.construction.get.to_LayeredConstruction.empty?
-              lc   = sss.construction.get.to_LayeredConstruction.get
-              next unless id == lc.nameString
-              nom  = sss.nameString
-              film = sss.filmResistance if sss.filmResistance < film
-              ok   = coll[id][:s].key?(nom)
-              coll[id][:s][nom] = { a: sss.netArea } unless ok
-            end
-          end
+        lc = model.getConstructionByName(id)
+        log(ERR, "Construction '#{id}'? (#{mth})")         if lc.empty?
+        next                                               if lc.empty?
+
+        lc = lc.get.to_LayeredConstruction
+        log(ERR, "'#{id}' layered construction? (#{mth})") if lc.empty?
+        next                                               if lc.empty?
+
+        lc       = lc.get
+        area     = lc.getNetArea
+        coll[id] = { area: area, lc: lc, s: {} }
+
+        s.each do |nom, surface|
+          next unless surface.key?(:deratable   )
+          next unless surface.key?(:type        )
+          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           )
+          next unless surface[:deratable   ]
+          next unless surface[:type        ] == typ
+          next unless surface[:construction].is_a?(cl3)
+          next     if surface[:index       ].nil?
+
+          i = surface[:construction].nameString
+          next unless i == id
+
+          # Retain lowest surface film resistance (e.g. tilted surfaces).
+          film = surface[:filmRSI] if surface[:filmRSI] < film
+
+          coll[i][:s][nom] = { a: surface[:net] } unless coll[i][:s].key?(nom)
         end
       end
 
       if coll.empty?
-        log(ERR, "No #{label} construction to uprate - skipping (#{mth})")
+        log(ERR, "No #{type} construction to uprate - skipping (#{mth})")
         next
-      elsif lc                    # valid layered construction - good to uprate!
-        # Ensure lc is referenced by surface types == label.
-        model.getSurfaces.each do |sss|
-          next if sss.construction.empty?
-          next if sss.construction.get.to_LayeredConstruction.empty?
-          c = sss.construction.get.to_LayeredConstruction.get
-          i = c.nameString
-          next unless coll.key?(i)
-
-          unless sss.surfaceType.downcase.include?(label.to_s)
-            log(ERR, "Uprating #{label.to_s}, not '#{sss.nameString}' (#{mth})")
-            cloned = c.clone(model).to_LayeredConstruction.get
-            cloned.setName("'#{i}' cloned")
-            sss.setConstruction(cloned)
-            ok = s.key?(sss.nameString)
-            s[sss.nameString][:construction] = cloned                      if ok
-            coll[i][:s].delete(sss.nameString)
-            coll[i][:area] = c.getNetArea
-            next
-          end
-        end
-
+      elsif lc
+        # Valid layered construction - good to uprate!
         lyr         = insulatingLayer(lc)
         lyr[:index] = nil unless lyr[:index].is_a?(Numeric)
         lyr[:index] = nil unless lyr[:index] >= 0
@@ -270,64 +269,81 @@ module TBD
 
         log(ERR, "Insulation index for '#{id}'? (#{mth})")    unless lyr[:index]
         next                                                  unless lyr[:index]
-        hloss = 0                    # sum of applicable psi & khi effects [W/K]
 
-        coll.each do |i, col|
-          next unless col.key?(:s)
-          next unless col.is_a?(Hash)
+        # Ensure lc is exclusively linked to deratable surfaces of right type.
+        # If not, assign new lc clone to non-targeted surfaces.
+        s.each do |nom, surface|
+          next unless surface.key?(:type        )
+          next unless surface.key?(:deratable   )
+          next unless surface.key?(:construction)
+          next unless surface[:construction].is_a?(cl3)
+          next unless surface[:construction] == lc
+
+          ok = true
+          ok = false unless surface[:type     ] == typ
+          ok = false unless surface[:deratable]
+          ok = false unless coll.key?(id)
+          ok = false unless coll[id][:s].key?(nom)
+
+          unless ok
+            log(WRN, "Cloning '#{nom}' construction - not '#{id}' (#{mth})")
+            sss    = model.getSurfaceByName(nom)
+            next if sss.empty?
+
+            sss    = sss.get
+            cloned = lc.clone(model).to_LayeredConstruction.get
+            cloned.setName("#{nom} - cloned")
+            sss.setConstruction(cloned)
+            surface[:construction] = cloned
+            coll[id][:s].delete(nom)
+          end
+        end
+
+        hloss           = 0          # sum of applicable psi & khi effects [W/K]
 
+        # Tally applicable psi + khi losses. Possible construction reassignment.
+        coll.each do |i, col|
           col[:s].keys.each do |nom|
             next unless s.key?(nom)
-            next unless s[nom].key?(:deratable   )
             next unless s[nom].key?(:construction)
             next unless s[nom].key?(:index       )
             next unless s[nom].key?(:ltype       )
             next unless s[nom].key?(:r           )
-            next unless s[nom].key?(:type        )
-
-            next unless s[nom][:deratable]
-            type = s[nom][:type].to_s.downcase
-            type = "roof" if type == "ceiling"
-            next unless type.include?(label.to_s)
 
             # Tally applicable psi + khi.
-            hloss += s[nom][:heatloss] if s[nom].key?(:heatloss)
-
-            # Skip construction reassignment if already referencing right one.
-            unless s[nom][:construction] == lc
-              sss = model.getSurfaceByName(nom)
-              next if sss.empty?
-              sss = sss.get
-
-              if sss.isConstructionDefaulted
-                set = defaultConstructionSet(model, sss)
-                constructions = set.defaultExteriorSurfaceConstructions.get
-
-                case sss.surfaceType.downcase
-                when "roofceiling"
-                  constructions.setRoofCeilingConstruction(lc)
-                when "floor"
-                  constructions.setFloorConstruction(lc)
-                else
-                  constructions.setWallConstruction(lc)
-                end
-              else
-                sss.setConstruction(lc)
-              end
+            hloss += s[nom][:heatloss    ] if s[nom].key?(:heatloss)
+            next  if s[nom][:construction] == lc
+
+            # Reassign construction unless referencing lc.
+            sss = model.getSurfaceByName(nom)
+            next if sss.empty?
 
-              s[nom][:construction] = lc                 # reset TBD attributes
-              s[nom][:index       ] = lyr[:index]
-              s[nom][:ltype       ] = lyr[:type ]
-              s[nom][:r           ] = lyr[:r    ]        # temporary
+            sss = sss.get
+
+            if sss.isConstructionDefaulted
+              set = defaultConstructionSet(model, sss) # building? story?
+              constructions = set.defaultExteriorSurfaceConstructions
+
+              unless constructions.empty?
+                constructions = constructions.get
+                constructions.setWallConstruction(lc)        if typ == :wall
+                constructions.setFloorConstruction(lc)       if typ == :floor
+                constructions.setRoofCeilingConstruction(lc) if typ == :ceiling
+              end
+            else
+              sss.setConstruction(lc)
             end
+
+            s[nom][:construction] = lc                 # reset TBD attributes
+            s[nom][:index       ] = lyr[:index]
+            s[nom][:ltype       ] = lyr[:type ]
+            s[nom][:r           ] = lyr[:r    ]        # temporary
           end
         end
 
         # Merge to ensure a single entry for coll Hash.
         coll.each do |i, col|
           next if i == id
-          next unless coll.key?(id)
-          coll[id][:area] += col[:area]
 
           col[:s].each do |nom, sss|
             coll[id][:s][nom] = sss unless coll[id][:s].key?(nom)
@@ -338,6 +354,8 @@ module TBD
         log(DBG, "Collection == 1? for '#{id}' (#{mth})")  unless coll.size == 1
         next                                               unless coll.size == 1
 
+        area = lc.getNetArea
+        coll[id][:area] = area
         res = uo(model, lc, id, hloss, film, g[:ut])
         log(ERR, "Unable to uprate '#{id}' (#{mth})") unless res[:uo] && res[:m]
         next                                          unless res[:uo] && res[:m]
@@ -347,27 +365,18 @@ module TBD
         # Loop through coll :s, and reset :r - likely modified by uo().
         coll.values.first[:s].keys.each do |nom|
           next unless s.key?(nom)
-          next unless s[nom].key?(:deratable   )
-          next unless s[nom].key?(:construction)
-          next unless s[nom].key?(:index       )
-          next unless s[nom].key?(:ltype       )
-          next unless s[nom].key?(:type        )
-
-          next unless s[nom][:deratable   ]
-          next unless s[nom][:construction] == lc
-          next unless s[nom][:index       ] == lyr[:index]
-          next unless s[nom][:ltype       ] == lyr[:type]
-
-          type = s[nom][:type].to_s.downcase
-          type = "roof" if type == "ceiling"
-          next unless type.include?(label.to_s)
-          next unless s[nom].key?(:r)
-          s[nom][:r] = lyr[:r]                                           # final
+          next unless s[nom].key?(:index)
+          next unless s[nom].key?(:ltype)
+          next unless s[nom].key?(:r    )
+          next unless s[nom][:index] == lyr[:index]
+          next unless s[nom][:ltype] == lyr[:type ]
+
+          s[nom][:r] = lyr[:r]  # uprated insulating RSi factor, before derating
         end
 
-        argh[:wall_uo ] = res[:uo] if label == :wall
-        argh[:roof_uo ] = res[:uo] if label == :roof
-        argh[:floor_uo] = res[:uo] if label == :floor
+        argh[:wall_uo ] = res[:uo] if typ == :wall
+        argh[:roof_uo ] = res[:uo] if typ == :ceiling
+        argh[:floor_uo] = res[:uo] if typ == :floor
       else
         log(ERR, "Nilled construction to uprate - (#{mth})")
         return false
@@ -920,7 +929,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.2.0"
+      report << "* TBD : v3.2.2"
       report << "* date : #{ua[:date]}"
 
       if lang == :en

data/lib/tbd/version.rb

@@ -21,5 +21,5 @@
 # SOFTWARE.
 
 module TBD
-  VERSION = "3.2.0".freeze
+  VERSION = "3.2.2".freeze
 end

data/lib/tbd.rb

@@ -26,38 +26,38 @@ begin
   # Try to load from the Topolys gem.
   require "topolys"
 
-  puts "... relying on the Topolys gem"
+  # puts "... relying on the Topolys gem"
 rescue LoadError
   require_relative "topolys/model"
   require_relative "topolys/geometry"
   require_relative "topolys/transformation"
   require_relative "topolys/version"
 
-  puts "... fallback to local Topolys files"
+  # puts "... fallback to local Topolys files"
 end
 
 begin
   # Try to load from the OSlg gem.
   require "oslg"
 
-  puts "... relying on the OSlg gem"
+  # puts "... relying on the OSlg gem"
 rescue LoadError
   require_relative "oslg/oslog"
   require_relative "osut/version"
 
-  puts "... fallback to local OSlg files"
+  # puts "... fallback to local OSlg files"
 end
 
 begin
   # Try to load from the OSut gem.
   require "osut"
 
-  puts "... relying on the OSut gem"
+  # puts "... relying on the OSut gem"
 rescue LoadError
   require_relative "osut/utils"
   require_relative "osut/version"
 
-  puts "... fallback to local OSut files"
+  # puts "... fallback to local OSut files"
 end
 
 begin
@@ -67,14 +67,14 @@ begin
   require "tbd/ua"
   require "tbd/version"
 
-  puts "... relying on the TBD gem"
+  # puts "... relying on the TBD gem"
 rescue LoadError
   require_relative "tbd/psi"
   require_relative "tbd/geo"
   require_relative "tbd/ua"
   require_relative "tbd/version"
 
-  puts "... fallback to local TBD files"
+  # puts "... fallback to local TBD files"
 end
 
 module TBD

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tbd
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.2
 platform: ruby
 authors:
 - Denis Bourgeois & Dan Macumber
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-17 00:00:00.000000000 Z
+date: 2023-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: topolys
@@ -161,7 +161,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/rd2/tbd
-  source_code_uri: https://github.com/rd2/tbd/tree/v3.2.0
+  source_code_uri: https://github.com/rd2/tbd/tree/v3.2.2
   bug_tracker_uri: https://github.com/rd2/tbd/issues
 post_install_message:
 rdoc_options: []