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.

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

1.2.0 #174

Merged
merged 50 commits into from
Jun 28, 2024
Merged

1.2.0 #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
06d3311
thermal_zone_get_occupancy_schedule moved from Standard class to Open…
MatthewSteen May 24, 2024
50f9370
update openstudio_results to remove extension gem and use SDK method
MatthewSteen May 24, 2024
4d9fd7d
remove lines
MatthewSteen May 24, 2024
fd0dacf
Revert "Revert "add gbxml postprocess measure""
MatthewSteen Jun 6, 2024
7f3dbd0
Revert "Revert "remove add_xml_output_control_style and gbxml_to_open…
MatthewSteen Jun 6, 2024
1540125
add heat exchanger effectiveness tables
eringold Jun 17, 2024
6e5a819
update standards method calls
eringold Jun 17, 2024
a60518b
update action with 3.8.0 image
MatthewSteen Jun 24, 2024
a378480
update .env for 3.8.0
MatthewSteen Jun 24, 2024
54f9759
table name
eringold Jun 24, 2024
1f9c480
correct air system component test
eringold Jun 24, 2024
7df8a2d
update air system test gbxml
eringold Jun 24, 2024
4d53a34
Merge branch 'openstudio-380' of https://github.com/NREL/gbxml-to-ope…
eringold Jun 24, 2024
68818fa
correct call to private method
eringold Jun 24, 2024
e840374
Revert "update standards method calls"
MatthewSteen Jun 24, 2024
944d1b8
cherry pick 6e5a819fb60e3abdea0101dfaa88f3ea8c0e14ab
MatthewSteen Jun 25, 2024
898149f
make constant name plural
MatthewSteen Jun 25, 2024
ec106b6
Merge pull request #159 from NREL/openstudio-standards-061
MatthewSteen Jun 25, 2024
5db66ea
Merge pull request #160 from NREL/openstudio-380
eringold Jun 26, 2024
2425d33
cherry pick 0251fdc9f0eb7c981cf6a088bef9a06f9c69559d
MatthewSteen Jun 27, 2024
2845d55
Merge pull request #167 from NREL/fix_osreport_units_develop
MatthewSteen Jun 27, 2024
9bd77d1
v0.10.0.rc1 ChangeBuildingLocation
MatthewSteen Jun 27, 2024
18f0d1d
openstudio_results updates (still customized)
MatthewSteen Jun 27, 2024
93df825
Merge pull request #169 from NREL/common-measures-0.10.0.rc1
MatthewSteen Jun 27, 2024
0ff7a85
Merge pull request #161 from NREL/revert-146-revert-127-add/gbxml_pos…
MatthewSteen Jun 27, 2024
9ffda4e
Merge pull request #162 from NREL/revert-145-revert-138-remove/postpr…
MatthewSteen Jun 27, 2024
4bdd6d0
rm empty docs/ and LICENSE.md files
MatthewSteen Jun 28, 2024
6163973
Merge pull request #170 from NREL/cleanup-measure-files
MatthewSteen Jun 28, 2024
5b9045c
gbxml_import dir
MatthewSteen Jun 28, 2024
bc93bb1
mv import_gbxml => gbxml_import
MatthewSteen Jun 28, 2024
965872f
mv advanced_import_gbxml => gbxml_import_advanced
MatthewSteen Jun 28, 2024
4778e91
mv gbxml_hvac_import => gbxml_import_hvac
MatthewSteen Jun 28, 2024
ffe5c3c
update workflows
MatthewSteen Jun 28, 2024
67ff4ac
measure -u gbxml_import
MatthewSteen Jun 28, 2024
a860f99
measure -u gbxml_import
MatthewSteen Jun 28, 2024
b6e6e7c
add README to gbxml_import
MatthewSteen Jun 28, 2024
23941fc
measure -u gbxml_import_advanced
MatthewSteen Jun 28, 2024
f391b90
measure -u gbxml_import_hvac
MatthewSteen Jun 28, 2024
66dd968
mv *_test.rb files
MatthewSteen Jun 28, 2024
2bc22d4
update *_test.rb class names
MatthewSteen Jun 28, 2024
dcaff96
mv gbxml_hvac_import.rb => gbxml_import_hvac.rb
MatthewSteen Jun 28, 2024
59ec89b
update require_relative
MatthewSteen Jun 28, 2024
25c0cd8
update RegressionTesting.osw
MatthewSteen Jun 28, 2024
17c7a26
fix gbxml_import_advanced xml
MatthewSteen Jun 28, 2024
1abe06f
mv AIP files
MatthewSteen Jun 28, 2024
d517206
mv os.ico to aip/
MatthewSteen Jun 28, 2024
41eb945
v1.2.0 AIP files
MatthewSteen Jun 28, 2024
3e7452a
update CHANGELOG
MatthewSteen Jun 28, 2024
f10aa7a
update Rakefile
MatthewSteen Jun 28, 2024
11a51ae
Merge pull request #173 from NREL/1.2.0
MatthewSteen Jun 28, 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
4 changes: 2 additions & 2 deletions .github/workflows/test_gbxml_with_openstudio.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
# The type of runner that the job will run on
runs-on: ubuntu-latest
container:
image: nrel/openstudio:3.6.0
image: nrel/openstudio:3.8.0

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: install node and test
shell: bash
run: |
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# Changelog

## [1.2.0] - 2024-06-28
- OpenStudio v3.8.0
- EnergyPlus v24.1.0

## [1.1.9] - 2024-05-14
- OpenStudio v3.6.0
- EnergyPlus v23.1.0
- Measure fixes
- Jira-REVIT-218565

## [1.1.8] - 2023-11-13
- OpenStudio v3.6.0
- EnergyPlus v23.1.0
Expand Down
1,213 changes: 0 additions & 1,213 deletions OpenStudio CLI For Revit 2022.aip

This file was deleted.

1,213 changes: 0 additions & 1,213 deletions OpenStudio CLI For Revit 2023.aip

This file was deleted.

1,213 changes: 0 additions & 1,213 deletions OpenStudio CLI For Revit 2024.aip

This file was deleted.

1,213 changes: 0 additions & 1,213 deletions OpenStudio CLI For Revit 2025.aip

This file was deleted.

1,213 changes: 0 additions & 1,213 deletions OpenStudio CLI For Revit 2026.aip

This file was deleted.

7 changes: 3 additions & 4 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,17 @@ if ENV['BUNDLE_GEMFILE']
end

# constants
OS_DIR = 'C:\openstudio-3.8.0\bin'
EP_DIR = 'C:\EnergyPlusV24-1-0-revit'
ROOT_DIR = File.join(File.dirname(__FILE__))
PRESIGN_DIR = 'build'
OS_DIR = 'C:\openstudio-3.6.0\bin'
EP_DIR = 'C:\EnergyPlusV23-1-0-revit'
PYTHON = false

POSTSIGN_DIR = "#{PRESIGN_DIR}.signed/#{PRESIGN_DIR}"
EP_FILES_UNSIGNED = [
'Energy+.idd',
'Energy+.schema.epJSON',
'energyplusapi.lib'
]
PYTHON = false
OSW_FILES = [
'Annual Building Energy Simulation.osw',
'HVAC Systems Loads and Sizing.osw'
Expand Down
842 changes: 842 additions & 0 deletions aip/OpenStudio CLI For Revit 2022.aip

Large diffs are not rendered by default.

842 changes: 842 additions & 0 deletions aip/OpenStudio CLI For Revit 2023.aip

Large diffs are not rendered by default.

842 changes: 842 additions & 0 deletions aip/OpenStudio CLI For Revit 2024.aip

Large diffs are not rendered by default.

842 changes: 842 additions & 0 deletions aip/OpenStudio CLI For Revit 2025.aip

Large diffs are not rendered by default.

842 changes: 842 additions & 0 deletions aip/OpenStudio CLI For Revit 2026.aip

Large diffs are not rendered by default.

File renamed without changes.
28 changes: 7 additions & 21 deletions measures/ChangeBuildingLocation/LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,27 +1,13 @@
OpenStudio(R), Copyright (c) 2008-2018, Alliance for Sustainable Energy, LLC. All rights reserved.
OpenStudio(R), Copyright (c) 2008, 2023 Alliance for Sustainable Energy, LLC.

Redistribution and use in source and binary forms, with or without modification, are permitted
provided that the following conditions are met:
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

(1) Redistributions of source code must retain the above copyright notice, this list of conditions
and the following disclaimer.
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.

(2) Redistributions in binary form must reproduce the above copyright notice, this list of conditions
and the following disclaimer in the documentation and/or other materials provided with the distribution.
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.

(3) Neither the name of the copyright holder nor the names of any contributors may be used to endorse
or promote products derived from this software without specific prior written permission from the
respective party.
3. Redistribution of this software, without modification, must refer to the software by the same designation. Redistribution of a modified version of this software (i) may not refer to the modified version by the same designation, or by any confusingly similar designation, and (ii) must refer to the underlying software originally provided by Alliance as “OpenStudio®”. Except to comply with the foregoing, the term “OpenStudio®”, or any confusingly similar designation may not be used to refer to any modified version of this software or any modified version of the underlying software originally provided by Alliance without the prior written consent of Alliance.

(4) Other than as required in clauses (1) and (2), distributions in any form of modifications or other
derivative works may not use the "OpenStudio" trademark, "OS", "os", or any other confusingly similar
designation without specific prior written permission from Alliance for Sustainable Energy, LLC.
4. The name of the copyright holder(s), any contributors, the United States Government, the United States Department of Energy, or any of their employees may not be used to endorse or promote products derived from this software without specific prior written permission from the respective party.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER, THE UNITED STATES GOVERNMENT,
OR ANY CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S), ANY CONTRIBUTORS, THE UNITED STATES GOVERNMENT, OR THE UNITED STATES DEPARTMENT OF ENERGY, NOR ANY OF THEIR EMPLOYEES, BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
51 changes: 51 additions & 0 deletions measures/ChangeBuildingLocation/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,54 @@ Name of the weather file to change to. This is the filename with the extension (



### Climate Zone.

**Name:** climate_zone,
**Type:** Choice,
**Units:** ,
**Required:** true,
**Model Dependent:** false


**Choice Display Names** ["Lookup From Stat File", "ASHRAE 169-2013-1A", "ASHRAE 169-2013-1B", "ASHRAE 169-2013-2A", "ASHRAE 169-2013-2B", "ASHRAE 169-2013-3A", "ASHRAE 169-2013-3B", "ASHRAE 169-2013-3C", "ASHRAE 169-2013-4A", "ASHRAE 169-2013-4B", "ASHRAE 169-2013-4C", "ASHRAE 169-2013-5A", "ASHRAE 169-2013-5B", "ASHRAE 169-2013-5C", "ASHRAE 169-2013-6A", "ASHRAE 169-2013-6B", "ASHRAE 169-2013-7A", "ASHRAE 169-2013-8A", "CEC T24-CEC1", "CEC T24-CEC2", "CEC T24-CEC3", "CEC T24-CEC4", "CEC T24-CEC5", "CEC T24-CEC6", "CEC T24-CEC7", "CEC T24-CEC8", "CEC T24-CEC9", "CEC T24-CEC10", "CEC T24-CEC11", "CEC T24-CEC12", "CEC T24-CEC13", "CEC T24-CEC14", "CEC T24-CEC15", "CEC T24-CEC16"]



### Set Calendar Year
This will impact the day of the week the simulation starts on. An input value of 0 will leave the year un-altered
**Name:** set_year,
**Type:** Integer,
**Units:** ,
**Required:** true,
**Model Dependent:** false




### Use Upstream Argument Values
When true this will look for arguments or registerValues in upstream measures that match arguments from this measure, and will use the value from the upstream measure in place of what is entered for this measure.
**Name:** use_upstream_args,
**Type:** Boolean,
**Units:** ,
**Required:** true,
**Model Dependent:** false




### Find and replace option from existing weather file name.
This will override what is entered in weather file name or from upstream measures, unless Do Nothing is selected.
**Name:** epw_gsub,
**Type:** Choice,
**Units:** ,
**Required:** true,
**Model Dependent:** false


**Choice Display Names** ["Do Nothing", "TMY3,AMY", "AMY,TMY3"]






5 changes: 5 additions & 0 deletions measures/ChangeBuildingLocation/README.md.erb
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@
**Units:** <%= argument[:units] %>,
**Required:** <%= argument[:required] %>,
**Model Dependent:** <%= argument[:model_dependent] %>

<% if argument[:type] == "Choice" && !argument[:model_dependent]%>
**Choice Display Names** <%= argument[:choice_display_names] %>
<% end %>

<% end %>

<% if arguments.size == 0 %>
Expand Down
Loading