tbd 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5922a435bc3f8d97b6aa78588346e59108b6455d27c72e0aeecdd792079f33f
-  data.tar.gz: 5f683e96a3f1c33e0bb782bbb545b713d9d55beaf2359d3983f9b4d010716ce0
+  metadata.gz: fff7235e8a345417b5d6885b6b131f8a3ec91cdcad6cf06a691a5455ad04c842
+  data.tar.gz: 89b326a95347bcaf4415b6c5643e2ae0841aae2e238cdfc6326bc069fdff1134
 SHA512:
-  metadata.gz: 7284058dc4ec681c102435484b8af994fd027ea666aa4ed760f0e178cfcef297de033454c0a2c7cd60c95f13b71308bdcc6c4fa0a846819ec92edaa46007af08
-  data.tar.gz: 78e74d0942d5ad735c9b696c5cdaa72b5ad8a92fbf34a3c8843e41dce41f1de0eddfda3b53ef8db08c3f9c87a73b92b3ad8bb89400a58283c1805d7d660d83f7
+  metadata.gz: c38bdf41f39fccaaed05642f7d4b8e24f13833a120c9b4af152399a9b796a3594574961745de4728e4f4261a75567fb46b4e953ef061453cec94f413ec26583f
+  data.tar.gz: f4844f96093b176796d1c89c3af61dd8473c6417d1305a64b84abf96eee1328357ff6d34cd2726a4e6bd3617f45ca80c4a6af2309f63772f1acd2dc4dbfc15cb

data/.github/workflows/pull_request.yml

@@ -3,11 +3,11 @@ name: Pull Request CI
 on:
   pull_request:
     branches:
-      - master
+      - develop
 
 jobs:
   test_300x:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - name: Check out repository
       uses: actions/checkout@v2
@@ -23,7 +23,7 @@ jobs:
         docker exec -t test bundle exec rake
         docker kill test
   test_321x:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - name: Check out repository
       uses: actions/checkout@v2
@@ -39,7 +39,7 @@ jobs:
         docker exec -t test bundle exec rake
         docker kill test
   test_330x:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - name: Check out repository
       uses: actions/checkout@v2
@@ -55,7 +55,7 @@ jobs:
         docker exec -t test bundle exec rake
         docker kill test
   test_340x:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - name: Check out repository
       uses: actions/checkout@v2

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>65ac80d9-ef1e-4c41-9a62-68e2e1e6c5db</version_id>
-  <version_modified>20220918T225251Z</version_modified>
+  <version_id>3e0bc642-b37c-488f-96d5-e73f4c6d432b</version_id>
+  <version_modified>20221020T205858Z</version_modified>
   <xml_checksum>99772807</xml_checksum>
   <class_name>TBDMeasure</class_name>
   <display_name>Thermal Bridging and Derating - TBD</display_name>
@@ -432,12 +432,6 @@
       <usage_type>test</usage_type>
       <checksum>6ED9AF88</checksum>
     </file>
-    <file>
-      <filename>psi.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>655E8232</checksum>
-    </file>
     <file>
       <filename>README.md</filename>
       <filetype>md</filetype>
@@ -445,16 +439,22 @@
       <checksum>36FA11E3</checksum>
     </file>
     <file>
-      <filename>geo.rb</filename>
+      <filename>ua.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>8A794826</checksum>
+      <checksum>7264CA34</checksum>
     </file>
     <file>
-      <filename>ua.rb</filename>
+      <filename>psi.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>F31F865A</checksum>
+    </file>
+    <file>
+      <filename>geo.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>7873E62A</checksum>
+      <checksum>D999D942</checksum>
     </file>
   </files>
 </measure>

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

@@ -84,20 +84,21 @@ module TBD
   # vertices and wire.
   #
   # @param model [Topolys::Model] a model
-  # @param pts [Array] a 1D array of 3D Topolys points (min 2x)
+  # @param pts [Array] a 1D array of 3D Topolys points (min 3x)
   #
   # @return [Hash] vx: 3D Topolys vertices Array; w: corresponding Topolys::Wire
   # @return [Hash] vx: nil; w: nil (if invalid input)
   def objects(model = nil, pts = [])
-    mth = "OSut::#{__callee__}"
+    mth = "TBD::#{__callee__}"
     cl  = Topolys::Model
     obj = { vx: nil, w: nil }
 
     return mismatch("model", model, cl, mth, DBG, obj)   unless model.is_a?(cl)
     return mismatch("points", pts, Array, mth, DBG, obj) unless pts.is_a?(Array)
 
-    log(DBG, "#{pts.size}? need +2 Topolys points (#{mth})") unless pts.size > 2
+    log(DBG, "#{pts.size}? need +3 Topolys points (#{mth})") unless pts.size > 2
     return obj                                               unless pts.size > 2
+
     obj[:vx] = model.get_vertices(pts)
     obj[:w ] = model.get_wire(obj[:vx])
 
@@ -109,14 +110,14 @@ module TBD
   # As a side effect, it will - if successful - also populate a Topolys 'model'
   # with Topolys vertices, wires, holes. In rare cases such as domes of tubular
   # daylighting devices (TDDs), kids may be 'unhinged', i.e. not on same 3D
-  # plane as 'dad(s)' - TBD corrects auch cases elsewhere.
+  # plane as 'dad(s)' - TBD corrects such cases elsewhere.
   #
   # @param model [Topolys::Model] a model
   # @param boys [Hash] a collection of TBD subsurfaces
   #
   # @return [Array] 3D Topolys wires of 'holes' (made by kids)
   def kids(model = nil, boys = {})
-    mth = "OSut::#{__callee__}"
+    mth = "TBD::#{__callee__}"
     cl  = Topolys::Model
     holes = []
 
@@ -146,7 +147,7 @@ module TBD
   #
   # @return [Array] 3D Topolys wires of 'holes' (made by kids)
   def dads(model = nil, pops = {})
-    mth   = "OSut::#{__callee__}"
+    mth   = "TBD::#{__callee__}"
     cl    = Topolys::Model
     holes = {}
 
@@ -183,7 +184,7 @@ module TBD
   # @return [Bool] true if successful
   # @return [Bool] false if invalid input
   def faces(s = {}, e = {})
-    mth = "OSut::#{__callee__}"
+    mth = "TBD::#{__callee__}"
 
     return mismatch("surfaces", s, Hash, mth, DBG, false)   unless s.is_a?(Hash)
     return mismatch("edges", e, Hash, mth, DBG, false)      unless e.is_a?(Hash)
@@ -211,6 +212,42 @@ module TBD
     true
   end
 
+  ##
+  # Validate whether an OpenStudio planar surface is safe for TBD to process.
+  #
+  # @param s [OpenStudio::Model::PlanarSurface] a surface
+  #
+  # @return [Bool] true if valid surface
+  def validate(s = nil)
+    mth = "TBD::#{__callee__}"
+    cl = OpenStudio::Model::PlanarSurface
+
+    return mismatch("surface", s, cl, mth, DBG, false)        unless s.is_a?(cl)
+
+    id   = s.nameString
+    size = s.vertices.size
+    last = size - 1
+
+    log(ERR, "#{id} #{size} vertices? need +3 (#{mth})")         unless size > 2
+    return false                                                 unless size > 2
+
+    [0, last].each do |i|
+      v1 = s.vertices[i]
+      v2 = s.vertices[i + 1]                                    unless i == last
+      v2 = s.vertices.first                                         if i == last
+      vector = v2 - v1
+      bad = vector.length < TOL
+
+      # As is, this comparison also catches collinear vertices (< 10mm apart)
+      # along an edge. Should avoid red-flagging such cases. TO DO.
+      log(ERR, "#{id}: < #{TOL}m (#{mth})")                               if bad
+      return false                                                        if bad
+    end
+
+    # Add as many extra tests as needed ...
+    true
+  end
+
   ##
   # Return site-specific (or true) Topolys normal vector of OpenStudio surface.
   #
@@ -250,6 +287,8 @@ 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)
+
     nom    = surface.nameString
     surf   = {}
     subs   = {}
@@ -307,6 +346,8 @@ module TBD
     surf[:gross      ] = surface.grossArea
 
     surface.subSurfaces.sort_by { |s| s.nameString }.each do |s|
+      next unless validate(s)
+
       id       = s.nameString
       valid    = s.vertices.size == 3 || s.vertices.size == 4
       log(ERR, "Skipping '#{id}': vertex # 3 or 4 (#{mth})")        unless valid
@@ -334,7 +375,7 @@ module TBD
       log(ERR, "Skipping '#{id}': missing construction (#{mth})")    if c.empty?
       next                                                           if c.empty?
       c = c.get.to_LayeredConstruction
-      log(ERR, "Skipping '#{id}': must be a #{cl3} (#{mth})")        if c.empty?
+      log(WRN, "Skipping '#{id}': subs limited to #{cl3} (#{mth})")  if c.empty?
       next                                                           if c.empty?
       c = c.get
 
@@ -630,7 +671,7 @@ module TBD
         end
 
         foundation = OpenStudio::Model::FoundationKiva.new(model)
-        foundation.setName("KIVA Foundation Floor '#{id}'")
+        foundation.setName("KIVA Foundation Floor #{id}")
 
         floor = model.getSurfaceByName(id)
         kiva  = false if floor.empty?

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

@@ -844,7 +844,7 @@ module TBD
       up   = ""
       up   = "uprated "                     if m.nameString.include?(" uprated")
       m    = m.clone(model).to_MasslessOpaqueMaterial.get
-             m.setName("'#{id}' #{up}m tbd")
+             m.setName("#{id} #{up}m tbd")
       de_r = 0.001                                           unless de_r > 0.001
       loss = (de_u - 1 / de_r) * s[:net]                     unless de_r > 0.001
              m.setThermalResistance(de_r)
@@ -855,7 +855,7 @@ module TBD
       up   = ""
       up   = "uprated "                     if m.nameString.include?(" uprated")
       m    = m.clone(model).to_StandardOpaqueMaterial.get
-             m.setName("'#{id}' #{up}m tbd")
+             m.setName("#{id} #{up}m tbd")
       k    = m.thermalConductivity
 
       if de_r > 0.001
@@ -1105,6 +1105,10 @@ module TBD
       horizontal = dz.abs < TOL
       vertical   = dx < TOL && dy < TOL
       edge_V     = terminal - origin
+
+      invalid("1x edge length < TOL", mth, 0, ERROR) if edge_V.magnitude < TOL
+      next                                           if edge_V.magnitude < TOL
+
       edge_plane = Topolys::Plane3D.new(origin, edge_V)
 
       if vertical
@@ -1120,71 +1124,77 @@ module TBD
         # Loop through each linked wire and determine farthest point from
         # edge while ensuring candidate point is not aligned with edge.
         t_model.wires.each do |wire|
-          if surface[:wire] == wire.id          # there should be a unique match
-            normal     = tbd[:surfaces][id][:n]   if tbd[:surfaces].key?(id)
-            normal     = holes[id].attributes[:n] if holes.key?(id)
-            normal     = shades[id][:n]           if shades.key?(id)
-            farthest   = Topolys::Point3D.new(origin.x, origin.y, origin.z)
-            farthest_V = farthest - origin           # zero magnitude, initially
-            inverted   = false
-            i_origin   = wire.points.index(origin)
-            i_terminal = wire.points.index(terminal)
-            i_last     = wire.points.size - 1
-
-            if i_terminal == 0
-              inverted = true unless i_origin == i_last
-            elsif i_origin == i_last
-              inverted = true unless i_terminal == 0
+          next unless surface[:wire] == wire.id       # should be a unique match
+          normal     = tbd[:surfaces][id][:n]   if tbd[:surfaces].key?(id)
+          normal     = holes[id].attributes[:n] if holes.key?(id)
+          normal     = shades[id][:n]           if shades.key?(id)
+          farthest   = Topolys::Point3D.new(origin.x, origin.y, origin.z)
+          farthest_V = farthest - origin             # zero magnitude, initially
+          inverted   = false
+          i_origin   = wire.points.index(origin)
+          i_terminal = wire.points.index(terminal)
+          i_last     = wire.points.size - 1
+
+          if i_terminal == 0
+            inverted = true unless i_origin == i_last
+          elsif i_origin == i_last
+            inverted = true unless i_terminal == 0
+          else
+            inverted = true unless i_terminal - i_origin == 1
+          end
+
+          wire.points.each do |point|
+            next if point == origin
+            next if point == terminal
+
+            point_on_plane    = edge_plane.project(point)
+            origin_point_V    = point_on_plane - origin
+            point_V_magnitude = origin_point_V.magnitude
+            next unless point_V_magnitude > TOL
+
+            # Generate a plane between origin, terminal & point. Only consider
+            # planes that share the same normal as wire.
+            if inverted
+              plane = Topolys::Plane3D.from_points(terminal, origin, point)
             else
-              inverted = true unless i_terminal - i_origin == 1
+              plane = Topolys::Plane3D.from_points(origin, terminal, point)
             end
 
-            wire.points.each do |point|
-              next if point == origin
-              next if point == terminal
-              point_on_plane = edge_plane.project(point)
-              origin_point_V = point_on_plane - origin
-              point_V_magnitude = origin_point_V.magnitude
-              next unless point_V_magnitude > TOL
-
-              # Generate a plane between origin, terminal & point. Only consider
-              # planes that share the same normal as wire.
-              if inverted
-                plane = Topolys::Plane3D.from_points(terminal, origin, point)
-              else
-                plane = Topolys::Plane3D.from_points(origin, terminal, point)
-              end
+            next unless (normal.x - plane.normal.x).abs < TOL &&
+                        (normal.y - plane.normal.y).abs < TOL &&
+                        (normal.z - plane.normal.z).abs < TOL
 
-              next unless (normal.x - plane.normal.x).abs < TOL &&
-                          (normal.y - plane.normal.y).abs < TOL &&
-                          (normal.z - plane.normal.z).abs < TOL
+            farther    = point_V_magnitude > farthest_V.magnitude
+            farthest   = point          if farther
+            farthest_V = origin_point_V if farther
+          end
 
-              farther    = point_V_magnitude > farthest_V.magnitude
-              farthest   = point          if farther
-              farthest_V = origin_point_V if farther
-            end
+          puts "ADDITION!!"                      if id == "ADDITION"
+          puts "#{reference_V} vs #{farthest_V}" if id == "ADDITION"
+
+          angle = reference_V.angle(farthest_V)
+          invalid("#{id} polar angle", mth, 0, ERROR, 0) if angle.nil?
+          angle = 0                                      if angle.nil?
 
-            angle = reference_V.angle(farthest_V)
-            adjust = false              # adjust angle [180°, 360°] if necessary
+          adjust = false              # adjust angle [180°, 360°] if necessary
 
-            if vertical
+          if vertical
+            adjust = true if east.dot(farthest_V) < -TOL
+          else
+            if north.dot(farthest_V).abs < TOL ||
+              (north.dot(farthest_V).abs - 1).abs < TOL
               adjust = true if east.dot(farthest_V) < -TOL
             else
-              if north.dot(farthest_V).abs < TOL ||
-                (north.dot(farthest_V).abs - 1).abs < TOL
-                adjust = true if east.dot(farthest_V) < -TOL
-              else
-                adjust = true if north.dot(farthest_V) < -TOL
-              end
+              adjust = true if north.dot(farthest_V) < -TOL
             end
-
-            angle = 2 * Math::PI - angle if adjust
-            angle -= 2 * Math::PI if (angle - 2 * Math::PI).abs < TOL
-            surface[:angle] = angle
-            farthest_V.normalize!
-            surface[:polar] = farthest_V
-            surface[:normal] = normal
           end
+
+          angle  = 2 * Math::PI - angle if adjust
+          angle -= 2 * Math::PI         if (angle - 2 * Math::PI).abs < TOL
+          surface[:angle ] = angle
+          farthest_V.normalize!
+          surface[:polar ] = farthest_V
+          surface[:normal] = normal
         end                           # end of edge-linked, surface-to-wire loop
       end                                      # end of edge-linked surface loop
 
@@ -1993,8 +2003,6 @@ module TBD
   #
   # @return [Bool] true if TBD Measure is successful
   def exit(runner = nil, argh = {})
-    mth  = "TBD::#{__callee__}"
-
     # Generated files target a design context ( >= WARN ) ... change TBD log
     # level for debugging purposes. By default, log status is set < DBG
     # while log level is set @INF.

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

@@ -174,7 +174,6 @@ module TBD
       area = 0
       film = 100000000000000
       lc   = nil
-      uo   = nil
       id   = ""
       all  = g[:op].downcase == "all wall constructions"  ||
              g[:op].downcase == "all roof constructions"  ||
@@ -236,7 +235,7 @@ module TBD
       end
 
       if coll.empty?
-        log(ERR, "No construction to uprate - skipping (#{mth})")
+        log(ERR, "No #{label} construction to uprate - skipping (#{mth})")
         next
       elsif lc                    # valid layered construction - good to uprate!
         # Ensure lc is referenced by surface types == label.
@@ -948,7 +947,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.0.2"
+      report << "* TBD : v3.0.3"
       report << "* date : #{ua[:date]}"
 
       if lang == :en

data/lib/tbd/geo.rb

@@ -84,20 +84,21 @@ module TBD
   # vertices and wire.
   #
   # @param model [Topolys::Model] a model
-  # @param pts [Array] a 1D array of 3D Topolys points (min 2x)
+  # @param pts [Array] a 1D array of 3D Topolys points (min 3x)
   #
   # @return [Hash] vx: 3D Topolys vertices Array; w: corresponding Topolys::Wire
   # @return [Hash] vx: nil; w: nil (if invalid input)
   def objects(model = nil, pts = [])
-    mth = "OSut::#{__callee__}"
+    mth = "TBD::#{__callee__}"
     cl  = Topolys::Model
     obj = { vx: nil, w: nil }
 
     return mismatch("model", model, cl, mth, DBG, obj)   unless model.is_a?(cl)
     return mismatch("points", pts, Array, mth, DBG, obj) unless pts.is_a?(Array)
 
-    log(DBG, "#{pts.size}? need +2 Topolys points (#{mth})") unless pts.size > 2
+    log(DBG, "#{pts.size}? need +3 Topolys points (#{mth})") unless pts.size > 2
     return obj                                               unless pts.size > 2
+
     obj[:vx] = model.get_vertices(pts)
     obj[:w ] = model.get_wire(obj[:vx])
 
@@ -109,14 +110,14 @@ module TBD
   # As a side effect, it will - if successful - also populate a Topolys 'model'
   # with Topolys vertices, wires, holes. In rare cases such as domes of tubular
   # daylighting devices (TDDs), kids may be 'unhinged', i.e. not on same 3D
-  # plane as 'dad(s)' - TBD corrects auch cases elsewhere.
+  # plane as 'dad(s)' - TBD corrects such cases elsewhere.
   #
   # @param model [Topolys::Model] a model
   # @param boys [Hash] a collection of TBD subsurfaces
   #
   # @return [Array] 3D Topolys wires of 'holes' (made by kids)
   def kids(model = nil, boys = {})
-    mth = "OSut::#{__callee__}"
+    mth = "TBD::#{__callee__}"
     cl  = Topolys::Model
     holes = []
 
@@ -146,7 +147,7 @@ module TBD
   #
   # @return [Array] 3D Topolys wires of 'holes' (made by kids)
   def dads(model = nil, pops = {})
-    mth   = "OSut::#{__callee__}"
+    mth   = "TBD::#{__callee__}"
     cl    = Topolys::Model
     holes = {}
 
@@ -183,7 +184,7 @@ module TBD
   # @return [Bool] true if successful
   # @return [Bool] false if invalid input
   def faces(s = {}, e = {})
-    mth = "OSut::#{__callee__}"
+    mth = "TBD::#{__callee__}"
 
     return mismatch("surfaces", s, Hash, mth, DBG, false)   unless s.is_a?(Hash)
     return mismatch("edges", e, Hash, mth, DBG, false)      unless e.is_a?(Hash)
@@ -211,6 +212,42 @@ module TBD
     true
   end
 
+  ##
+  # Validate whether an OpenStudio planar surface is safe for TBD to process.
+  #
+  # @param s [OpenStudio::Model::PlanarSurface] a surface
+  #
+  # @return [Bool] true if valid surface
+  def validate(s = nil)
+    mth = "TBD::#{__callee__}"
+    cl = OpenStudio::Model::PlanarSurface
+
+    return mismatch("surface", s, cl, mth, DBG, false)        unless s.is_a?(cl)
+
+    id   = s.nameString
+    size = s.vertices.size
+    last = size - 1
+
+    log(ERR, "#{id} #{size} vertices? need +3 (#{mth})")         unless size > 2
+    return false                                                 unless size > 2
+
+    [0, last].each do |i|
+      v1 = s.vertices[i]
+      v2 = s.vertices[i + 1]                                    unless i == last
+      v2 = s.vertices.first                                         if i == last
+      vector = v2 - v1
+      bad = vector.length < TOL
+
+      # As is, this comparison also catches collinear vertices (< 10mm apart)
+      # along an edge. Should avoid red-flagging such cases. TO DO.
+      log(ERR, "#{id}: < #{TOL}m (#{mth})")                               if bad
+      return false                                                        if bad
+    end
+
+    # Add as many extra tests as needed ...
+    true
+  end
+
   ##
   # Return site-specific (or true) Topolys normal vector of OpenStudio surface.
   #
@@ -250,6 +287,8 @@ 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)
+
     nom    = surface.nameString
     surf   = {}
     subs   = {}
@@ -307,6 +346,8 @@ module TBD
     surf[:gross      ] = surface.grossArea
 
     surface.subSurfaces.sort_by { |s| s.nameString }.each do |s|
+      next unless validate(s)
+
       id       = s.nameString
       valid    = s.vertices.size == 3 || s.vertices.size == 4
       log(ERR, "Skipping '#{id}': vertex # 3 or 4 (#{mth})")        unless valid
@@ -334,7 +375,7 @@ module TBD
       log(ERR, "Skipping '#{id}': missing construction (#{mth})")    if c.empty?
       next                                                           if c.empty?
       c = c.get.to_LayeredConstruction
-      log(ERR, "Skipping '#{id}': must be a #{cl3} (#{mth})")        if c.empty?
+      log(WRN, "Skipping '#{id}': subs limited to #{cl3} (#{mth})")  if c.empty?
       next                                                           if c.empty?
       c = c.get
 
@@ -630,7 +671,7 @@ module TBD
         end
 
         foundation = OpenStudio::Model::FoundationKiva.new(model)
-        foundation.setName("KIVA Foundation Floor '#{id}'")
+        foundation.setName("KIVA Foundation Floor #{id}")
 
         floor = model.getSurfaceByName(id)
         kiva  = false if floor.empty?

data/lib/tbd/psi.rb

@@ -844,7 +844,7 @@ module TBD
       up   = ""
       up   = "uprated "                     if m.nameString.include?(" uprated")
       m    = m.clone(model).to_MasslessOpaqueMaterial.get
-             m.setName("'#{id}' #{up}m tbd")
+             m.setName("#{id} #{up}m tbd")
       de_r = 0.001                                           unless de_r > 0.001
       loss = (de_u - 1 / de_r) * s[:net]                     unless de_r > 0.001
              m.setThermalResistance(de_r)
@@ -855,7 +855,7 @@ module TBD
       up   = ""
       up   = "uprated "                     if m.nameString.include?(" uprated")
       m    = m.clone(model).to_StandardOpaqueMaterial.get
-             m.setName("'#{id}' #{up}m tbd")
+             m.setName("#{id} #{up}m tbd")
       k    = m.thermalConductivity
 
       if de_r > 0.001
@@ -1105,6 +1105,10 @@ module TBD
       horizontal = dz.abs < TOL
       vertical   = dx < TOL && dy < TOL
       edge_V     = terminal - origin
+
+      invalid("1x edge length < TOL", mth, 0, ERROR) if edge_V.magnitude < TOL
+      next                                           if edge_V.magnitude < TOL
+
       edge_plane = Topolys::Plane3D.new(origin, edge_V)
 
       if vertical
@@ -1120,71 +1124,77 @@ module TBD
         # Loop through each linked wire and determine farthest point from
         # edge while ensuring candidate point is not aligned with edge.
         t_model.wires.each do |wire|
-          if surface[:wire] == wire.id          # there should be a unique match
-            normal     = tbd[:surfaces][id][:n]   if tbd[:surfaces].key?(id)
-            normal     = holes[id].attributes[:n] if holes.key?(id)
-            normal     = shades[id][:n]           if shades.key?(id)
-            farthest   = Topolys::Point3D.new(origin.x, origin.y, origin.z)
-            farthest_V = farthest - origin           # zero magnitude, initially
-            inverted   = false
-            i_origin   = wire.points.index(origin)
-            i_terminal = wire.points.index(terminal)
-            i_last     = wire.points.size - 1
-
-            if i_terminal == 0
-              inverted = true unless i_origin == i_last
-            elsif i_origin == i_last
-              inverted = true unless i_terminal == 0
+          next unless surface[:wire] == wire.id       # should be a unique match
+          normal     = tbd[:surfaces][id][:n]   if tbd[:surfaces].key?(id)
+          normal     = holes[id].attributes[:n] if holes.key?(id)
+          normal     = shades[id][:n]           if shades.key?(id)
+          farthest   = Topolys::Point3D.new(origin.x, origin.y, origin.z)
+          farthest_V = farthest - origin             # zero magnitude, initially
+          inverted   = false
+          i_origin   = wire.points.index(origin)
+          i_terminal = wire.points.index(terminal)
+          i_last     = wire.points.size - 1
+
+          if i_terminal == 0
+            inverted = true unless i_origin == i_last
+          elsif i_origin == i_last
+            inverted = true unless i_terminal == 0
+          else
+            inverted = true unless i_terminal - i_origin == 1
+          end
+
+          wire.points.each do |point|
+            next if point == origin
+            next if point == terminal
+
+            point_on_plane    = edge_plane.project(point)
+            origin_point_V    = point_on_plane - origin
+            point_V_magnitude = origin_point_V.magnitude
+            next unless point_V_magnitude > TOL
+
+            # Generate a plane between origin, terminal & point. Only consider
+            # planes that share the same normal as wire.
+            if inverted
+              plane = Topolys::Plane3D.from_points(terminal, origin, point)
             else
-              inverted = true unless i_terminal - i_origin == 1
+              plane = Topolys::Plane3D.from_points(origin, terminal, point)
             end
 
-            wire.points.each do |point|
-              next if point == origin
-              next if point == terminal
-              point_on_plane = edge_plane.project(point)
-              origin_point_V = point_on_plane - origin
-              point_V_magnitude = origin_point_V.magnitude
-              next unless point_V_magnitude > TOL
-
-              # Generate a plane between origin, terminal & point. Only consider
-              # planes that share the same normal as wire.
-              if inverted
-                plane = Topolys::Plane3D.from_points(terminal, origin, point)
-              else
-                plane = Topolys::Plane3D.from_points(origin, terminal, point)
-              end
+            next unless (normal.x - plane.normal.x).abs < TOL &&
+                        (normal.y - plane.normal.y).abs < TOL &&
+                        (normal.z - plane.normal.z).abs < TOL
 
-              next unless (normal.x - plane.normal.x).abs < TOL &&
-                          (normal.y - plane.normal.y).abs < TOL &&
-                          (normal.z - plane.normal.z).abs < TOL
+            farther    = point_V_magnitude > farthest_V.magnitude
+            farthest   = point          if farther
+            farthest_V = origin_point_V if farther
+          end
 
-              farther    = point_V_magnitude > farthest_V.magnitude
-              farthest   = point          if farther
-              farthest_V = origin_point_V if farther
-            end
+          puts "ADDITION!!"                      if id == "ADDITION"
+          puts "#{reference_V} vs #{farthest_V}" if id == "ADDITION"
+
+          angle = reference_V.angle(farthest_V)
+          invalid("#{id} polar angle", mth, 0, ERROR, 0) if angle.nil?
+          angle = 0                                      if angle.nil?
 
-            angle = reference_V.angle(farthest_V)
-            adjust = false              # adjust angle [180°, 360°] if necessary
+          adjust = false              # adjust angle [180°, 360°] if necessary
 
-            if vertical
+          if vertical
+            adjust = true if east.dot(farthest_V) < -TOL
+          else
+            if north.dot(farthest_V).abs < TOL ||
+              (north.dot(farthest_V).abs - 1).abs < TOL
               adjust = true if east.dot(farthest_V) < -TOL
             else
-              if north.dot(farthest_V).abs < TOL ||
-                (north.dot(farthest_V).abs - 1).abs < TOL
-                adjust = true if east.dot(farthest_V) < -TOL
-              else
-                adjust = true if north.dot(farthest_V) < -TOL
-              end
+              adjust = true if north.dot(farthest_V) < -TOL
             end
-
-            angle = 2 * Math::PI - angle if adjust
-            angle -= 2 * Math::PI if (angle - 2 * Math::PI).abs < TOL
-            surface[:angle] = angle
-            farthest_V.normalize!
-            surface[:polar] = farthest_V
-            surface[:normal] = normal
           end
+
+          angle  = 2 * Math::PI - angle if adjust
+          angle -= 2 * Math::PI         if (angle - 2 * Math::PI).abs < TOL
+          surface[:angle ] = angle
+          farthest_V.normalize!
+          surface[:polar ] = farthest_V
+          surface[:normal] = normal
         end                           # end of edge-linked, surface-to-wire loop
       end                                      # end of edge-linked surface loop
 
@@ -1993,8 +2003,6 @@ module TBD
   #
   # @return [Bool] true if TBD Measure is successful
   def exit(runner = nil, argh = {})
-    mth  = "TBD::#{__callee__}"
-
     # Generated files target a design context ( >= WARN ) ... change TBD log
     # level for debugging purposes. By default, log status is set < DBG
     # while log level is set @INF.

data/lib/tbd/ua.rb

@@ -174,7 +174,6 @@ module TBD
       area = 0
       film = 100000000000000
       lc   = nil
-      uo   = nil
       id   = ""
       all  = g[:op].downcase == "all wall constructions"  ||
              g[:op].downcase == "all roof constructions"  ||
@@ -236,7 +235,7 @@ module TBD
       end
 
       if coll.empty?
-        log(ERR, "No construction to uprate - skipping (#{mth})")
+        log(ERR, "No #{label} construction to uprate - skipping (#{mth})")
         next
       elsif lc                    # valid layered construction - good to uprate!
         # Ensure lc is referenced by surface types == label.
@@ -948,7 +947,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.0.2"
+      report << "* TBD : v3.0.3"
       report << "* date : #{ua[:date]}"
 
       if lang == :en

data/lib/tbd/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tbd
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Denis Bourgeois & Dan Macumber
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-19 00:00:00.000000000 Z
+date: 2022-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: topolys
@@ -163,7 +163,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/rd2/tbd
-  source_code_uri: https://github.com/rd2/tbd/tree/v3.0.2
+  source_code_uri: https://github.com/rd2/tbd/tree/v3.0.3
   bug_tracker_uri: https://github.com/rd2/tbd/issues
 post_install_message:
 rdoc_options: []