Merge pull request #1006 from NREL/latest-os-hpxml

Latest OS-HPXML
NREL · Nov 16, 2022 · 770eb46 · 770eb46
2 parents 8173412 + 7015d58
commit 770eb46
Show file tree

Hide file tree

Showing 594 changed files with 96,059 additions and 66,784 deletions.
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
@@ -11,7 +11,7 @@ jobs:
   unit-tests:
     runs-on: ubuntu-latest
     container:
-      image: docker://nrel/openstudio:3.4.0
+      image: docker://nrel/openstudio:3.5.0
     steps:
       - uses: actions/checkout@v2
         with:
@@ -42,7 +42,7 @@ jobs:
   analysis-tests:
     runs-on: ubuntu-latest
     container:
-      image: docker://nrel/openstudio:3.4.0
+      image: docker://nrel/openstudio:3.5.0
     steps:
       - uses: actions/checkout@v2
         with:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,7 @@ Features
 - Add ability to calculate simple utility bills for various scenarios ([#984](https://github.com/NREL/resstock/pull/984))
 - Modeled floor area based on AHS 2021 and AHS 2019 ([#978](https://github.com/NREL/resstock/pull/978))
 - Add area median income ([#1004](https://github.com/NREL/resstock/pull/1004))
+- Update to OpenStudio v3.5.0 ([#1006](https://github.com/NREL/resstock/pull/1006))
 
 Fixes
 - Clean up option names for natural ventilation and hot water distribution ([#828](https://github.com/NREL/resstock/pull/828))

diff --git a/docs/read_the_docs/source/advanced_tutorial/options_lookup.rst b/docs/read_the_docs/source/advanced_tutorial/options_lookup.rst
@@ -17,7 +17,7 @@ An example of this error is given below:
 
 .. code:: bash
 
-  $ /c/openstudio-3.4.0/bin/openstudio.exe tasks.rb integrity_check_testing
+  $ /c/openstudio-3.5.0/bin/openstudio.exe tasks.rb integrity_check_testing
   ...
   Error executing argv: ["integrity_check_testing"]
   Error: ERROR: Could not find parameter 'Insulation Wall' and option 'Wood Stud, Uninsulated' in C:/OpenStudio/resstock/test/../resources/options_lookup.tsv.
@@ -33,7 +33,7 @@ An example of this error is given below:
 
 .. code:: bash
 
-  $ /c/openstudio-3.4.0/bin/openstudio.exe tasks.rb integrity_check_testing
+  $ /c/openstudio-3.5.0/bin/openstudio.exe tasks.rb integrity_check_testing
   ...
   Error executing argv: ["integrity_check_testing"]
   Error: ERROR: Required argument 'wall_assembly_r' not provided in C:/OpenStudio/resstock/test/../resources/options_lookup.tsv for measure 'ResStockArguments'.
diff --git a/measures/UpgradeCosts/tests/MF_1story_UB_Furnace_AC1_FuelTankWH.osw b/measures/UpgradeCosts/tests/MF_1story_UB_Furnace_AC1_FuelTankWH.osw
@@ -81,6 +81,7 @@
         "dwhr_facilities_connected": "none",
         "extra_refrigerator_present": false,
         "extra_refrigerator_usage_multiplier": 1.0,
+        "floor_type": "WoodFrame",
         "floor_over_foundation_assembly_r": 18.7,
         "floor_over_garage_assembly_r": 18.7,
         "foundation_wall_insulation_distance_to_bottom": 0.0,

diff --git a/measures/UpgradeCosts/tests/MF_2story_UB_ASHP2_HPWH.osw b/measures/UpgradeCosts/tests/MF_2story_UB_ASHP2_HPWH.osw
@@ -81,6 +81,7 @@
         "dwhr_facilities_connected": "none",
         "extra_refrigerator_present": false,
         "extra_refrigerator_usage_multiplier": 1.0,
+        "floor_type": "WoodFrame",
         "floor_over_foundation_assembly_r": 18.7,
         "floor_over_garage_assembly_r": 18.7,
         "foundation_wall_insulation_distance_to_bottom": 0.0,

diff --git a/measures/UpgradeCosts/tests/MF_2story_UB_FuelBoiler_AC1_FuelTankWH.osw b/measures/UpgradeCosts/tests/MF_2story_UB_FuelBoiler_AC1_FuelTankWH.osw
@@ -81,6 +81,7 @@
         "dwhr_facilities_connected": "none",
         "extra_refrigerator_present": false,
         "extra_refrigerator_usage_multiplier": 1.0,
+        "floor_type": "WoodFrame",
         "floor_over_foundation_assembly_r": 18.7,
         "floor_over_garage_assembly_r": 18.7,
         "foundation_wall_insulation_distance_to_bottom": 0.0,

diff --git a/measures/UpgradeCosts/tests/MF_2story_UB_Furnace_AC1_FuelTankWH.osw b/measures/UpgradeCosts/tests/MF_2story_UB_Furnace_AC1_FuelTankWH.osw
@@ -81,6 +81,7 @@
         "dwhr_facilities_connected": "none",
         "extra_refrigerator_present": false,
         "extra_refrigerator_usage_multiplier": 1.0,
+        "floor_type": "WoodFrame",
         "floor_over_foundation_assembly_r": 18.7,
         "floor_over_garage_assembly_r": 18.7,
         "foundation_wall_insulation_distance_to_bottom": 0.0,

diff --git a/measures/UpgradeCosts/tests/SFA_2story_FB_FuelBoiler_RoomAC_FuelTankWH.osw b/measures/UpgradeCosts/tests/SFA_2story_FB_FuelBoiler_RoomAC_FuelTankWH.osw
@@ -81,6 +81,7 @@
         "dwhr_facilities_connected": "none",
         "extra_refrigerator_present": false,
         "extra_refrigerator_usage_multiplier": 1.0,
+        "floor_type": "WoodFrame",
         "floor_over_foundation_assembly_r": 18.7,
         "floor_over_garage_assembly_r": 18.7,
         "foundation_wall_insulation_distance_to_bottom": 8.0,

diff --git a/measures/UpgradeCosts/tests/SFA_2story_UB_ASHP2_HPWH.osw b/measures/UpgradeCosts/tests/SFA_2story_UB_ASHP2_HPWH.osw
@@ -81,6 +81,7 @@
         "dwhr_facilities_connected": "none",
         "extra_refrigerator_present": false,
         "extra_refrigerator_usage_multiplier": 1.0,
+        "floor_type": "WoodFrame",
         "floor_over_foundation_assembly_r": 18.7,
         "floor_over_garage_assembly_r": 18.7,
         "foundation_wall_insulation_distance_to_bottom": 0.0,

diff --git a/measures/UpgradeCosts/tests/SFA_2story_UB_FuelBoiler_RoomAC_FuelTankWH.osw b/measures/UpgradeCosts/tests/SFA_2story_UB_FuelBoiler_RoomAC_FuelTankWH.osw
@@ -81,6 +81,7 @@
         "dwhr_facilities_connected": "none",
         "extra_refrigerator_present": false,
         "extra_refrigerator_usage_multiplier": 1.0,
+        "floor_type": "WoodFrame",
         "floor_over_foundation_assembly_r": 18.7,
         "floor_over_garage_assembly_r": 18.7,
         "foundation_wall_insulation_distance_to_bottom": 0.0,

diff --git a/measures/UpgradeCosts/tests/SFA_2story_UB_Furnace_RoomAC_FuelTankWH.osw b/measures/UpgradeCosts/tests/SFA_2story_UB_Furnace_RoomAC_FuelTankWH.osw
@@ -81,6 +81,7 @@
         "dwhr_facilities_connected": "none",
         "extra_refrigerator_present": false,
         "extra_refrigerator_usage_multiplier": 1.0,
+        "floor_type": "WoodFrame",
         "floor_over_foundation_assembly_r": 18.7,
         "floor_over_garage_assembly_r": 18.7,
         "foundation_wall_insulation_distance_to_bottom": 0.0,

diff --git a/measures/UpgradeCosts/tests/SFD_1story_FB_UA_GRG_MSHP_FuelTanklessWH.osw b/measures/UpgradeCosts/tests/SFD_1story_FB_UA_GRG_MSHP_FuelTanklessWH.osw
@@ -81,6 +81,7 @@
         "dwhr_facilities_connected": "none",
         "extra_refrigerator_present": false,
         "extra_refrigerator_usage_multiplier": 1.0,
+        "floor_type": "WoodFrame",
         "floor_over_foundation_assembly_r": 18.7,
         "floor_over_garage_assembly_r": 18.7,
         "foundation_wall_insulation_distance_to_bottom": 8.0,

diff --git a/measures/UpgradeCosts/tests/SFD_1story_FB_UA_GRG_RoomAC_ElecBoiler_FuelTanklessWH.osw b/measures/UpgradeCosts/tests/SFD_1story_FB_UA_GRG_RoomAC_ElecBoiler_FuelTanklessWH.osw
@@ -81,6 +81,7 @@
         "dwhr_facilities_connected": "none",
         "extra_refrigerator_present": false,
         "extra_refrigerator_usage_multiplier": 1.0,
+        "floor_type": "WoodFrame",
         "floor_over_foundation_assembly_r": 18.7,
         "floor_over_garage_assembly_r": 18.7,
         "foundation_wall_insulation_distance_to_bottom": 8.0,

diff --git a/measures/UpgradeCosts/tests/SFD_1story_UB_UA_ASHP2_HPWH.osw b/measures/UpgradeCosts/tests/SFD_1story_UB_UA_ASHP2_HPWH.osw
@@ -81,6 +81,7 @@
         "dwhr_facilities_connected": "none",
         "extra_refrigerator_present": false,
         "extra_refrigerator_usage_multiplier": 1.0,
+        "floor_type": "WoodFrame",
         "floor_over_foundation_assembly_r": 18.7,
         "floor_over_garage_assembly_r": 18.7,
         "foundation_wall_insulation_distance_to_bottom": 0.0,

diff --git a/measures/UpgradeCosts/tests/SFD_1story_UB_UA_GRG_ACV_FuelFurnace_HPWH.osw b/measures/UpgradeCosts/tests/SFD_1story_UB_UA_GRG_ACV_FuelFurnace_HPWH.osw
@@ -81,6 +81,7 @@
         "dwhr_facilities_connected": "none",
         "extra_refrigerator_present": false,
         "extra_refrigerator_usage_multiplier": 1.0,
+        "floor_type": "WoodFrame",
         "floor_over_foundation_assembly_r": 18.7,
         "floor_over_garage_assembly_r": 18.7,
         "foundation_wall_insulation_distance_to_bottom": 0.0,

diff --git a/measures/UpgradeCosts/tests/SFD_1story_UB_UA_GRG_ACV_FuelFurnace_PortableHeater_HPWH.osw b/measures/UpgradeCosts/tests/SFD_1story_UB_UA_GRG_ACV_FuelFurnace_PortableHeater_HPWH.osw
@@ -81,6 +81,7 @@
         "dwhr_facilities_connected": "none",
         "extra_refrigerator_present": false,
         "extra_refrigerator_usage_multiplier": 1.0,
+        "floor_type": "WoodFrame",
         "floor_over_foundation_assembly_r": 18.7,
         "floor_over_garage_assembly_r": 18.7,
         "foundation_wall_insulation_distance_to_bottom": 0.0,

diff --git a/measures/UpgradeCosts/tests/SFD_2story_CS_UA_AC2_FuelBoiler_FuelTankWH.osw b/measures/UpgradeCosts/tests/SFD_2story_CS_UA_AC2_FuelBoiler_FuelTankWH.osw
@@ -81,6 +81,7 @@
         "dwhr_facilities_connected": "none",
         "extra_refrigerator_present": false,
         "extra_refrigerator_usage_multiplier": 1.0,
+        "floor_type": "WoodFrame",
         "floor_over_foundation_assembly_r": 18.7,
         "floor_over_garage_assembly_r": 18.7,
         "foundation_wall_insulation_distance_to_bottom": 4.0,

diff --git a/measures/UpgradeCosts/tests/SFD_2story_CS_UA_GRG_ASHPV_FuelTanklessWH.osw b/measures/UpgradeCosts/tests/SFD_2story_CS_UA_GRG_ASHPV_FuelTanklessWH.osw
@@ -81,6 +81,7 @@
         "dwhr_facilities_connected": "none",
         "extra_refrigerator_present": false,
         "extra_refrigerator_usage_multiplier": 1.0,
+        "floor_type": "WoodFrame",
         "floor_over_foundation_assembly_r": 18.7,
         "floor_over_garage_assembly_r": 18.7,
         "foundation_wall_insulation_distance_to_bottom": 4.0,

diff --git a/measures/UpgradeCosts/tests/SFD_2story_FB_UA_GRG_AC1_ElecBaseboard_FuelTankWH.osw b/measures/UpgradeCosts/tests/SFD_2story_FB_UA_GRG_AC1_ElecBaseboard_FuelTankWH.osw
@@ -81,6 +81,7 @@
         "dwhr_facilities_connected": "none",
         "extra_refrigerator_present": false,
         "extra_refrigerator_usage_multiplier": 1.0,
+        "floor_type": "WoodFrame",
         "floor_over_foundation_assembly_r": 18.7,
         "floor_over_garage_assembly_r": 18.7,
         "foundation_wall_insulation_distance_to_bottom": 8.0,

diff --git a/measures/UpgradeCosts/tests/SFD_2story_FB_UA_GRG_AC1_UnitHeater_FuelTankWH.osw b/measures/UpgradeCosts/tests/SFD_2story_FB_UA_GRG_AC1_UnitHeater_FuelTankWH.osw
@@ -81,6 +81,7 @@
         "dwhr_facilities_connected": "none",
         "extra_refrigerator_present": false,
         "extra_refrigerator_usage_multiplier": 1.0,
+        "floor_type": "WoodFrame",
         "floor_over_foundation_assembly_r": 18.7,
         "floor_over_garage_assembly_r": 18.7,
         "foundation_wall_insulation_distance_to_bottom": 8.0,

diff --git a/measures/UpgradeCosts/tests/SFD_2story_FB_UA_GRG_GSHP_ElecTanklessWH.osw b/measures/UpgradeCosts/tests/SFD_2story_FB_UA_GRG_GSHP_ElecTanklessWH.osw
@@ -81,6 +81,7 @@
         "dwhr_facilities_connected": "none",
         "extra_refrigerator_present": false,
         "extra_refrigerator_usage_multiplier": 1.0,
+        "floor_type": "WoodFrame",
         "floor_over_foundation_assembly_r": 18.7,
         "floor_over_garage_assembly_r": 18.7,
         "foundation_wall_insulation_distance_to_bottom": 8.0,

diff --git a/measures/UpgradeCosts/tests/SFD_2story_PB_UA_ElecFurnace_ElecTankWH.osw b/measures/UpgradeCosts/tests/SFD_2story_PB_UA_ElecFurnace_ElecTankWH.osw
@@ -81,6 +81,7 @@
         "dwhr_facilities_connected": "none",
         "extra_refrigerator_present": false,
         "extra_refrigerator_usage_multiplier": 1.0,
+        "floor_type": "WoodFrame",
         "floor_over_foundation_assembly_r": 18.7,
         "floor_over_garage_assembly_r": 18.7,
         "foundation_wall_insulation_distance_to_bottom": 0.0,

diff --git a/measures/UpgradeCosts/tests/SFD_2story_S_UA_GRG_ASHP1_Fireplace_FuelTanklessWH.osw b/measures/UpgradeCosts/tests/SFD_2story_S_UA_GRG_ASHP1_Fireplace_FuelTanklessWH.osw
@@ -81,6 +81,7 @@
         "dwhr_facilities_connected": "none",
         "extra_refrigerator_present": false,
         "extra_refrigerator_usage_multiplier": 1.0,
+        "floor_type": "WoodFrame",
         "floor_over_foundation_assembly_r": 18.7,
         "floor_over_garage_assembly_r": 18.7,
         "foundation_wall_insulation_distance_to_bottom": 0.0,

diff --git a/measures/UpgradeCosts/tests/SFD_2story_S_UA_GRG_ASHP1_Fireplace_FuelTanklessWH_ERV.osw b/measures/UpgradeCosts/tests/SFD_2story_S_UA_GRG_ASHP1_Fireplace_FuelTanklessWH_ERV.osw
@@ -81,6 +81,7 @@
         "dwhr_facilities_connected": "none",
         "extra_refrigerator_present": false,
         "extra_refrigerator_usage_multiplier": 1.0,
+        "floor_type": "WoodFrame",
         "floor_over_foundation_assembly_r": 18.7,
         "floor_over_garage_assembly_r": 18.7,
         "foundation_wall_insulation_distance_to_bottom": 0.0,

diff --git a/measures/UpgradeCosts/tests/SFD_2story_S_UA_GRG_ASHP1_FuelTanklessWH.osw b/measures/UpgradeCosts/tests/SFD_2story_S_UA_GRG_ASHP1_FuelTanklessWH.osw
@@ -81,6 +81,7 @@
         "dwhr_facilities_connected": "none",
         "extra_refrigerator_present": false,
         "extra_refrigerator_usage_multiplier": 1.0,
+        "floor_type": "WoodFrame",
         "floor_over_foundation_assembly_r": 18.7,
         "floor_over_garage_assembly_r": 18.7,
         "foundation_wall_insulation_distance_to_bottom": 0.0,

diff --git a/project_national/national_baseline.yml b/project_national/national_baseline.yml
@@ -1,6 +1,6 @@
 schema_version: '0.3'
-os_version: 3.4.0
-os_sha: 4bd816f785
+os_version: 3.5.0
+os_sha: 7b14ce1588
 buildstock_directory: ../ # Relative to this file or absolute
 project_directory: project_national # Relative to buildstock_directory
 output_directory: national_baseline

diff --git a/project_national/national_upgrades.yml b/project_national/national_upgrades.yml
@@ -1,6 +1,6 @@
 schema_version: '0.3'
-os_version: 3.4.0
-os_sha: 4bd816f785
+os_version: 3.5.0
+os_sha: 7b14ce1588
 buildstock_directory: ../ # Relative to this file or absolute
 project_directory: project_national # Relative to buildstock_directory
 output_directory: national_upgrades

diff --git a/project_testing/testing_baseline.yml b/project_testing/testing_baseline.yml
@@ -1,6 +1,6 @@
 schema_version: '0.3'
-os_version: 3.4.0
-os_sha: 4bd816f785
+os_version: 3.5.0
+os_sha: 7b14ce1588
 buildstock_directory: ../ # Relative to this file or absolute
 project_directory: project_testing # Relative to buildstock_directory
 output_directory: testing_baseline

diff --git a/project_testing/testing_upgrades.yml b/project_testing/testing_upgrades.yml
@@ -1,6 +1,6 @@
 schema_version: '0.3'
-os_version: 3.4.0
-os_sha: 4bd816f785
+os_version: 3.5.0
+os_sha: 7b14ce1588
 buildstock_directory: ../ # Relative to this file or absolute
 project_directory: project_testing # Relative to buildstock_directory
 output_directory: testing_upgrades

diff --git a/resources/hpxml-measures/.github/workflows/config.yml b/resources/hpxml-measures/.github/workflows/config.yml
@@ -11,7 +11,7 @@ jobs:
   run-unit-tests:
     runs-on: ubuntu-latest
     container:
-      image: docker://nrel/openstudio:3.4.0
+      image: docker://nrel/openstudio:3.5.0
     steps:
       - uses: actions/checkout@v2
         with:
@@ -20,22 +20,9 @@ jobs:
       - name: Install software
         run: |
           rm -f Gemfile.lock && bundle install
+          export DEBIAN_FRONTEND=noninteractive
           sudo apt update
-          sudo apt-get install -y wget unzip libxml2-utils python3-lxml python3-pip
-          sudo pip3 install sphinx sphinx-rtd-theme
-
-      - name: XSD validation
-        shell: bash
-        run: |
-          export XSDPATH=HPXMLtoOpenStudio/resources/hpxml_schema/HPXML.xsd
-          for xmlfile in workflow/sample_files/*.xml; do xmllint --schema $XSDPATH $xmlfile --noout; done
-
-      - name: Schematron validation
-        shell: bash
-        run: |
-          export PYTHONIOENCODING=utf8
-          export SCTPATH=HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.xml
-          for xmlfile in workflow/sample_files/*.xml; do XMLPATH=$xmlfile python3 -c "import os; import sys; from lxml import isoschematron, etree; from pathlib import Path; sct = Path(os.environ.get('SCTPATH')).read_text(); sct_doc = etree.fromstring(bytes(sct, encoding='utf-8')); schematron = isoschematron.Schematron(sct_doc, store_report = True); xml_path = os.environ.get('XMLPATH'); xml = Path(xml_path).read_text(); xml_doc = etree.fromstring(bytes(xml, encoding='utf-8')); valid = schematron.validate(xml_doc); (not valid) and print(schematron.validation_report); (not valid) and print(f'{xml_path} fails to validate'); valid and print(f'{xml_path} validates'); (not valid) and sys.exit(1)"; done
+          sudo -E apt-get install -y wget unzip python3-sphinx-rtd-theme
 
       - name: Run measure unit tests
         run: |
@@ -61,7 +48,7 @@ jobs:
   run-workflow-tests:
     runs-on: ubuntu-latest
     container:
-      image: docker://nrel/openstudio:3.4.0
+      image: docker://nrel/openstudio:3.5.0
     steps:
       - uses: actions/checkout@v2
         with:
@@ -90,8 +77,8 @@ jobs:
       - name: Install software and run test
         shell: pwsh
         run: |
-          $env:OS_VERSION="3.4.0"
-          $env:OS_SHA="4bd816f785"
+          $env:OS_VERSION="3.5.0"
+          $env:OS_SHA="7b14ce1588"
           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-detailed-schedule stochastic

diff --git a/resources/hpxml-measures/.gitignore b/resources/hpxml-measures/.gitignore
@@ -2008,4 +2008,6 @@
 /workflow/sample_files/run
 /files
 /BuildResidentialHPXML/tests/extra_files
+/ReportUtilityBills/resources/detailed_rates/*.json
+!/ReportUtilityBills/resources/detailed_rates/Sample*.json
 /ReportUtilityBills/tests/results_bills.csv