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

Jump to bottom

Temporary setpoint test #739

Draft
wants to merge 4 commits into
base: multi_climate_tests
Choose a base branch
from
Draft

Temporary setpoint test #739

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
9bfa311
Temporary test.
shorowit Jul 19, 2024
01aecdc
Merge branch 'multi_climate_tests' of https://github.com/NREL/OpenStu…
shorowit Jul 22, 2024
875d6a2
Update expected test values.
shorowit Jul 22, 2024
5ab2e58
Latest results.
Jul 22, 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
100 changes: 50 additions & 50 deletions .github/workflows/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,56 +8,56 @@ on:
workflow_dispatch:

jobs:
run-ruleset-tests:
runs-on: ubuntu-latest
container:
image: docker://nrel/openstudio:3.8.0
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.head_ref }}

- name: Install software
run: |
rm -f Gemfile.lock && bundle install
export DEBIAN_FRONTEND=noninteractive
sudo apt update
sudo -E apt-get install -y wget unzip python3-sphinx-rtd-theme

- name: Check HPXMLs
shell: bash
run: |
echo "Regenerating HPXML files..."
openstudio tasks.rb update_measures
echo "Checking for HPXML differences..."
git config --global --add safe.directory $(realpath .)
git diff --exit-code --ignore-cr-at-eol workflow/*.xml

- name: Run ruleset tests
run: |
bundle exec rake test_rulesets

- name: Store code coverage
uses: actions/upload-artifact@v4
with:
path: coverage
name: coverage

- name: Build documentation
run: |
cd docs
make html SPHINXOPTS="-W --keep-going -n"

- name: Check documentation
run: |
echo "Checking for misaligned documentation footnotes..."
for RST_FILE in docs/source/*.rst; do NUM_REFS=$(grep -F -o "[#]_" $RST_FILE | wc -l); NUM_FOOTNOTES=$(grep -F -o ".. [#]" $RST_FILE | wc -l); if [ $NUM_REFS != $NUM_FOOTNOTES ]; then echo "ERROR: Number of footnote references doesn't match number of footnotes in $RST_FILE." && exit 1; fi done

- name: Save Docs
uses: actions/upload-artifact@v4
with:
name: documentation
path: docs/_build/html/
# run-ruleset-tests:
# runs-on: ubuntu-latest
# container:
# image: docker://nrel/openstudio:3.8.0
# steps:
# - uses: actions/checkout@v4
# with:
# ref: ${{ github.head_ref }}

# - name: Install software
# run: |
# rm -f Gemfile.lock && bundle install
# export DEBIAN_FRONTEND=noninteractive
# sudo apt update
# sudo -E apt-get install -y wget unzip python3-sphinx-rtd-theme

# - name: Check HPXMLs
# shell: bash
# run: |
# echo "Regenerating HPXML files..."
# openstudio tasks.rb update_measures
# echo "Checking for HPXML differences..."
# git config --global --add safe.directory $(realpath .)
# git diff --exit-code --ignore-cr-at-eol workflow/*.xml

# - name: Run ruleset tests
# run: |
# bundle exec rake test_rulesets

# - name: Store code coverage
# uses: actions/upload-artifact@v4
# with:
# path: coverage
# name: coverage

# - name: Build documentation
# run: |
# cd docs
# make html SPHINXOPTS="-W --keep-going -n"

# - name: Check documentation
# run: |
# echo "Checking for misaligned documentation footnotes..."
# for RST_FILE in docs/source/*.rst; do NUM_REFS=$(grep -F -o "[#]_" $RST_FILE | wc -l); NUM_FOOTNOTES=$(grep -F -o ".. [#]" $RST_FILE | wc -l); if [ $NUM_REFS != $NUM_FOOTNOTES ]; then echo "ERROR: Number of footnote references doesn't match number of footnotes in $RST_FILE." && exit 1; fi done

# - name: Save Docs
# uses: actions/upload-artifact@v4
# with:
# name: documentation
# path: docs/_build/html/

run-sample-files1-tests:
runs-on: ubuntu-latest
Expand Down
24 changes: 12 additions & 12 deletions hpxml-measures/HPXMLtoOpenStudio/resources/hvac.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1224,15 +1224,15 @@ def self.get_cooling_setpoints(hvac_control, has_ceiling_fan, year, weather)
# @return [TODO] TODO
def self.get_default_heating_setpoint(control_type, eri_version)
# Per ANSI/RESNET/ICC 301
htg_weekday_setpoints = '68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68'
htg_weekend_setpoints = '68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68'
htg_weekday_setpoints = '72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72'
htg_weekend_setpoints = '72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72'
if control_type == HPXML::HVACControlTypeProgrammable
if Constants.ERIVersions.index(eri_version) >= Constants.ERIVersions.index('2022')
htg_weekday_setpoints = '66, 66, 66, 66, 66, 67, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 66'
htg_weekend_setpoints = '66, 66, 66, 66, 66, 67, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 66'
htg_weekday_setpoints = '70, 70, 70, 70, 70, 71, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 70'
htg_weekend_setpoints = '70, 70, 70, 70, 70, 71, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 70'
else
htg_weekday_setpoints = '66, 66, 66, 66, 66, 66, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 66'
htg_weekend_setpoints = '66, 66, 66, 66, 66, 66, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 66'
htg_weekday_setpoints = '70, 70, 70, 70, 70, 70, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 70'
htg_weekend_setpoints = '70, 70, 70, 70, 70, 70, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 70'
end
elsif control_type != HPXML::HVACControlTypeManual
fail "Unexpected control type #{control_type}."
Expand All @@ -1247,15 +1247,15 @@ def self.get_default_heating_setpoint(control_type, eri_version)
# @return [TODO] TODO
def self.get_default_cooling_setpoint(control_type, eri_version)
# Per ANSI/RESNET/ICC 301
clg_weekday_setpoints = '78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78'
clg_weekend_setpoints = '78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78'
clg_weekday_setpoints = '75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75'
clg_weekend_setpoints = '75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75'
if control_type == HPXML::HVACControlTypeProgrammable
if Constants.ERIVersions.index(eri_version) >= Constants.ERIVersions.index('2022')
clg_weekday_setpoints = '78, 78, 78, 78, 78, 78, 78, 78, 78, 80, 80, 80, 80, 80, 79, 78, 78, 78, 78, 78, 78, 78, 78, 78'
clg_weekend_setpoints = '78, 78, 78, 78, 78, 78, 78, 78, 78, 80, 80, 80, 80, 80, 79, 78, 78, 78, 78, 78, 78, 78, 78, 78'
clg_weekday_setpoints = '75, 75, 75, 75, 75, 75, 75, 75, 75, 77, 77, 77, 77, 77, 76, 75, 75, 75, 75, 75, 75, 75, 75, 75'
clg_weekend_setpoints = '75, 75, 75, 75, 75, 75, 75, 75, 75, 77, 77, 77, 77, 77, 76, 75, 75, 75, 75, 75, 75, 75, 75, 75'
else
clg_weekday_setpoints = '78, 78, 78, 78, 78, 78, 78, 78, 78, 80, 80, 80, 80, 80, 80, 78, 78, 78, 78, 78, 78, 78, 78, 78'
clg_weekend_setpoints = '78, 78, 78, 78, 78, 78, 78, 78, 78, 80, 80, 80, 80, 80, 80, 78, 78, 78, 78, 78, 78, 78, 78, 78'
clg_weekday_setpoints = '75, 75, 75, 75, 75, 75, 75, 75, 75, 77, 77, 77, 77, 77, 77, 75, 75, 75, 75, 75, 75, 75, 75, 75'
clg_weekend_setpoints = '75, 75, 75, 75, 75, 75, 75, 75, 75, 77, 77, 77, 77, 77, 77, 75, 75, 75, 75, 75, 75, 75, 75, 75'
end
elsif control_type != HPXML::HVACControlTypeManual
fail "Unexpected control type #{control_type}."
Expand Down
36 changes: 18 additions & 18 deletions workflow/tests/base_results/EPA_Tests.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
[Version] XML,Reference Home ERI,Rated Home ERI
[MF_National_1.0] MFNCv1_CZ2_FL_gas_ground_corner_slab.xml,65.86,65.86
[MF_National_1.0] MFNCv1_CZ4_MO_gas_top_corner.xml,76.39,76.39
[MF_National_1.0] MFNCv1_CZ6_VT_elec_middle_interior.xml,73.72,73.72
[MF_National_1.1] MFNCv11_CZ2_FL_elec_top_corner.xml,60.74,60.74
[MF_National_1.1] MFNCv11_CZ4_MO_elec_ground_corner_vented_crawl.xml,64.16,64.16
[MF_National_1.1] MFNCv11_CZ6_VT_gas_ground_corner_cond_bsmt.xml,62.51,62.51
[MF_National_1.2] MFNCv12_CZ2_FL_gas_ground_corner_slab.xml,50.29,50.29
[MF_National_1.2] MFNCv12_CZ4_MO_gas_top_corner.xml,48.82,48.82
[MF_National_1.2] MFNCv12_CZ6_VT_elec_middle_interior.xml,59.89,59.89
[SF_National_3.0] SFNHv3_CZ2_FL_gas_slab.xml,72.05,72.05
[SF_National_3.0] SFNHv3_CZ4_MO_gas_vented_crawl.xml,81.71,81.71
[SF_National_3.0] SFNHv3_CZ6_VT_elec_cond_bsmt.xml,71.67,71.67
[SF_National_3.1] SFNHv31_CZ2_FL_elec_slab.xml,62.11,62.11
[SF_National_3.1] SFNHv31_CZ4_MO_elec_vented_crawl.xml,64.44,64.44
[SF_National_3.1] SFNHv31_CZ6_VT_gas_cond_bsmt.xml,58.32,58.32
[SF_National_3.2] SFNHv32_CZ2_FL_gas_slab.xml,50.81,50.81
[SF_National_3.2] SFNHv32_CZ4_MO_gas_vented_crawl.xml,50.24,50.24
[SF_National_3.2] SFNHv32_CZ6_VT_elec_cond_bsmt.xml,52.18,52.18
[MF_National_1.0] MFNCv1_CZ2_FL_gas_ground_corner_slab.xml,65.37,65.37
[MF_National_1.0] MFNCv1_CZ4_MO_gas_top_corner.xml,76.65,76.65
[MF_National_1.0] MFNCv1_CZ6_VT_elec_middle_interior.xml,71.9,71.9
[MF_National_1.1] MFNCv11_CZ2_FL_elec_top_corner.xml,58.55,58.55
[MF_National_1.1] MFNCv11_CZ4_MO_elec_ground_corner_vented_crawl.xml,62.53,62.53
[MF_National_1.1] MFNCv11_CZ6_VT_gas_ground_corner_cond_bsmt.xml,61.62,61.62
[MF_National_1.2] MFNCv12_CZ2_FL_gas_ground_corner_slab.xml,50.37,50.37
[MF_National_1.2] MFNCv12_CZ4_MO_gas_top_corner.xml,47.51,47.51
[MF_National_1.2] MFNCv12_CZ6_VT_elec_middle_interior.xml,57.64,57.64
[SF_National_3.0] SFNHv3_CZ2_FL_gas_slab.xml,72.35,72.35
[SF_National_3.0] SFNHv3_CZ4_MO_gas_vented_crawl.xml,81.68,81.68
[SF_National_3.0] SFNHv3_CZ6_VT_elec_cond_bsmt.xml,70.63,70.63
[SF_National_3.1] SFNHv31_CZ2_FL_elec_slab.xml,60.38,60.38
[SF_National_3.1] SFNHv31_CZ4_MO_elec_vented_crawl.xml,62.94,62.94
[SF_National_3.1] SFNHv31_CZ6_VT_gas_cond_bsmt.xml,57.17,57.17
[SF_National_3.2] SFNHv32_CZ2_FL_gas_slab.xml,50.96,50.96
[SF_National_3.2] SFNHv32_CZ4_MO_gas_vented_crawl.xml,49.18,49.18
[SF_National_3.2] SFNHv32_CZ6_VT_elec_cond_bsmt.xml,51.12,51.12
6 changes: 3 additions & 3 deletions workflow/tests/base_results/RESNET_Test_4.2_HERS_AutoGen_Reference_Home.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ Labeled heating system rating and efficiency,0.78,7.7,7.7,0.78
Labeled cooling system rating and efficiency,13.0,13.0,13.0,13.0
Air Distribution System Efficiency,0.8,0.8,0.8,0.8
Thermostat Type,manual,manual,manual,manual
Heating thermostat settings,68,68,68,68
Cooling thermostat settings,78,78,78,78
Heating thermostat settings,72,72,72,72
Cooling thermostat settings,75,75,75,75
Mechanical ventilation (kWh/y),0.0,223.88,288.07,763.41
DHW pipe length refPipeL,88.5,88.5,88.5,98.5
DHW loop length refLoopL,156.9,156.9,156.9,176.9
e-Ratio,0.9999831,1.0000059,1.0000194,0.9999931
e-Ratio,0.9999809,1.0000061,1.0000185,0.9999897
10 changes: 5 additions & 5 deletions workflow/tests/base_results/RESNET_Test_4.3_HERS_Method.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Test Case,ERI,REUL Heating (MBtu),REUL Cooling (MBtu),REUL Hot Water (MBtu),EC_r Heating (MBtu),EC_r Cooling (MBtu),EC_r Hot Water (MBtu),EC_x Heating (MBtu),EC_x Cooling (MBtu),EC_x Hot Water (MBtu),EC_x L&A (MBtu),IAD_Save (%)
L100A-01.xml,160.76,23.49,6.15,10.94,18.4,3.13,11.97,41.41,5.05,12.57,20.23,-0.15604
L100A-02.xml,151.48,22.36,6.67,10.94,17.62,3.38,18.89,41.74,5.03,14.51,22.2,-0.15306
L100A-03.xml,148.95,22.7,6.13,8.75,36.13,3.84,9.78,74.95,4.86,10.38,21.06,-0.16907
L100A-04.xml,129.16,23.89,6.37,13.07,18.7,3.25,14.1,27.07,5.25,14.7,21.17,-0.15604
L100A-05.xml,126.32,23.06,6.37,10.94,36.7,4.01,11.97,60.46,5.06,12.57,22.2,-0.17006
L100A-01.xml,161.54,30.44,11.62,10.94,24.17,5.6,11.95,53.23,7.51,12.52,20.3,-0.15928
L100A-02.xml,153.45,29.23,12.44,10.94,23.32,5.96,18.77,53.58,7.49,14.51,22.27,-0.15499
L100A-03.xml,148.64,29.49,11.58,8.75,46.94,6.11,9.75,94.61,6.79,10.33,21.13,-0.17828
L100A-04.xml,128.28,30.97,11.95,13.07,24.58,5.79,14.07,34.78,7.74,14.65,21.24,-0.15928
L100A-05.xml,125.16,29.98,11.95,10.94,47.71,6.4,11.95,76.42,7.04,12.52,22.27,-0.17996
Loading