Squashed 'resources/hpxml-measures/' changes from 82eca3a93cf..93239c…

…b9a8c

93239cb9a8c Merge branch 'build-res-hpxml-v3' into build-res-hpxml-v3-flex
6cb188f0800 Merge pull request #728 from NREL/build-res-hpxml-v3-os-v320
3f459c426bc Merge branch 'build-res-hpxml-v3' into build-res-hpxml-v3-os-v320
30334074fce Merge branch 'master' into build-res-hpxml-v3
03188d6b53f Prevent warnings in a few other situations (tasks and unit tests).
3b958099844 Merge pull request #667 from NREL/os_v320
45b94e8425e Latest results.
b5dac6a031b Bump docker to official 3.2.0 tag
57df9c14876 temporary fix for "warning: Using the last argument as keyword parameters is deprecated"
19e3a7d3ccf Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
6acfd16da1b Latest results.
0802d7ce0a6 Merge branch 'master' into build-res-hpxml-v3
3f20cef8996 Merge pull request #751 from NREL/dryer_extension_elements
0d01af09dcd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into dryer_extension_elements
fede5c7f388 Merge pull request #752 from NREL/min_assembly_rvalue
626db6c254d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into dryer_extension_elements
b92577e4c0c Sync w/ latest HPXML v3.1 proposed schema
86351b459e2 Merge pull request #745 from NREL/config-changes
437d0887002 Rename
4f11dc3b82b Typo
39d9bfb4b51 First pass.
a943470e89b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into config-changes
4a57162e0f2 Latest results.
8346c526b18 Latest results.
13d95bbf336 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into config-changes
f29c07e72b8 Test commit.
f39561c992d Merge pull request #748 from NREL/infiltration_unvented_spaces
01def24c565 Merge branch 'master' into config-changes
4880ad9af64 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into infiltration_unvented_spaces
93c920a0225 A little code cleanup; update changelog.
c9ba9cf4c46 Adds a small amount of infiltration to unvented spaces.
6b3cf929c0b Merge pull request #746 from NREL/coverage
245264fe8a9 Re-specify head for build checkout.
8ccbc50dca2 Latest results.
e111893a64f Bump docker version
20b7845e0f1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
ac8f3cb3b63 The OS CLI does not work nicely with simplecov, so restrict to CI + non-CLI usage.
a3f9c3a293b Merge branch 'config-changes' of github.com:NREL/OpenStudio-HPXML into config-changes
b2d073b2220 Remove ready for review event.
b8d62ae7b34 Latest results.
6eacc4986af Latest results.
449c8fb3b33 Remove temp code.
dddd146beca Remove debugs.
71ac3e31c21 Revert compare job.
1e09096b1fc Merge branch 'config-changes' of github.com:NREL/OpenStudio-HPXML into config-changes
1a0b1b22e2c Skip results for which there is no comparison.
bfdd9660501 Latest results.
5aafff85574 Run tests that produce results.
9340e142967 Try 3.
4cfbfde11d7 Debug, try 2.
25a2b952c4f Debug, try 1.
8c437b0f639 Remove temp code.
6be5a6c0f88 Further clean up config.
fc402710b93 Remove temp code.
807a83a8b56 Update config and temp code.
a0271e1726a Remove temp code.
58b23364f01 Temp change code.
34da9ad805e Move update-results job into build job.
5be6bc7c799 Re-enable code coverage (posted as CI artifacts).
a3b09ed62e3 Specify head sha at checkout, and update results for draft mode.
0572b3622d3 Update set min per item arg type.
c9d240af14c Latest results.
badd365a884 Merge branch 'os_v320' into build-res-hpxml-v3-os-v320
5c6f3149fcd Merge branch 'master' into os_v320
61c0c008770 Filter out OS warning for now.
df50af99630 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into os_v320
e92813fc7d2 Default to idf.
ec3838c684b Latest results.
891e57f8e8d Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into os_v320
970a833f04d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
8cc70a561d2 Merge pull request #679 from NREL/epjson
7ea1edd11d2 Revert to original state
fbe4c588b0e Adds argument to run_simulation.rb
8bd77e27ad9 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into epjson
398657ad238 Merge pull request #597 from NREL/ems_actuator_view_factor_to_ground
25fc0179617 Latest results.
e15de3bcb44 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into ems_actuator_view_factor_to_ground
38c3b21bd34 Merge pull request #552 from NREL/generators-additional-fuels
a71dcd300cc Latest results.
792a1d78a7c Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into generators-additional-fuels
9a578a74b36 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
3ff7c6aee74 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into epjson
2cbefb6e311 Exclude new warning
1cfee1f5dcd Switch back to official ep binary
0203b411f94 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into epjson
78bbaac3ee0 Update version.
4987cf99908 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into epjson
3258f1e7f2a No longer skip test.
d1119ff0ece Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
dda19d1ab18 Remove workaround.
3354459252a Saving state.
3ab824e458a Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into epjson
43d244b35eb change variable names in test_constructions.rb and create a new util.rb under \tests
0c341cc414d update actuator name and move get_ems_values to util.rb
9fa265d2a44 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into ems_actuator_view_factor_to_ground
2441596e2d9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
88559efafd9 Update Changelog.md
d5d10c4c0a4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ems_actuator_view_factor_to_ground
fc1b5f0a0d1 Merge branch 'ems_actuator_view_factor_to_ground' of https://github.com/NREL/OpenStudio-HPXML into ems_actuator_view_factor_to_ground
a4632e55975 update test_constructions and unexpected warnings for HPWHs
22c0386d5e6 Switches run_simulation.rb to use epJSON instead of IDF. Untested due to OS installer bug.
2be26288ae8 Delete USA_OR_Baker.Muni.AP.726886_TMY3.epw
b59899ece4c Delete USA_OR_Baker.Muni.AP.726886_TMY3-cache.csv
c249d37a17f add weather files that were accidentally removed
8a817b1ac2d fix meta_measure.rb
3c40c3a53a3 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into ems_actuator_view_factor_to_ground
ba48c42f1c9 Update Changelog.md.
a0605249129 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into generators-additional-fuels
60a1a22e8fc Disable test files for now.
0c513141e4b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
35700a0570e Update references to OS 3.1.0.
48f9b4632c0 Switch to new QuadLinear/QuintLinear curves for EquationFit coils.
a412663099f Fix use of ElectricLoadCenterDistribution per NREL/OpenStudio#4180
a3f071298ce Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
aaae9059014 First pass.
573f572fb0b set the calling point to `BeginZoneTimestepAfterInitHeatBalance` as per NREL/EnergyPlus#8477 (comment)
8d43be8188c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ems_actuator_view_factor_to_ground
ae017578ba4 create one ems sensor for shading coefficients and create ems program per subsurface type
e4bc0096fc1 update EMS program to use the schedule value from the trans_sch
b4f99ac46cf first pass
5a592f03808 Merge branch 'generators' of https://github.com/NREL/OpenStudio-HPXML into generators-additional-fuels
29d0aa394ae Merge branch 'generators' of https://github.com/NREL/OpenStudio-HPXML into generators-additional-fuels
ec9c1605fd0 Merge branch 'generators' of https://github.com/NREL/OpenStudio-HPXML into generators-additional-fuels
cf7188d1fd4 Bugfix.
7765f9fae93 Allows additional fuel types for generators. Requires changes to EnergyPlus first -- NREL/EnergyPlus#8413.

git-subtree-dir: resources/hpxml-measures
git-subtree-split: 93239cb9a8c40bbf9c5bde382c5a80e89b12380f

.github/workflows/config.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches: [ master ]
   pull_request:
-    types: [ synchronize, opened, ready_for_review ]
+    types: [ synchronize, opened ]
   workflow_dispatch:
 
 jobs:
@@ -14,6 +14,8 @@ jobs:
       image: docker://nrel/openstudio:flex
     steps:
       - uses: actions/checkout@v2
+        with:
+          ref: ${{ github.head_ref }}
 
       - name: Install gems
         run: |
@@ -29,6 +31,12 @@ jobs:
           path: workflow/tests/results
           name: results
 
+      - name: Store code coverage
+        uses: actions/upload-artifact@v2
+        with:
+          path: coverage
+          name: coverage
+
   compare-results:
     if: github.event_name == 'pull_request'
     runs-on: ubuntu-latest
@@ -76,21 +84,12 @@ jobs:
           name: comparisons
 
   update-results:
-    if: github.event.pull_request.draft != true
     runs-on: ubuntu-latest
-    needs: compare-results
+    needs: build
     steps:
       - uses: actions/checkout@v2
         with:
-          ref: ${{ github.event.pull_request.head.sha }}
-
-      - name: Setup git branch
-        shell: bash
-        run: |
-          branch_name="${{ github.head_ref }}"
-          branch_sha="${{ github.event.pull_request.head.sha }}"
-          echo "Checking out branch: $branch_name, $branch_sha"
-          git checkout -b $branch_name || git checkout $branch_name
+          ref: ${{ github.head_ref }}
 
       - name: Download feature results
         uses: actions/download-artifact@v2

Changelog.md

@@ -1,3 +1,15 @@
+## OpenStudio-HPXML v1.3.0 (Pending)
+
+__New Features__
+- Updates to OpenStudio 3.2.0/EnergyPlus 9.5.0.
+- Introduces a small amount of infiltration for unvented spaces.
+- **Breaking change**: Replaces ClothesDryer `extension/IsVented` and `extension/VentedFlowRate` with `Vented` and `VentedFlowRate`.
+- Allows additional fuel types for generators.
+- Adds an `--ep-input-format` argument to run_simulation.rb to choose epJSON as the EnergyPlus input file format instead of IDF.
+
+__Bugfixes__
+- Improves ground reflectance when there is shading of windows/skylights.
+
 ## OpenStudio-HPXML v1.2.0
 
 __New Features__
@@ -243,4 +255,4 @@ __Bugfixes__
 
 ## OpenStudio-HPXML v0.7.0 Beta
 
-- Initial beta release
+- Initial beta release

Gemfile

@@ -9,3 +9,5 @@ gem 'rake'
 gem 'minitest', '~> 5.9'
 gem 'minitest-reporters'
 gem 'parallel'
+gem 'simplecov'
+gem 'simplecov-html'

HPXMLtoOpenStudio/measure.rb

@@ -337,11 +337,13 @@ def self.add_simulation_params(model)
 
   def self.update_conditioned_basement(runner, model, spaces)
     return if @cond_bsmnt_surfaces.empty?
+
     # Update @cond_bsmnt_surfaces to include subsurfaces
     new_cond_bsmnt_surfaces = @cond_bsmnt_surfaces.dup
     @cond_bsmnt_surfaces.each do |cond_bsmnt_surface|
       next if cond_bsmnt_surface.is_a? OpenStudio::Model::InternalMassDefinition
       next if cond_bsmnt_surface.subSurfaces.empty?
+
       cond_bsmnt_surface.subSurfaces.each do |ss|
         new_cond_bsmnt_surfaces << ss
       end
@@ -359,6 +361,7 @@ def self.update_solar_absorptances(runner, model)
     @cond_bsmnt_surfaces.each do |cond_bsmnt_surface|
       # skip windows because windows don't have such property to change.
       next if cond_bsmnt_surface.is_a?(OpenStudio::Model::SubSurface) && (cond_bsmnt_surface.subSurfaceType.downcase == 'fixedwindow')
+
       adj_surface = nil
       if not cond_bsmnt_surface.is_a? OpenStudio::Model::InternalMassDefinition
         if not cond_bsmnt_surface.is_a? OpenStudio::Model::SubSurface
@@ -397,6 +400,7 @@ def self.update_solar_absorptances(runner, model)
       innermost_material.setSolarAbsorptance(0.0)
       innermost_material.setVisibleAbsorptance(0.0)
       next if adj_surface.nil?
+
       # Create new construction in case of shared construciton.
       layered_const_adj = OpenStudio::Model::Construction.new(model)
       layered_const_adj.setName(cond_bsmnt_surface.construction.get.name.get + ' Reversed Bsmnt')
@@ -1344,9 +1348,10 @@ def self.add_windows(runner, model, spaces, weather)
 
     shading_group = nil
     shading_schedules = {}
+    shading_ems = { sensors: {}, program: nil }
 
     surfaces = []
-    @hpxml.windows.each do |window|
+    @hpxml.windows.each_with_index do |window, i|
       window_height = 4.0 # ft, default
 
       overhang_depth = nil
@@ -1393,7 +1398,8 @@ def self.add_windows(runner, model, spaces, weather)
 
         # Apply interior/exterior shading (as needed)
         shading_vertices = Geometry.create_wall_vertices(window_length, window_height, z_origin, window.azimuth)
-        shading_group = Constructions.apply_window_skylight_shading(model, window, shading_vertices, surface, sub_surface, shading_group, shading_schedules, Constants.ObjectNameWindowShade, @cooling_season)
+        shading_group = Constructions.apply_window_skylight_shading(model, window, i, shading_vertices, surface, sub_surface, shading_group,
+                                                                    shading_schedules, shading_ems, Constants.ObjectNameWindowShade, @cooling_season)
       else
         # Window is on an interior surface, which E+ does not allow. Model
         # as a door instead so that we can get the appropriate conduction
@@ -1435,8 +1441,9 @@ def self.add_skylights(runner, model, spaces, weather)
 
     shading_group = nil
     shading_schedules = {}
+    shading_ems = { sensors: {}, program: nil }
 
-    @hpxml.skylights.each do |skylight|
+    @hpxml.skylights.each_with_index do |skylight, i|
       tilt = skylight.roof.pitch / 12.0
       width = Math::sqrt(skylight.area)
       length = skylight.area / width
@@ -1467,7 +1474,8 @@ def self.add_skylights(runner, model, spaces, weather)
 
       # Apply interior/exterior shading (as needed)
       shading_vertices = Geometry.create_roof_vertices(length, width, z_origin, skylight.azimuth, tilt)
-      shading_group = Constructions.apply_window_skylight_shading(model, skylight, shading_vertices, surface, sub_surface, shading_group, shading_schedules, Constants.ObjectNameSkylightShade, @cooling_season)
+      shading_group = Constructions.apply_window_skylight_shading(model, skylight, i, shading_vertices, surface, sub_surface, shading_group,
+                                                                  shading_schedules, shading_ems, Constants.ObjectNameSkylightShade, @cooling_season)
     end
 
     apply_adiabatic_construction(runner, model, surfaces, 'roof')