Skip to content

Pulls OSut v0.8.1 patch #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brgix merged 4 commits into from
Jan 4, 2026
Merged

Pulls OSut v0.8.1 patch #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d5a8c6c
Pulls OSut v0.8.1 patch
brgix Jan 3, 2026
02acc1f
Updates copyright year
brgix Jan 3, 2026
ca6af89
Pulls OSut v0.8.1 gem
brgix Jan 3, 2026
d82c8b9
Fixes TBD version in UA reports
brgix Jan 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion LICENSE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2020-2025 Denis Bourgeois & Dan Macumber
Copyright (c) 2020-2026 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
Expand Down
2 changes: 1 addition & 1 deletion lib/measures/tbd/LICENSE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2020-2025 Denis Bourgeois & Dan Macumber
Copyright (c) 2020-2026 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
Expand Down
2 changes: 1 addition & 1 deletion lib/measures/tbd/measure.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MIT License
#
# Copyright (c) 2020-2025 Denis Bourgeois & Dan Macumber
# Copyright (c) 2020-2026 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
Expand Down
20 changes: 10 additions & 10 deletions lib/measures/tbd/measure.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<schema_version>3.1</schema_version>
<name>tbd_measure</name>
<uid>8890787b-8c25-4dc8-8641-b6be1b6c2357</uid>
<version_id>0e1528a0-a176-4d46-82d9-d2da40c0abd7</version_id>
<version_modified>2025-09-11T11:27:14Z</version_modified>
<version_id>8649cb7e-2e58-4a6d-ba67-911b6e0a41a6</version_id>
<version_modified>2026-01-04T12:08:45Z</version_modified>
<xml_checksum>99772807</xml_checksum>
<class_name>TBDMeasure</class_name>
<display_name>Thermal Bridging and Derating - TBD</display_name>
Expand Down Expand Up @@ -464,7 +464,7 @@
<filename>LICENSE.md</filename>
<filetype>md</filetype>
<usage_type>license</usage_type>
<checksum>3EBCA5DB</checksum>
<checksum>98D54646</checksum>
</file>
<file>
<filename>README.md</filename>
Expand Down Expand Up @@ -493,13 +493,13 @@
<filename>measure.rb</filename>
<filetype>rb</filetype>
<usage_type>script</usage_type>
<checksum>3FBDA0C2</checksum>
<checksum>489D7CFA</checksum>
</file>
<file>
<filename>geo.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>5AB24CFB</checksum>
<checksum>9CA80CEB</checksum>
</file>
<file>
<filename>geometry.rb</filename>
Expand All @@ -523,13 +523,13 @@
<filename>psi.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>29905280</checksum>
<checksum>B9FB5E02</checksum>
</file>
<file>
<filename>tbd.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>9E26251E</checksum>
<checksum>3919B9B0</checksum>
</file>
<file>
<filename>transformation.rb</filename>
Expand All @@ -541,13 +541,13 @@
<filename>ua.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>0CC24D82</checksum>
<checksum>69C2A886</checksum>
</file>
<file>
<filename>utils.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>6940D006</checksum>
<checksum>BDF50D67</checksum>
</file>
<file>
<filename>version.rb</filename>
Expand All @@ -565,7 +565,7 @@
<filename>tbd_tests.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>9C76CD98</checksum>
<checksum>90CE962F</checksum>
</file>
</files>
</measure>
2 changes: 1 addition & 1 deletion lib/measures/tbd/resources/geo.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MIT License
#
# Copyright (c) 2020-2025 Denis Bourgeois & Dan Macumber
# Copyright (c) 2020-2026 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
Expand Down
2 changes: 1 addition & 1 deletion lib/measures/tbd/resources/psi.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MIT License
#
# Copyright (c) 2020-2025 Denis Bourgeois & Dan Macumber
# Copyright (c) 2020-2026 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
Expand Down
2 changes: 1 addition & 1 deletion lib/measures/tbd/resources/tbd.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MIT License
#
# Copyright (c) 2020-2025 Denis Bourgeois & Dan Macumber
# Copyright (c) 2020-2026 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
Expand Down
4 changes: 2 additions & 2 deletions lib/measures/tbd/resources/ua.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MIT License
#
# Copyright (c) 2020-2025 Denis Bourgeois & Dan Macumber
# Copyright (c) 2020-2026 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
Expand Down Expand Up @@ -1000,7 +1000,7 @@ def ua_md(ua = {}, lang = :en)
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.5.0"
report << "* TBD : v3.5.1"
report << "* date : #{ua[:date]}"

if lang == :en
Expand Down
29 changes: 4 additions & 25 deletions lib/measures/tbd/resources/utils.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# BSD 3-Clause License
#
# Copyright (c) 2022-2025, Denis Bourgeois
# Copyright (c) 2022-2026, Denis Bourgeois
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -530,7 +530,7 @@ def resetUo(lc = nil, film = nil, index = nil, uo = nil, uniq = false)
mt.setName(id)

unless mt.setThermalResistance(r)
return invalid("Failed #{id}: RSi#{de_r.round(2)}", mth)
return invalid("Failed #{id}: RSi#{r.round(2)}", mth)
end

lc.setLayer(index, mt)
Expand All @@ -546,7 +546,7 @@ def resetUo(lc = nil, film = nil, index = nil, uo = nil, uniq = false)
k = (m.thickness / (r + dR)).clamp(KMIN, KMAX)
d = (k * (r + dR)).clamp(DMIN, DMAX)
r = d / k
id = "OSUT:K#{format('%4.3f', k)}:#{format('%03d', d*1000)[-3..-1]}"
id = "OSut:K#{format('%4.3f', k)}:#{format('%03d', d*1000)[-3..-1]}"
mt = lc.model.getStandardOpaqueMaterialByName(id)

# Existing material?
Expand Down Expand Up @@ -928,7 +928,6 @@ def genConstruction(model = nil, specs = {})
if u and a[:glazing].empty?
ro = 1 / u - film


if ro > RMIN
if specs[:type] == :door # 1x layer, adjust conductivity
layer = c.getLayer(0).to_StandardOpaqueMaterial
Expand All @@ -944,27 +943,7 @@ def genConstruction(model = nil, specs = {})
return invalid("#{id} construction", mth, 0) if lyr[:r ].to_i.zero?

index = lyr[:index]
layer = c.getLayer(index).to_StandardOpaqueMaterial
return invalid("#{id} material @#{index}", mth, 0) if layer.empty?

layer = layer.get

k = (layer.thickness / (ro - rsi(c) + lyr[:r])).clamp(KMIN, KMAX)
d = (k * (ro - rsi(c) + lyr[:r])).clamp(DMIN, DMAX)

nom = "OSut:"
nom += layer.nameString.gsub(/[^a-z]/i, "").gsub("OSut", "")
nom += ":K#{format('%4.3f', k)}:#{format('%03d', d*1000)[-3..-1]}"

lyr = model.getStandardOpaqueMaterialByName(nom)

if lyr.empty?
layer.setName(nom)
layer.setConductivity(k)
layer.setThickness(d)
else
c.setLayer(index, lyr.get)
end
resetUo(c, film, index, u)
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion lib/measures/tbd/tests/tbd_tests.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MIT License
#
# Copyright (c) 2020-2025 Denis Bourgeois & Dan Macumber
# Copyright (c) 2020-2026 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
Expand Down
2 changes: 1 addition & 1 deletion lib/tbd.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MIT License
#
# Copyright (c) 2020-2025 Denis Bourgeois & Dan Macumber
# Copyright (c) 2020-2026 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
Expand Down
2 changes: 1 addition & 1 deletion lib/tbd/geo.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MIT License
#
# Copyright (c) 2020-2025 Denis Bourgeois & Dan Macumber
# Copyright (c) 2020-2026 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
Expand Down
2 changes: 1 addition & 1 deletion lib/tbd/psi.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MIT License
#
# Copyright (c) 2020-2025 Denis Bourgeois & Dan Macumber
# Copyright (c) 2020-2026 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
Expand Down
4 changes: 2 additions & 2 deletions lib/tbd/ua.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MIT License
#
# Copyright (c) 2020-2025 Denis Bourgeois & Dan Macumber
# Copyright (c) 2020-2026 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
Expand Down Expand Up @@ -1000,7 +1000,7 @@ def ua_md(ua = {}, lang = :en)
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.5.0"
report << "* TBD : v3.5.1"
report << "* date : #{ua[:date]}"

if lang == :en
Expand Down
4 changes: 2 additions & 2 deletions lib/tbd/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MIT License
#
# Copyright (c) 2020-2025 Denis Bourgeois & Dan Macumber
# Copyright (c) 2020-2026 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
Expand All @@ -21,5 +21,5 @@
# SOFTWARE.

module TBD
VERSION = "3.5.0".freeze
VERSION = "3.5.1".freeze
end
2 changes: 1 addition & 1 deletion tbd.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Gem::Specification.new do |s|
s.metadata = {}

s.add_dependency "topolys", "~> 0"
s.add_dependency "osut", "~> 0.8.0"
s.add_dependency "osut", "~> 0.8.1"
s.add_dependency "json-schema", "~> 4"

s.add_development_dependency "bundler", "~> 2.1"
Expand Down