tbd 3.4.4 → 3.5.0

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

@@ -1,121 +1,121 @@
-require 'matrix'
-
-class Matrix
-  def []=(i, j, x)
-    @rows[i][j] = x
-  end
-end
-
-module Topolys
-
-  # Transformations can be applied to Geometry. Ported from OpenStudio Transformation library.
-
-  class Transformation
-  
-    # @return [Matrix] internal 4x4 matrix
-    attr_reader :matrix
-    
-    ##
-    # Initializes an Transformation object
-    #
-    # @param [Matrix] matrix A 4x4 matrix, defaults to identity
-    def initialize(matrix=Matrix.identity(4))
-      raise "Incorrect argument for Transformation, expected Matrix but got #{matrix.class}" unless matrix.is_a?(Matrix)
-      @matrix = matrix
-    end
-    
-    # translation along vector
-    def Transformation.translation(translation)
-      return nil if !translation.is_a?(Vector3D)
-      
-      matrix = Matrix.identity(4)
-      matrix[0,3] = translation.x
-      matrix[1,3] = translation.y
-      matrix[2,3] = translation.z      
-      
-      return Transformation.new(matrix)
-    end
-  
-    ##
-    # Initializes a rotation about origin defined by axis and angle (radians)
-    #
-    def Transformation.rotation(axis, radians)
-      return nil if !axis.is_a?(Vector3D)
-      return nil if !radians.is_a?(Numeric)
-      return nil if (axis.magnitude < Float::EPSILON)
-      normal = axis
-      normal.normalize!
-      
-      # Rodrigues' rotation formula / Rotation matrix from Euler axis/angle
-      # I*cos(radians) + I*(1-cos(radians))*axis*axis^T + Q*sin(radians)
-      # Q = [0, -axis[2], axis[1]; axis[2], 0, -axis[0]; -axis[1], axis[0], 0]
-      p = normal.outer_product(normal)
-      i = Matrix.identity(3)
-      q = Matrix.zero(3)
-      q[0,1] = -normal.z
-      q[0,2] =  normal.y
-      q[1,0] =  normal.z
-      q[1,2] = -normal.x
-      q[2,0] = -normal.y
-      q[2,1] =  normal.x
-
-      # rotation matrix
-      r = i*Math.cos(radians) + (1-Math.cos(radians))*p + q*Math.sin(radians)
-
-      matrix = Matrix.identity(4)
-      matrix[0,0] = r[0,0]
-      matrix[0,1] = r[0,1]
-      matrix[0,2] = r[0,2]
-      matrix[1,0] = r[1,0]
-      matrix[1,1] = r[1,1]
-      matrix[1,2] = r[1,2]
-      matrix[2,0] = r[2,0]
-      matrix[2,1] = r[2,1]
-      matrix[2,2] = r[2,2]
-      
-      return Transformation.new(matrix)
-    end
-
-    ##
-    # Multiplies a Transformation by geometry class
-    #
-    # @param [Obj] obj A geometry object
-    #
-    # @return [Obj] Returns a new, transformed object - nil if not a geometry object
-    def *(obj)
-      if obj.is_a?(Point3D)
-        return mult_point(obj)
-      elsif obj.is_a?(Vector3D)
-        return mult_vector(obj)
-      elsif obj.is_a?(Array)
-        return mult_array(obj)
-      elsif obj.is_a?(Transformation)
-        return mult_transformation(obj)
-      end
-      return nil
-    end
-    
-    private
-    
-    def mult_point(point)
-      temp = Matrix.column_vector([point.x, point.y, point.z, 1])
-      temp = @matrix*temp
-      return Point3D.new(temp[0,0],temp[1,0],temp[2,0])
-    end
-    
-    def mult_vector(vector)
-      temp = Matrix.column_vector([vector.x, vector.y, vector.z, 1])
-      temp = @matrix*temp
-      return Vector3D.new(temp[0,0],temp[1,0],temp[2,0])
-    end
-    
-    def mult_array(array)
-      array.map {|obj| self*obj}
-    end
-    
-    def mult_transformation(obj)
-      Transformation.new(@matrix * obj.matrix)
-    end
-
-  end
+require 'matrix'
+
+class Matrix
+  def []=(i, j, x)
+    @rows[i][j] = x
+  end
+end
+
+module Topolys
+
+  # Transformations can be applied to Geometry. Ported from OpenStudio Transformation library.
+
+  class Transformation
+  
+    # @return [Matrix] internal 4x4 matrix
+    attr_reader :matrix
+    
+    ##
+    # Initializes an Transformation object
+    #
+    # @param [Matrix] matrix A 4x4 matrix, defaults to identity
+    def initialize(matrix=Matrix.identity(4))
+      raise "Incorrect argument for Transformation, expected Matrix but got #{matrix.class}" unless matrix.is_a?(Matrix)
+      @matrix = matrix
+    end
+    
+    # translation along vector
+    def Transformation.translation(translation)
+      return nil if !translation.is_a?(Vector3D)
+      
+      matrix = Matrix.identity(4)
+      matrix[0,3] = translation.x
+      matrix[1,3] = translation.y
+      matrix[2,3] = translation.z      
+      
+      return Transformation.new(matrix)
+    end
+  
+    ##
+    # Initializes a rotation about origin defined by axis and angle (radians)
+    #
+    def Transformation.rotation(axis, radians)
+      return nil if !axis.is_a?(Vector3D)
+      return nil if !radians.is_a?(Numeric)
+      return nil if (axis.magnitude < Float::EPSILON)
+      normal = axis
+      normal.normalize!
+      
+      # Rodrigues' rotation formula / Rotation matrix from Euler axis/angle
+      # I*cos(radians) + I*(1-cos(radians))*axis*axis^T + Q*sin(radians)
+      # Q = [0, -axis[2], axis[1]; axis[2], 0, -axis[0]; -axis[1], axis[0], 0]
+      p = normal.outer_product(normal)
+      i = Matrix.identity(3)
+      q = Matrix.zero(3)
+      q[0,1] = -normal.z
+      q[0,2] =  normal.y
+      q[1,0] =  normal.z
+      q[1,2] = -normal.x
+      q[2,0] = -normal.y
+      q[2,1] =  normal.x
+
+      # rotation matrix
+      r = i*Math.cos(radians) + (1-Math.cos(radians))*p + q*Math.sin(radians)
+
+      matrix = Matrix.identity(4)
+      matrix[0,0] = r[0,0]
+      matrix[0,1] = r[0,1]
+      matrix[0,2] = r[0,2]
+      matrix[1,0] = r[1,0]
+      matrix[1,1] = r[1,1]
+      matrix[1,2] = r[1,2]
+      matrix[2,0] = r[2,0]
+      matrix[2,1] = r[2,1]
+      matrix[2,2] = r[2,2]
+      
+      return Transformation.new(matrix)
+    end
+
+    ##
+    # Multiplies a Transformation by geometry class
+    #
+    # @param [Obj] obj A geometry object
+    #
+    # @return [Obj] Returns a new, transformed object - nil if not a geometry object
+    def *(obj)
+      if obj.is_a?(Point3D)
+        return mult_point(obj)
+      elsif obj.is_a?(Vector3D)
+        return mult_vector(obj)
+      elsif obj.is_a?(Array)
+        return mult_array(obj)
+      elsif obj.is_a?(Transformation)
+        return mult_transformation(obj)
+      end
+      return nil
+    end
+    
+    private
+    
+    def mult_point(point)
+      temp = Matrix.column_vector([point.x, point.y, point.z, 1])
+      temp = @matrix*temp
+      return Point3D.new(temp[0,0],temp[1,0],temp[2,0])
+    end
+    
+    def mult_vector(vector)
+      temp = Matrix.column_vector([vector.x, vector.y, vector.z, 1])
+      temp = @matrix*temp
+      return Vector3D.new(temp[0,0],temp[1,0],temp[2,0])
+    end
+    
+    def mult_array(array)
+      array.map {|obj| self*obj}
+    end
+    
+    def mult_transformation(obj)
+      Transformation.new(@matrix * obj.matrix)
+    end
+
+  end
 end

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

@@ -1,6 +1,6 @@
 # MIT License
 #
-# Copyright (c) 2020-2024 Denis Bourgeois & Dan Macumber
+# Copyright (c) 2020-2025 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
@@ -54,12 +54,12 @@ module TBD
     lyr[:index] = nil unless lyr[:index].is_a?(Numeric)
     lyr[:index] = nil unless lyr[:index] >= 0
     lyr[:index] = nil unless lyr[:index] < lc.layers.size
-    return invalid("#{id} layer index", mth, 3, ERR, res) unless lyr[:index]
+    return invalid("#{id} layer index", mth, 3, WRN, 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, 6, WRN, res) unless ut    < 5.678
-    return zero("#{id}: net area (m2)", mth,    ERR, res) unless area  > TOL
+    return zero("#{id}: Ut"           , mth,    WRN, res) unless ut    > UMIN
+    return invalid("#{id}: Ut"        , mth, 6, WRN, res) unless ut    < UMAX
+    return zero("#{id}: net area (m2)", mth,    WRN, res) unless area  > TOL
 
     # First, calculate initial layer RSi to initially meet Ut target.
     rt     = 1 / ut              # target construction Rt
@@ -71,56 +71,51 @@ module TBD
     u_psi  = hloss / area        # from psi+khi
     new_u -= u_psi               # uprated layer USi to counter psi+khi
     new_r  = 1 / new_u           # uprated layer RSi to counter psi+khi
-    return zero("#{id}: new Rsi", mth, ERR, res) unless new_r > 0.001
+    return zero("#{id}: new Rsi", mth, WRN, res) unless new_r > RMIN
 
     if lyr[:type] == :massless
-      m     = lc.getLayer(lyr[:index]).to_MasslessOpaqueMaterial
-      return  invalid("#{id} massless layer?", mth, 0, DBG, res) if m.empty?
-
-      m     = m.get.clone(model).to_MasslessOpaqueMaterial.get
-              m.setName("#{id} uprated")
-      new_r = 0.001                      unless new_r > 0.001
-      loss  = (new_u - 1 / new_r) * area unless new_r > 0.001
-              m.setThermalResistance(new_r)
-    else # type == :standard
-      m     = lc.getLayer(lyr[:index]).to_StandardOpaqueMaterial
-      return  invalid("#{id} standard layer?", mth, 0, DBG, res) if m.empty?
-
-      m     = m.get.clone(model).to_StandardOpaqueMaterial.get
-              m.setName("#{id} uprated")
-      k     = m.thermalConductivity
-
-      if new_r > 0.001
-        d   = new_r * k
-
-        unless d > 0.003
-          d    = 0.003
-          k    = d / new_r
-          k    = 3.0                    unless k < 3.0
-          loss = (new_u - k / d) * area unless k < 3.0
-        end
-      else # new_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 = (new_u - k / d) * area
+      m = lc.getLayer(lyr[:index]).to_MasslessOpaqueMaterial
+      return invalid("#{id} massless layer?", mth, 0, DBG, res) if m.empty?
+
+      m = m.get.clone(model).to_MasslessOpaqueMaterial.get
+      m.setName("#{id} uprated")
+
+      new_r = RMIN                       unless new_r > RMIN
+      loss  = (new_u - 1 / new_r) * area unless new_r > RMIN
+
+      unless m.setThermalResistance(new_r)
+        return invalid("Can't uprate #{id}: RSi#{new_r.round(2)}", mth, 0, DBG, res)
       end
+    else
+      m = lc.getLayer(lyr[:index]).to_StandardOpaqueMaterial
+      return invalid("#{id} standard layer?", mth, 0, DBG, res) if m.empty?
 
-      if m.setThickness(d)
-        m.setThermalConductivity(k)
-      else
-        return invalid("Can't uprate #{id}: #{d} > 3m", mth, 0, ERR, res)
+      m = m.get.clone(model).to_StandardOpaqueMaterial.get
+      m.setName("#{id} uprated")
+
+      d = m.thickness
+      k = (d / new_r).clamp(KMIN, KMAX)
+      d = (k * new_r).clamp(DMIN, DMAX)
+
+      loss = (new_u - k / d) * area unless d / k > RMIN
+
+      unless m.setThermalConductivity(k)
+        return invalid("Can't uprate #{id}: K#{k.round(3)}", mth, 0, DBG, res)
+      end
+
+      unless m.setThickness(d)
+        return invalid("Can't uprate #{id}: #{(d*1000).to_i}mm", mth, 0, DBG, res)
       end
     end
 
-    return invalid("Can't ID insulating layer", mth, 0, ERR, res) unless m
+    return invalid("Can't ID insulating layer", mth, 0, DBG, res) unless m
 
     lc.setLayer(lyr[:index], m)
     uo = 1 / rsi(lc, film)
 
     if loss > TOL
       h_loss = format "%.3f", loss
-      return invalid("Can't assign #{h_loss} W/K to #{id}", mth, 0, ERR, res)
+      return invalid("Can't assign #{h_loss} W/K to #{id}", mth, 0, DBG, res)
     end
 
     res[:uo] = uo
@@ -145,9 +140,9 @@ module TBD
   # @option argh [Bool] :uprate_walls (false) whether to uprate walls
   # @option argh [Bool] :uprate_roofs (false) whether to uprate roofs
   # @option argh [Bool] :uprate_floors (false) whether to uprate floors
-  # @option argh [#to_f] :wall_ut (5.678) uprated wall Usi-factor target
-  # @option argh [#to_f] :roof_ut (5.678) uprated roof Usi-factor target
-  # @option argh [#to_f] :floor_ut (5.678) uprated floor Usi-factor target
+  # @option argh [#to_f] :wall_ut (UMAX) uprated wall Usi-factor target
+  # @option argh [#to_f] :roof_ut (UMAX) uprated roof Usi-factor target
+  # @option argh [#to_f] :floor_ut (UMAX) uprated floor Usi-factor target
   # @option argh [#to_s] :wall_option ("") construction to uprate (or "all")
   # @option argh [#to_s] :roof_option ("") construction to uprate (or "all")
   # @option argh [#to_s] :floor_option ("") construction to uprate (or "all")
@@ -172,9 +167,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)
@@ -197,7 +192,7 @@ module TBD
     groups.each do |type, g|
       next unless g[:up]
       next unless g[:ut].is_a?(Numeric)
-      next unless g[:ut] < 5.678
+      next unless g[:ut] < UMAX
       next     if g[:ut] < 0
 
       typ  = type
@@ -211,7 +206,7 @@ module TBD
       all  = tout.include?(op)
 
       if g[:op].empty?
-        log(ERR, "Construction (#{type}) to uprate? (#{mth})")
+        log(WRN, "Construction (#{type}) to uprate? (#{mth})")
       elsif all
         s.each do |nom, surface|
           next unless surface.key?(:deratable   )
@@ -247,11 +242,11 @@ module TBD
       else
         id = g[:op]
         lc = model.getConstructionByName(id)
-        log(ERR, "Construction '#{id}'? (#{mth})")         if lc.empty?
+        log(WRN, "Construction '#{id}'? (#{mth})")         if lc.empty?
         next                                               if lc.empty?
 
         lc = lc.get.to_LayeredConstruction
-        log(ERR, "'#{id}' layered construction? (#{mth})") if lc.empty?
+        log(WRN, "'#{id}' layered construction? (#{mth})") if lc.empty?
         next                                               if lc.empty?
 
         lc       = lc.get
@@ -282,7 +277,7 @@ module TBD
       end
 
       if coll.empty?
-        log(ERR, "No #{type} construction to uprate - skipping (#{mth})")
+        log(WRN, "No #{type} construction to uprate - skipping (#{mth})")
         next
       elsif lc
         # Valid layered construction - good to uprate!
@@ -291,7 +286,7 @@ module TBD
         lyr[:index] = nil unless lyr[:index] >= 0
         lyr[:index] = nil unless lyr[:index] < lc.layers.size
 
-        log(ERR, "Insulation index for '#{id}'? (#{mth})") unless lyr[:index]
+        log(WRN, "Insulation index for '#{id}'? (#{mth})") unless lyr[:index]
         next                                               unless lyr[:index]
 
         # Ensure lc is exclusively linked to deratable surfaces of right type.
@@ -302,10 +297,10 @@ module TBD
           next unless surface.key?(:construction)
           next unless surface[:construction].is_a?(cl3)
           next unless surface[:construction] == lc
+          next unless surface[:deratable]
 
           ok = true
-          ok = false unless surface[:type     ] == typ
-          ok = false unless surface[:deratable]
+          ok = false unless surface[:type] == typ
           ok = false unless coll.key?(id)
           ok = false unless coll[id][:s].key?(nom)
 
@@ -346,13 +341,18 @@ module TBD
 
             if sss.isConstructionDefaulted
               set = defaultConstructionSet(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
+              if set.nil?
+                sss.setConstruction(lc)
+              else
+                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
               end
             else
               sss.setConstruction(lc)
@@ -385,7 +385,7 @@ module TBD
         res = uo(model, lc, id, hloss, film, g[:ut])
 
         unless res[:uo] && res[:m]
-          log(ERR, "Unable to uprate '#{id}' (#{mth})")
+          log(WRN, "Unable to uprate '#{id}' (#{mth})")
           next
         end
 
@@ -407,7 +407,7 @@ module TBD
         argh[:roof_uo ] = res[:uo] if typ == :ceiling
         argh[:floor_uo] = res[:uo] if typ == :floor
       else
-        log(ERR, "Nilled construction to uprate - (#{mth})")
+        log(WRN, "Nilled construction to uprate - (#{mth})")
         return false
       end
     end
@@ -589,7 +589,7 @@ module TBD
       empty  = shorts[:has].empty? && shorts[:val].empty?
       has    = shorts[:has]                      unless empty
       val    = shorts[:val]                      unless empty
-      log(ERR, "Invalid UA' reference set (#{mth})") if empty
+      log(WRN, "Invalid UA' reference set (#{mth})") if empty
 
       unless empty
         ua[:model] += " : Design vs '#{ref}'"
@@ -1000,7 +1000,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.4.4"
+      report << "* TBD : v3.5.0"
       report << "* date : #{ua[:date]}"
 
       if lang == :en