Skip to content

Integrates OSut/OSlg updates #121

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
Aug 16, 2025
Merged

Integrates OSut/OSlg updates #121

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
f00d888
Integrates OSut/OSlg updates
brgix Aug 12, 2025
c27cba8
Pulls OSlg release v040
brgix Aug 13, 2025
87ecea8
Pulls OSut v0.7.0 gem
brgix Aug 14, 2025
14a0b96
Updates README & copyright
brgix Aug 15, 2025
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
64 changes: 16 additions & 48 deletions .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,6 @@ on:
- develop

jobs:
test_300x:
runs-on: ubuntu-22.04
steps:
- name: Check out repository
uses: actions/checkout@v2
- name: Run Tests
run: |
echo $(pwd)
echo $(ls)
docker pull nrel/openstudio:3.0.0
docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.0.0
docker exec -t test pwd
docker exec -t test ls
docker exec -t test bundle update
docker exec -t test bundle exec rake
docker kill test
Copy link
Member Author

@brgix brgix Aug 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dropping older OpenStudio SDK version test runs ...

test_321x:
runs-on: ubuntu-22.04
steps:
Expand All @@ -38,38 +22,6 @@ jobs:
docker exec -t test bundle update
docker exec -t test bundle exec rake
docker kill test
test_330x:
runs-on: ubuntu-22.04
steps:
- name: Check out repository
uses: actions/checkout@v2
- name: Run Tests
run: |
echo $(pwd)
echo $(ls)
docker pull nrel/openstudio:3.3.0
docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.3.0
docker exec -t test pwd
docker exec -t test ls
docker exec -t test bundle update
docker exec -t test bundle exec rake
docker kill test
test_340x:
runs-on: ubuntu-22.04
steps:
- name: Check out repository
uses: actions/checkout@v2
- name: Run Tests
run: |
echo $(pwd)
echo $(ls)
docker pull nrel/openstudio:3.4.0
docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.4.0
docker exec -t test pwd
docker exec -t test ls
docker exec -t test bundle update
docker exec -t test bundle exec rake
docker kill test
test_351x:
runs-on: ubuntu-22.04
steps:
Expand Down Expand Up @@ -150,3 +102,19 @@ jobs:
docker exec -t test bundle update
docker exec -t test bundle exec rake
docker kill test
test_3100x:
runs-on: ubuntu-22.04
steps:
- name: Check out repository
uses: actions/checkout@v2
- name: Run Tests
run: |
echo $(pwd)
echo $(ls)
docker pull nrel/openstudio:3.10.0
docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.10.0
docker exec -t test pwd
docker exec -t test ls
docker exec -t test bundle update
docker exec -t test bundle exec rake
docker kill test
Copy link
Member Author

@brgix brgix Aug 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... in favour of more recent ones.

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-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
Expand Down
16 changes: 8 additions & 8 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ bundler -v
gem install bundler -v 2.1
```

Install OpenStudio [3.8.0](https://github.com/NREL/OpenStudio/releases/tag/v3.8.0), or the OpenStudioApplication [1.8.0](https://github.com/openstudiocoalition/OpenStudioApplication/releases/tag/v1.8.0).
Install OpenStudio [3.10.0](https://github.com/NREL/OpenStudio/releases/tag/v3.10.0), or the OpenStudioApplication [1.10.0](https://github.com/openstudiocoalition/OpenStudioApplication/releases/tag/v1.10.0).

Create a new file ```C:\Ruby32-x64\lib\ruby\site_ruby\openstudio.rb``` (path may be different depending on the environment), and edit it so it _points_ to your new OpenStudio installation:
```
require 'C:\openstudio-3.8.0\Ruby\openstudio.rb'
require 'C:\openstudio-3.10.0\Ruby\openstudio.rb'
```

Verify your OpenStudio and Ruby configuration:
Expand Down Expand Up @@ -89,16 +89,16 @@ bundler -v
gem install bundler -v 2.4.10
```

Install OpenStudio [3.8.0](https://github.com/NREL/OpenStudio/releases/tag/v3.8.0), or the OpenStudio Application [1.8.0](https://github.com/openstudiocoalition/OpenStudioApplication/releases/tag/v1.8.0).
Install OpenStudio [3.10.0](https://github.com/NREL/OpenStudio/releases/tag/v3.10.0), or the OpenStudio Application [1.10.0](https://github.com/openstudiocoalition/OpenStudioApplication/releases/tag/v1.10.0).

Create a new file ```~/.rbenv/versions/3.2.2/lib/ruby/site_ruby/openstudio.rb``` (path may be different depending on the environment), and edit it so it _points_ to your new OpenStudio installation:
```
require '/Applications/OpenStudio-3.8.0/Ruby/openstudio.rb'
require '/Applications/OpenStudio-3.10.0/Ruby/openstudio.rb'
```

Verify your local OpenStudio and Ruby configuration:
```
cd ~/Documents/sandbox380
cd ~/Documents/sandbox310
ruby -e "require 'openstudio'" -e "puts OpenStudio::Model::Model.new"
```

Expand All @@ -121,14 +121,14 @@ bundle exec rake

Install [Docker](https://docs.docker.com/desktop/#download-and-install).

Pull the OpenStudio v3.8.0 Docker image:
Pull the OpenStudio v3.10.0 Docker image:
```
docker pull nrel/openstudio:3.8.0
docker pull nrel/openstudio:3.10.0
```

In the root repository:
```
docker run --name test --rm -d -t -v ${PWD}:/work -w /work nrel/openstudio:3.8.0
docker run --name test --rm -d -t -v ${PWD}:/work -w /work nrel/openstudio:3.10.0
docker exec -t test bundle update
docker exec -t test bundle exec rake
docker kill test
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-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
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-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
Expand Down
22 changes: 11 additions & 11 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>70223737-c3ea-4df0-8506-67083c92fb6e</version_id>
<version_modified>2024-11-20T20:02:15Z</version_modified>
<version_id>7a2d773a-7a50-4c69-aa1f-93ed796e9ace</version_id>
<version_modified>2025-08-15T13:39:31Z</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>5C9BFB50</checksum>
<checksum>3EBCA5DB</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>A472E915</checksum>
<checksum>3FBDA0C2</checksum>
</file>
<file>
<filename>geo.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>9FAC0CDC</checksum>
<checksum>EF3BA8F7</checksum>
</file>
<file>
<filename>geometry.rb</filename>
Expand All @@ -517,19 +517,19 @@
<filename>oslog.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>8CD57B9A</checksum>
<checksum>586805C4</checksum>
</file>
<file>
<filename>psi.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>4B7F3586</checksum>
<checksum>71AED953</checksum>
</file>
<file>
<filename>tbd.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>FCCCAE84</checksum>
<checksum>9E26251E</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>626D3BE0</checksum>
<checksum>022F6D10</checksum>
</file>
<file>
<filename>utils.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>CBC3935D</checksum>
<checksum>3CD8019A</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>2ECE06CA</checksum>
<checksum>9C76CD98</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-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
Expand Down
Loading