tbd 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ebdeeffd85c3a9e1f4adff58aa3d35a2a02877b8903ecb7c79fb599f7fd1e1b
-  data.tar.gz: ed97dce90e40b3314b1c8569719bc6ae48f4cbe2766c5119d45b8095968f54db
+  metadata.gz: a5922a435bc3f8d97b6aa78588346e59108b6455d27c72e0aeecdd792079f33f
+  data.tar.gz: 5f683e96a3f1c33e0bb782bbb545b713d9d55beaf2359d3983f9b4d010716ce0
 SHA512:
-  metadata.gz: 2d2e63401158cb2e7c89998e03aed05417a59a8854046e4eb8c816142156cd44d39885487e2160b772126d1278ba3dc183d417cae801119d0b1244daddc9be40
-  data.tar.gz: 4769131e58078354b451d8020b42e0f4c6e3ef3241258d6badde2d521db49cd3140ee57c5bdce176b1963e4b64ca6571736ca95bfd163808a88e7728a0d0f969
+  metadata.gz: 7284058dc4ec681c102435484b8af994fd027ea666aa4ed760f0e178cfcef297de033454c0a2c7cd60c95f13b71308bdcc6c4fa0a846819ec92edaa46007af08
+  data.tar.gz: 78e74d0942d5ad735c9b696c5cdaa72b5ad8a92fbf34a3c8843e41dce41f1de0eddfda3b53ef8db08c3f9c87a73b92b3ad8bb89400a58283c1805d7d660d83f7

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>ea7c945a-d074-4893-bc2c-7f48dd7ad740</version_id>
-  <version_modified>20220907T200625Z</version_modified>
+  <version_id>65ac80d9-ef1e-4c41-9a62-68e2e1e6c5db</version_id>
+  <version_modified>20220918T225251Z</version_modified>
   <xml_checksum>99772807</xml_checksum>
   <class_name>TBDMeasure</class_name>
   <display_name>Thermal Bridging and Derating - TBD</display_name>
@@ -415,18 +415,6 @@
       <usage_type>resource</usage_type>
       <checksum>54F57409</checksum>
     </file>
-    <file>
-      <filename>README.md</filename>
-      <filetype>md</filetype>
-      <usage_type>readme</usage_type>
-      <checksum>36FA11E3</checksum>
-    </file>
-    <file>
-      <filename>geo.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>6E0B27AD</checksum>
-    </file>
     <file>
       <version>
         <software_program>OpenStudio</software_program>
@@ -450,11 +438,23 @@
       <usage_type>resource</usage_type>
       <checksum>655E8232</checksum>
     </file>
+    <file>
+      <filename>README.md</filename>
+      <filetype>md</filetype>
+      <usage_type>readme</usage_type>
+      <checksum>36FA11E3</checksum>
+    </file>
+    <file>
+      <filename>geo.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>8A794826</checksum>
+    </file>
     <file>
       <filename>ua.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>2BE6E743</checksum>
+      <checksum>7873E62A</checksum>
     </file>
   </files>
 </measure>

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

@@ -599,7 +599,7 @@ module TBD
         end
 
         edge[:surfaces].keys.each do |i|              # loop around current edge
-          next    if i == id
+          next     if i == id
           next unless walls.key?(i)
           next unless walls[i][:boundary].downcase == "outdoors"
           floors[id][:exposed] += edge[:length]
@@ -629,8 +629,8 @@ module TBD
           end
         end
 
-        floors[id][:foundation] = OpenStudio::Model::FoundationKiva.new(model)
-        floors[id][:foundation].setName("KIVA Foundation Floor '#{id}'")
+        foundation = OpenStudio::Model::FoundationKiva.new(model)
+        foundation.setName("KIVA Foundation Floor '#{id}'")
 
         floor = model.getSurfaceByName(id)
         kiva  = false if floor.empty?
@@ -640,21 +640,15 @@ module TBD
         kiva = false  if construction.empty?
         next          if construction.empty?
         construction   = construction.get
-        floor.setAdjacentFoundation(floors[id][:foundation])
+        floor.setAdjacentFoundation(foundation)
         floor.setConstruction(construction)
-        ep  = floors[id][:exposed]
-        per = floor.surfacePropertyExposedFoundationPerimeter
-
-        if per.empty?
-          per = floor.createSurfacePropertyExposedFoundationPerimeter(arg, ep)
-        else
-          per = per.get
-        end
-
-        kiva = false unless per.respond_to?(:totalExposedPerimeter)
-        next         unless per.respond_to?(:totalExposedPerimeter)
 
-        perimeter = per.totalExposedPerimeter
+        ep   = floors[id][:exposed]
+        per  = floor.createSurfacePropertyExposedFoundationPerimeter(arg, ep)
+        kiva = false if per.empty?
+        next         if per.empty?
+        per           = per.get
+        perimeter     = per.totalExposedPerimeter
         kiva = false if perimeter.empty?
         next         if perimeter.empty?
         perimeter     = perimeter.get
@@ -663,13 +657,7 @@ module TBD
           ok   = per.setTotalExposedPerimeter(0.000)
           ok   = per.setTotalExposedPerimeter(0.001) unless ok
           kiva = false unless ok
-          next         unless ok
-        elsif (perimeter - ep).abs > TOL
-          ok   = per.setTotalExposedPerimeter(ep)
-          kiva = false unless ok
-          next         unless ok
-
-          # Generic 1" XPS insulation for exposed perimeter.
+        elsif (perimeter - ep).abs < TOL
           xps25 = model.getStandardOpaqueMaterialByName("XPS 25mm")
 
           if xps25.empty?
@@ -686,9 +674,11 @@ module TBD
             xps25 = xps25.get
           end
 
-          floors[id][:foundation].setInteriorHorizontalInsulationMaterial(xps25)
-          floors[id][:foundation].setInteriorHorizontalInsulationWidth(0.6)
+          foundation.setInteriorHorizontalInsulationMaterial(xps25)
+          foundation.setInteriorHorizontalInsulationWidth(0.6)
         end
+
+        floors[id][:foundation] = foundation
       end
     end
 

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

@@ -948,7 +948,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.1"
+      report << "* TBD : v3.0.2"
       report << "* date : #{ua[:date]}"
 
       if lang == :en

data/lib/tbd/geo.rb

@@ -599,7 +599,7 @@ module TBD
         end
 
         edge[:surfaces].keys.each do |i|              # loop around current edge
-          next    if i == id
+          next     if i == id
           next unless walls.key?(i)
           next unless walls[i][:boundary].downcase == "outdoors"
           floors[id][:exposed] += edge[:length]
@@ -629,8 +629,8 @@ module TBD
           end
         end
 
-        floors[id][:foundation] = OpenStudio::Model::FoundationKiva.new(model)
-        floors[id][:foundation].setName("KIVA Foundation Floor '#{id}'")
+        foundation = OpenStudio::Model::FoundationKiva.new(model)
+        foundation.setName("KIVA Foundation Floor '#{id}'")
 
         floor = model.getSurfaceByName(id)
         kiva  = false if floor.empty?
@@ -640,21 +640,15 @@ module TBD
         kiva = false  if construction.empty?
         next          if construction.empty?
         construction   = construction.get
-        floor.setAdjacentFoundation(floors[id][:foundation])
+        floor.setAdjacentFoundation(foundation)
         floor.setConstruction(construction)
-        ep  = floors[id][:exposed]
-        per = floor.surfacePropertyExposedFoundationPerimeter
-
-        if per.empty?
-          per = floor.createSurfacePropertyExposedFoundationPerimeter(arg, ep)
-        else
-          per = per.get
-        end
-
-        kiva = false unless per.respond_to?(:totalExposedPerimeter)
-        next         unless per.respond_to?(:totalExposedPerimeter)
 
-        perimeter = per.totalExposedPerimeter
+        ep   = floors[id][:exposed]
+        per  = floor.createSurfacePropertyExposedFoundationPerimeter(arg, ep)
+        kiva = false if per.empty?
+        next         if per.empty?
+        per           = per.get
+        perimeter     = per.totalExposedPerimeter
         kiva = false if perimeter.empty?
         next         if perimeter.empty?
         perimeter     = perimeter.get
@@ -663,13 +657,7 @@ module TBD
           ok   = per.setTotalExposedPerimeter(0.000)
           ok   = per.setTotalExposedPerimeter(0.001) unless ok
           kiva = false unless ok
-          next         unless ok
-        elsif (perimeter - ep).abs > TOL
-          ok   = per.setTotalExposedPerimeter(ep)
-          kiva = false unless ok
-          next         unless ok
-
-          # Generic 1" XPS insulation for exposed perimeter.
+        elsif (perimeter - ep).abs < TOL
           xps25 = model.getStandardOpaqueMaterialByName("XPS 25mm")
 
           if xps25.empty?
@@ -686,9 +674,11 @@ module TBD
             xps25 = xps25.get
           end
 
-          floors[id][:foundation].setInteriorHorizontalInsulationMaterial(xps25)
-          floors[id][:foundation].setInteriorHorizontalInsulationWidth(0.6)
+          foundation.setInteriorHorizontalInsulationMaterial(xps25)
+          foundation.setInteriorHorizontalInsulationWidth(0.6)
         end
+
+        floors[id][:foundation] = foundation
       end
     end
 

data/lib/tbd/ua.rb

@@ -948,7 +948,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.1"
+      report << "* TBD : v3.0.2"
       report << "* date : #{ua[:date]}"
 
       if lang == :en

data/lib/tbd/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tbd
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Denis Bourgeois & Dan Macumber
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-08 00:00:00.000000000 Z
+date: 2022-09-19 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.1
+  source_code_uri: https://github.com/rd2/tbd/tree/v3.0.2
   bug_tracker_uri: https://github.com/rd2/tbd/issues
 post_install_message:
 rdoc_options: []