tbd 3.0.3 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fff7235e8a345417b5d6885b6b131f8a3ec91cdcad6cf06a691a5455ad04c842
-  data.tar.gz: 89b326a95347bcaf4415b6c5643e2ae0841aae2e238cdfc6326bc069fdff1134
+  metadata.gz: 3f5a7947fb5c2f96807c924dcb4350198119a9033b35cef4d113e35221b0e61f
+  data.tar.gz: caf6856e314609d3d13134c2bcc86a78292ea4deb1c8ab453e3ca386a5bf56e2
 SHA512:
-  metadata.gz: c38bdf41f39fccaaed05642f7d4b8e24f13833a120c9b4af152399a9b796a3594574961745de4728e4f4261a75567fb46b4e953ef061453cec94f413ec26583f
-  data.tar.gz: f4844f96093b176796d1c89c3af61dd8473c6417d1305a64b84abf96eee1328357ff6d34cd2726a4e6bd3617f45ca80c4a6af2309f63772f1acd2dc4dbfc15cb
+  metadata.gz: 024b47e38db346d15524df93119a49c93c3a183c063d5635cd823ad21d8a2c6892680cc4b2f76b0299177a1479265650c6efc241d9037cb35043f1395ed312a8
+  data.tar.gz: da0b7e03bc5142adc8df613427838114377e5b406c36ab2b9ec506eaf72e972478490d45437018a2a94aeac45547ded1c70babfcec677420594c3dd3f776a867

data/json/tbd_seb_n2.json

@@ -1,7 +1,8 @@
 {
   "schema": "https://github.com/rd2/tbd/blob/master/tbd.schema.json",
   "description": "testing JSON surface KHI entries",
-  "psis": [{
+  "psis": [
+    {
       "id": "good",
       "parapet": 0.5,
       "party": 0.9
@@ -17,7 +18,8 @@
       "grade": 0.45
     }
   ],
-  "khis": [{
+  "khis": [
+    {
       "id": "column",
       "point": 0.5
     },
@@ -26,16 +28,19 @@
       "point": 0.5
     }
   ],
-  "surfaces": [{
-    "id": "Entryway  Wall 5",
-    "khis": [{
-        "id": "column",
-        "count": 3
-      },
-      {
-        "id": "support",
-        "count": 4
-      }
-    ]
-  }]
+  "surfaces": [
+    {
+      "id": "Entryway  Wall 5",
+      "khis": [
+        {
+          "id": "column",
+          "count": 3
+        },
+        {
+          "id": "support",
+          "count": 4
+        }
+      ]
+    }
+  ]
 }

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>3e0bc642-b37c-488f-96d5-e73f4c6d432b</version_id>
-  <version_modified>20221020T205858Z</version_modified>
+  <version_id>4501c26f-1cd4-45d8-8f0e-f1ea907c27df</version_id>
+  <version_modified>20221125T130635Z</version_modified>
   <xml_checksum>99772807</xml_checksum>
   <class_name>TBDMeasure</class_name>
   <display_name>Thermal Bridging and Derating - TBD</display_name>
@@ -439,22 +439,22 @@
       <checksum>36FA11E3</checksum>
     </file>
     <file>
-      <filename>ua.rb</filename>
+      <filename>geo.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>7264CA34</checksum>
+      <checksum>D999D942</checksum>
     </file>
     <file>
       <filename>psi.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>F31F865A</checksum>
+      <checksum>AFC8A549</checksum>
     </file>
     <file>
-      <filename>geo.rb</filename>
+      <filename>ua.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>D999D942</checksum>
+      <checksum>B39B3BB0</checksum>
     </file>
   </files>
 </measure>

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

@@ -205,7 +205,7 @@ module TBD
         rimjoist:      0.300, # *
         parapet:       0.325, # *
         fenestration:  0.200, # *
-        corner:        0.300, # ** "regular (BETBG)", adj. for ext. dimensions
+        corner:        0.300, # ** not explicitely stated
         balcony:       0.500, # *
         party:         0.450, # *
         grade:         0.450, # *
@@ -219,7 +219,7 @@ module TBD
         rimjoist:      0.850, # *
         parapet:       0.800, # *
         fenestration:  0.500, # *
-        corner:        0.850, # ** ... not stated
+        corner:        0.850, # ** not explicitely stated
         balcony:       1.000, # *
         party:         0.850, # *
         grade:         0.850, # *
@@ -569,16 +569,21 @@ module TBD
     return mismatch("argh", s, Hash, mth, DBG, ipt)      unless argh.is_a?(Hash)
     return hashkey("argh", argh, opt, mth, DBG, ipt)     unless argh.key?(opt)
 
-    argh[:io_path]     = nil unless argh.key?(:io_path)
+    argh[:io_path    ] = nil unless argh.key?(:io_path)
     argh[:schema_path] = nil unless argh.key?(:schema_path)
-    pth = argh[:io_path]
+
+    pth = argh[:io_path    ]
     sch = argh[:schema_path]
 
-    if pth
-      return empty("JSON file", mth, FTL, ipt) unless File.size?(pth)
-      io = File.read(pth)
-      io = JSON.parse(io, symbolize_names: true)
-      return mismatch("io", io, Hash, mth, FTL, ipt) unless io.is_a?(Hash)
+    if pth && (pth.is_a?(String) || pth.is_a?(Hash))
+      if pth.is_a?(Hash)
+        io = pth
+      else
+        return empty("JSON file", mth, FTL, ipt) unless File.size?(pth)
+        io = File.read(pth)
+        io = JSON.parse(io, symbolize_names: true)
+        return mismatch("io", io, Hash, mth, FTL, ipt) unless io.is_a?(Hash)
+      end
 
       # Schema validation is not yet supported in the OpenStudio Application.
       # We nonetheless recommend that users rely on the json-schema gem, or an

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

@@ -62,30 +62,33 @@ module TBD
     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
-    ro    = rsi(lc, film)               #                current construction Ro
-    new_r = lyr[:r] + (rt - ro)         #              new, un-derated layer RSi
-    new_u = 1 / new_r
+    rt     = 1 / ut                      #                target construction Rt
+    ro     = rsi(lc, film)               #               current construction Ro
+    new_r  = lyr[:r] + (rt - ro)         #             new, un-derated layer RSi
+    new_u  = 1 / new_r
 
     # Then, uprate (if possible) to counter expected thermal bridging effects.
-    u_psi = hloss / area                #                         from psi & khi
-    new_u = new_u - u_psi               # uprated layer USi to counter psi & khi
-    new_r = 1 / new_u                   # uprated layer RSi to counter psi & khi
+    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
-    loss  = 0.0                         # residual heatloss (not assigned) [W/K]
+
+    loss   = 0.0                        # residual heatloss (not assigned) [W/K]
 
     if lyr[:type] == :massless
       m     = lc.getLayer(lyr[:index]).to_MasslessOpaqueMaterial
       return  invalid("'#{id}' massless layer?", mth, 0)             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
+      m     = lc.getLayer(lyr[:index]).to_StandardOpaqueMaterial
       return  invalid("'#{id}' standard layer?", mth, 0)             if m.empty?
+
       m     = m.get.clone(model).to_StandardOpaqueMaterial.get
               m.setName("#{id} uprated")
       k     = m.thermalConductivity
@@ -108,10 +111,12 @@ module TBD
 
       ok = m.setThickness(d)
       return invalid("Can't uprate '#{id}': > 3m", mth, 0, ERR, res)   unless ok
+
       m.setThermalConductivity(k)                                          if ok
     end
 
     return invalid("", mth, 0, ERR, res) unless m
+
     lc.setLayer(lyr[:index], m)
     uo = 1 / rsi(lc, film)
 
@@ -187,6 +192,7 @@ module TBD
           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
 
@@ -947,7 +953,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.3"
+      report << "* TBD : v3.1.0"
       report << "* date : #{ua[:date]}"
 
       if lang == :en

data/lib/tbd/psi.rb

@@ -205,7 +205,7 @@ module TBD
         rimjoist:      0.300, # *
         parapet:       0.325, # *
         fenestration:  0.200, # *
-        corner:        0.300, # ** "regular (BETBG)", adj. for ext. dimensions
+        corner:        0.300, # ** not explicitely stated
         balcony:       0.500, # *
         party:         0.450, # *
         grade:         0.450, # *
@@ -219,7 +219,7 @@ module TBD
         rimjoist:      0.850, # *
         parapet:       0.800, # *
         fenestration:  0.500, # *
-        corner:        0.850, # ** ... not stated
+        corner:        0.850, # ** not explicitely stated
         balcony:       1.000, # *
         party:         0.850, # *
         grade:         0.850, # *
@@ -569,16 +569,21 @@ module TBD
     return mismatch("argh", s, Hash, mth, DBG, ipt)      unless argh.is_a?(Hash)
     return hashkey("argh", argh, opt, mth, DBG, ipt)     unless argh.key?(opt)
 
-    argh[:io_path]     = nil unless argh.key?(:io_path)
+    argh[:io_path    ] = nil unless argh.key?(:io_path)
     argh[:schema_path] = nil unless argh.key?(:schema_path)
-    pth = argh[:io_path]
+
+    pth = argh[:io_path    ]
     sch = argh[:schema_path]
 
-    if pth
-      return empty("JSON file", mth, FTL, ipt) unless File.size?(pth)
-      io = File.read(pth)
-      io = JSON.parse(io, symbolize_names: true)
-      return mismatch("io", io, Hash, mth, FTL, ipt) unless io.is_a?(Hash)
+    if pth && (pth.is_a?(String) || pth.is_a?(Hash))
+      if pth.is_a?(Hash)
+        io = pth
+      else
+        return empty("JSON file", mth, FTL, ipt) unless File.size?(pth)
+        io = File.read(pth)
+        io = JSON.parse(io, symbolize_names: true)
+        return mismatch("io", io, Hash, mth, FTL, ipt) unless io.is_a?(Hash)
+      end
 
       # Schema validation is not yet supported in the OpenStudio Application.
       # We nonetheless recommend that users rely on the json-schema gem, or an

data/lib/tbd/ua.rb

@@ -62,30 +62,33 @@ module TBD
     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
-    ro    = rsi(lc, film)               #                current construction Ro
-    new_r = lyr[:r] + (rt - ro)         #              new, un-derated layer RSi
-    new_u = 1 / new_r
+    rt     = 1 / ut                      #                target construction Rt
+    ro     = rsi(lc, film)               #               current construction Ro
+    new_r  = lyr[:r] + (rt - ro)         #             new, un-derated layer RSi
+    new_u  = 1 / new_r
 
     # Then, uprate (if possible) to counter expected thermal bridging effects.
-    u_psi = hloss / area                #                         from psi & khi
-    new_u = new_u - u_psi               # uprated layer USi to counter psi & khi
-    new_r = 1 / new_u                   # uprated layer RSi to counter psi & khi
+    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
-    loss  = 0.0                         # residual heatloss (not assigned) [W/K]
+
+    loss   = 0.0                        # residual heatloss (not assigned) [W/K]
 
     if lyr[:type] == :massless
       m     = lc.getLayer(lyr[:index]).to_MasslessOpaqueMaterial
       return  invalid("'#{id}' massless layer?", mth, 0)             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
+      m     = lc.getLayer(lyr[:index]).to_StandardOpaqueMaterial
       return  invalid("'#{id}' standard layer?", mth, 0)             if m.empty?
+
       m     = m.get.clone(model).to_StandardOpaqueMaterial.get
               m.setName("#{id} uprated")
       k     = m.thermalConductivity
@@ -108,10 +111,12 @@ module TBD
 
       ok = m.setThickness(d)
       return invalid("Can't uprate '#{id}': > 3m", mth, 0, ERR, res)   unless ok
+
       m.setThermalConductivity(k)                                          if ok
     end
 
     return invalid("", mth, 0, ERR, res) unless m
+
     lc.setLayer(lyr[:index], m)
     uo = 1 / rsi(lc, film)
 
@@ -187,6 +192,7 @@ module TBD
           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
 
@@ -947,7 +953,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.3"
+      report << "* TBD : v3.1.0"
       report << "* date : #{ua[:date]}"
 
       if lang == :en

data/lib/tbd/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tbd
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.1.0
 platform: ruby
 authors:
 - Denis Bourgeois & Dan Macumber
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-21 00:00:00.000000000 Z
+date: 2022-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: topolys
@@ -124,13 +124,11 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
-- json/midrise.json
 - json/tbd_5ZoneNoHVAC.json
 - json/tbd_5ZoneNoHVAC_btap.json
 - json/tbd_seb_n2.json
 - json/tbd_seb_n4.json
 - json/tbd_warehouse10.json
-- json/tbd_warehouse5.json
 - lib/measures/tbd/LICENSE.md
 - lib/measures/tbd/README.md
 - lib/measures/tbd/README.md.erb
@@ -163,7 +161,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/rd2/tbd
-  source_code_uri: https://github.com/rd2/tbd/tree/v3.0.3
+  source_code_uri: https://github.com/rd2/tbd/tree/v3.1.0
   bug_tracker_uri: https://github.com/rd2/tbd/issues
 post_install_message:
 rdoc_options: []

data/json/midrise.json

@@ -1,64 +0,0 @@
-{
-  "schema": "https://github.com/rd2/tbd/blob/master/tbd.schema.json",
-  "description": "sorting out multiple story PSI sets (midrise)",
-  "psis": [{
-      "id": "compliant",
-      "rimjoist": 0.3,
-      "parapet": 0.325,
-      "fenestration": 0.35,
-      "corner": 0.45,
-      "balcony": 0.5,
-      "party": 0.5,
-      "grade": 0.45
-    },
-    {
-      "id": "Building Story 1",
-      "rimjoist": 0.501,
-      "parapet": 0.511,
-      "fenestration": 0.521,
-      "cornerconcave": 0.531,
-      "cornerconvex": 0.541,
-      "balcony": 0.551,
-      "party": 0.561,
-      "grade": 0.571
-    },
-    {
-      "id": "Building Story 2",
-      "rimjoist": 0.401,
-      "parapet": 0.411,
-      "fenestration": 0.421,
-      "cornerconcave": 0.431,
-      "cornerconvex": 0.441,
-      "balcony": 0.451,
-      "party": 0.461,
-      "grade": 0.471
-    },
-    {
-      "id": "Building Story 3",
-      "rimjoist": 0.301,
-      "parapet": 0.311,
-      "fenestration": 0.321,
-      "cornerconcave": 0.331,
-      "cornerconvex": 0.341,
-      "balcony": 0.351,
-      "party": 0.361,
-      "grade": 0.371
-    }
-  ],
-  "building": {
-    "psi": "compliant"
-  },
-  "stories": [{
-      "id": "Building Story 1",
-      "psi": "Building Story 1"
-    },
-    {
-      "id": "Building Story 2",
-      "psi": "Building Story 2"
-    },
-    {
-      "id": "Building Story 3",
-      "psi": "Building Story 3"
-    }
-  ]
-}

data/json/tbd_warehouse5.json

@@ -1,37 +0,0 @@
-{
-  "schema": "https://github.com/rd2/tbd/blob/master/tbd.schema.json",
-  "description": "test_warehouse.osm with spacetype PSI values",
-  "psis": [{
-      "id": "Warehouse Office",
-      "rimjoist": 0.300,
-      "parapet": 0.300,
-      "fenestration": 0.300,
-      "corner": 0.300,
-      "balcony": 0.300,
-      "party": 0.300,
-      "grade": 0.300
-    },
-    {
-      "id": "Warehouse Fine",
-      "rimjoist": 0.500,
-      "parapet": 0.500,
-      "fenestration": 0.500,
-      "corner": 0.500,
-      "balcony": 0.500,
-      "party": 0.500,
-      "grade": 0.500
-    }
-  ],
-  "building": {
-    "psi": "regular (BETBG)"
-  },
-  "spacetypes": [{
-      "id": "Warehouse Office",
-      "psi": "Warehouse Office"
-    },
-    {
-      "id": "Warehouse Fine",
-      "psi": "Warehouse Fine"
-    }
-  ]
-}