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

Update GSHP curves #1472

Merged
merged 23 commits into from
Dec 11, 2023
Merged
Changes from 3 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
0d7f020
Add new curves based on latest ClimateMaster TS product
jmaguire1 Aug 23, 2023
adbb079
Use new curves for both heating and cooling, rather than a weird mix
jmaguire1 Aug 23, 2023
e0ac2d2
Slight update to curves to try to match rated conditions (might be sl…
jmaguire1 Aug 23, 2023
998411a
Latest results.
Aug 23, 2023
93f97c2
Merge branch 'geothermal_loop' into gshp_curve_update
joseph-robertson Aug 24, 2023
944a4d2
Latest results.
Aug 25, 2023
aefc7ce
Merge branch 'geothermal_loop' into gshp_curve_update
joseph-robertson Aug 25, 2023
8878d23
Merge branch 'geothermal_loop' into gshp_curve_update
joseph-robertson Oct 11, 2023
938d53a
Latest results.
Oct 11, 2023
dd1a9e8
Merge branch 'geothermal_loop' into gshp_curve_update
joseph-robertson Nov 13, 2023
13e68a8
Latest results.
Nov 13, 2023
7457278
New heating coefficients! Results in a 5-10% decrease in heating COP,…
jmaguire1 Nov 13, 2023
7897cb0
Merge branch 'gshp_curve_update' of https://github.com/NREL/OpenStudi…
jmaguire1 Nov 13, 2023
fd16adb
Merge branch 'geothermal_loop' into gshp_curve_update
joseph-robertson Nov 28, 2023
52090cb
Latest results.
Nov 28, 2023
95796d4
Remove old curve values, clean up comments
jmaguire1 Dec 8, 2023
061edda
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
jmaguire1 Dec 8, 2023
5166661
Oops, wrong base branch. Rebase off 'geothermal loop'
jmaguire1 Dec 8, 2023
21d6b12
Merge branch 'geothermal_loop' of https://github.com/NREL/OpenStudio-…
shorowit Dec 8, 2023
9451af5
Fix incorrect previous conflict resolution.
shorowit Dec 8, 2023
6e29447
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
shorowit Dec 11, 2023
2506265
Latest results.
Dec 11, 2023
90df35f
Update Changelog.md [ci skip]
shorowit Dec 11, 2023
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/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -9,8 +9,8 @@ PR Author: Check these when they're done. Not all may apply. ~~strikethrough~~ a
PR Reviewer: Verify each has been completed.

- [ ] Schematron validator (`EPvalidator.xml`) has been updated
- [ ] Sample files have been added/updated (via `tasks.rb`)
- [ ] Tests have been added/updated (e.g., `HPXMLtoOpenStudio/tests` and/or `workflow/tests/hpxml_translator_test.rb`)
- [ ] Sample files have been added/updated (`openstudio tasks.rb update_hpxmls`)
- [ ] Tests have been added/updated (e.g., `HPXMLtoOpenStudio/tests/test*.rb` and/or `workflow/tests/test*.rb`)
- [ ] Documentation has been updated
- [ ] Changelog has been updated
- [ ] `openstudio tasks.rb update_measures` has been run
45 changes: 37 additions & 8 deletions .github/workflows/config.yml
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ jobs:
run-unit-tests:
runs-on: ubuntu-latest
container:
image: docker://nrel/openstudio:3.6.1
image: docker://nrel/openstudio:3.7.0-rc1
steps:
- uses: actions/checkout@v3
with:
@@ -43,6 +43,12 @@ jobs:
path: coverage
name: coverage

- name: Store results
uses: actions/upload-artifact@v3
with:
path: workflow/tests/results
name: results

- name: Build documentation
run: |
cd docs
@@ -54,10 +60,33 @@ jobs:
name: documentation
path: docs/_build/html/

run-workflow-tests:
run-workflow1-tests:
runs-on: ubuntu-latest
container:
image: docker://nrel/openstudio:3.7.0-rc1
steps:
- uses: actions/checkout@v3
with:
ref: ${{ github.head_ref }}

- name: Install software
run: |
rm -f Gemfile.lock && bundle install

- name: Run workflow tests
run: |
bundle exec rake test_workflow1

- name: Store results
uses: actions/upload-artifact@v3
with:
path: workflow/tests/results
name: results

run-workflow2-tests:
runs-on: ubuntu-latest
container:
image: docker://nrel/openstudio:3.6.1
image: docker://nrel/openstudio:3.7.0-rc1
steps:
- uses: actions/checkout@v3
with:
@@ -69,7 +98,7 @@ jobs:

- name: Run workflow tests
run: |
bundle exec rake test_workflow
bundle exec rake test_workflow2

- name: Store results
uses: actions/upload-artifact@v3
@@ -86,16 +115,16 @@ jobs:
- name: Install software and run test
shell: pwsh
run: |
$env:OS_VERSION="3.6.1"
$env:OS_SHA="bb9481519e"
$env:OS_VERSION="3.7.0-rc1"
$env:OS_SHA="211bb633b0"
Invoke-WebRequest -OutFile Windows.tar.gz -URI "https://github.com/NREL/OpenStudio/releases/download/v${env:OS_VERSION}/OpenStudio-${env:OS_VERSION}+${env:OS_SHA}-Windows.tar.gz"
tar -xzf Windows.tar.gz
& .\OpenStudio-${env:OS_VERSION}+${env:OS_SHA}-Windows\bin\openstudio.exe workflow\run_simulation.rb -x workflow\sample_files\base.xml --hourly ALL --add-component-loads --add-stochastic-schedules

compare-results:
if: github.event_name == 'pull_request'
runs-on: ubuntu-latest
needs: [run-workflow-tests]
needs: [run-workflow1-tests, run-workflow2-tests, run-unit-tests]
steps:
- uses: actions/checkout@v3
with:
@@ -147,7 +176,7 @@ jobs:

update-results:
runs-on: ubuntu-latest
needs: [run-workflow-tests]
needs: [run-workflow1-tests, run-workflow2-tests, run-unit-tests]
steps:
- uses: actions/checkout@v3
with:
6 changes: 5 additions & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -3,7 +3,11 @@ version: 2
sphinx:
configuration: docs/source/conf.py

build:
os: "ubuntu-22.04"
tools:
python: "3.11"

python:
version: "3.8"
install:
- requirements: docs/requirements.txt
Loading