Skip to content
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

Pulls OSut v0.5.0 #114

Merged
merged 8 commits into from
Apr 17, 2024
Merged

Pulls OSut v0.5.0 #114

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d426b45
Pulls OSut v0.5.0
brgix Apr 4, 2024
d46288c
Relaxes fatal errors with invalid surfaces
brgix Apr 9, 2024
3d835d7
Relaxes fatal error checks for invalid edges lengths
brgix Apr 9, 2024
1f6dfad
Mutes polar angle error
brgix Apr 13, 2024
decfa70
Pulls latest OSut commits
brgix Apr 16, 2024
3213ea6
Extends to Ruby 3x
brgix Apr 17, 2024
bfd208e
Updates gemspec (Ruby 3x)
brgix Apr 17, 2024
f15492e
Pulls OSut v0.5.0 (gem)
brgix Apr 17, 2024
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: 2 additions & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
source "https://rubygems.org"

gem "osut", git: "https://github.com/rd2/osut", branch: "geo"

gemspec
10 changes: 5 additions & 5 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>bd35a453-60b3-4329-9699-3c7e8e49b5bf</version_id>
<version_modified>2024-01-01T12:58:55Z</version_modified>
<version_id>d6cc22b3-9e69-46ce-b0ee-19e455d9d56c</version_id>
<version_modified>2024-04-04T13:48:15Z</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 @@ -499,7 +499,7 @@
<filename>geo.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>1D9996A0</checksum>
<checksum>B764BE7E</checksum>
</file>
<file>
<filename>geometry.rb</filename>
Expand All @@ -523,7 +523,7 @@
<filename>psi.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>9B29CA06</checksum>
<checksum>05836D54</checksum>
</file>
<file>
<filename>tbd.rb</filename>
Expand All @@ -547,7 +547,7 @@
<filename>utils.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>7385DFE0</checksum>
<checksum>4ABC0E42</checksum>
</file>
<file>
<filename>version.rb</filename>
Expand Down
4 changes: 2 additions & 2 deletions lib/measures/tbd/resources/geo.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ def faces(s = {}, e = {})
#
# @return [Topolys::Vector3D] true normal vector of s
# @return [nil] if invalid input (see logs)
def trueNormal(s = nil, r = 0)
def truNormal(s = nil, r = 0)
mth = "TBD::#{__callee__}"
cl = OpenStudio::Model::PlanarSurface
return mismatch("surface", s, cl, mth) unless s.is_a?(cl)
Expand Down Expand Up @@ -295,7 +295,7 @@ def properties(surface = nil, argh = {})
return invalid("#{nom} transform", mth, 0, FTL) unless tr[:t] && tr[:r]

t = tr[:t]
n = trueNormal(surface, tr[:r])
n = truNormal(surface, tr[:r])
return invalid("#{nom} normal", mth, 0, FTL) unless n

type = surface.surfaceType.downcase
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
Expand Up @@ -1603,7 +1603,7 @@ def process(model = nil, argh = {})

space = group.space
tr[:r] += space.get.directionofRelativeNorth unless space.empty?
n = trueNormal(s, tr[:r])
n = truNormal(s, tr[:r])
log(FTL, "Can't process '#{id}' true normal (#{mth})") unless n
return tbd unless n

Expand Down
Loading
Loading