Squashed 'example_project/resources/hpxml-measures/' changes from b6c…

…fdd87dde..badd365a884 badd365a884 Merge branch 'os_v320' into build-res-hpxml-v3-os-v320 5c6f3149fcd Merge branch 'master' into os_v320 23bb2fc0b9e Merge branch 'master' into build-res-hpxml-v3 27d91cb6c8a Merge pull request #726 from NREL/energystar2 c6c4601a4c1 Latest results. 0e765d73deb Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into energystar2 9fc9ebd963c Handle -1 HVAC capacities. 0f852e509d1 Merge pull request #727 from NREL/cli_spec_reporter 24607bde690 Allows the spec reporter when running tests via the OS CLI. 24fde0b8861 Fix WLHP fan energy. 862ca4b892f No longer need this. 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: example_project/resources/hpxml-measures git-subtree-split: badd365a884991f889909ce45045ac8028790ed0
urbanopt · Apr 27, 2021 · b30e1ea · b30e1ea
1 parent 363967a
commit b30e1ea
Show file tree

Hide file tree

Showing 33 changed files with 414 additions and 497 deletions.
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
@@ -11,7 +11,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: docker://nrel/openstudio:3.1.0
+      image: docker://nrel/openstudio:develop
     steps:
       - uses: actions/checkout@v2
 

diff --git a/Changelog.md b/Changelog.md
@@ -1,17 +1,21 @@
 ## OpenStudio-HPXML v1.2.0 (Pending)
 
 __New Features__
+- Updates to OpenStudio 3.2.0/EnergyPlus 9.5.0.
 - **Breaking change**: Heating/cooling component loads no longer calculated by default for faster performance; use `--add-component-loads` argument if desired.
 - **Breaking change**: Replaces `Site/extension/ShelterCoefficient` with `Site/ShieldingofHome`.
 - **Breaking change**: `AirDistributionType` is now required for all air distribution systems.
+- Allows additional fuel types for generators.
 - Allows `DuctLeakageMeasurement` & `ConditionedFloorAreaServed` to not be specified for ductless fan coil systems.
 - Allows `Slab/ExposedPerimeter` to be zero.
 - Removes `ClothesDryer/ControlType` from being a required input, it is not used.
 - Switches room air conditioner model to use Cutler performance curves.
+- Adds an `--ep-input-format` argument to run_simulation.rb to choose epJSON as the EnergyPlus input file format instead of IDF.
 - Relaxes tolerance for duct leakage to outside warning when ducts solely in conditioned space.
 - Moves additional error-checking from the ruby measure to the schematron validator. 
 
 __Bugfixes__
+- Improves ground reflectance when there is shading of windows/skylights.
 - Fixes room air conditioner performance curve.
 - Fixes ruby error if elements (e.g., `SystemIdentifier`) exist without the proper 'id'/'idref' attribute.
 - Fixes error if boiler/GSHP pump power is zero

diff --git a/HPXMLtoOpenStudio/measure.rb b/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')

diff --git a/HPXMLtoOpenStudio/measure.xml b/HPXMLtoOpenStudio/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>hpxm_lto_openstudio</name>
   <uid>b1543b30-9465-45ff-ba04-1d1f85e763bc</uid>
-  <version_id>22a33eee-ad90-481f-bdf4-322c249ac6e2</version_id>
-  <version_modified>20210421T190434Z</version_modified>
+  <version_id>61e29072-851e-40a4-b1e2-02610ab3e6f6</version_id>
+  <version_modified>20210427T150645Z</version_modified>
   <xml_checksum>D8922A73</xml_checksum>
   <class_name>HPXMLtoOpenStudio</class_name>
   <display_name>HPXML to OpenStudio Translator</display_name>
@@ -301,30 +301,12 @@
       <usage_type>resource</usage_type>
       <checksum>5E866DCA</checksum>
     </file>
-    <file>
-      <filename>version.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>4F621F55</checksum>
-    </file>
     <file>
       <filename>location.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
       <checksum>CB27A3C5</checksum>
     </file>
-    <file>
-      <filename>generator.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>8094AEAC</checksum>
-    </file>
-    <file>
-      <filename>waterheater.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>C696219C</checksum>
-    </file>
     <file>
       <filename>HPXMLvalidator.xml</filename>
       <filetype>xml</filetype>
@@ -349,12 +331,6 @@
       <usage_type>resource</usage_type>
       <checksum>F76E3AB7</checksum>
     </file>
-    <file>
-      <filename>pv.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>120417ED</checksum>
-    </file>
     <file>
       <filename>test_hvac_sizing.rb</filename>
       <filetype>rb</filetype>
@@ -404,76 +380,106 @@
       <checksum>19007457</checksum>
     </file>
     <file>
-      <filename>test_hvac.rb</filename>
+      <filename>test_hotwater_appliance.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>4D5E86F7</checksum>
+      <checksum>E962DB16</checksum>
     </file>
     <file>
-      <filename>test_hotwater_appliance.rb</filename>
+      <filename>simcontrols.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>C18610A9</checksum>
+    </file>
+    <file>
+      <filename>test_validation.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>E962DB16</checksum>
+      <checksum>E4E8816E</checksum>
+    </file>
+    <file>
+      <filename>test_defaults.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>3065BE57</checksum>
     </file>
     <file>
       <filename>minitest_helper.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>02EC2972</checksum>
+      <checksum>FEC94D37</checksum>
+    </file>
+    <file>
+      <filename>version.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>FB55E123</checksum>
+    </file>
+    <file>
+      <filename>generator.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>FC0A4F2E</checksum>
+    </file>
+    <file>
+      <filename>waterheater.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>A9868999</checksum>
+    </file>
+    <file>
+      <filename>pv.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>AF98955A</checksum>
+    </file>
+    <file>
+      <filename>test_hvac.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>93BE4E7C</checksum>
     </file>
     <file>
       <filename>EPvalidator.xml</filename>
       <filetype>xml</filetype>
       <usage_type>resource</usage_type>
-      <checksum>E88FE4FD</checksum>
+      <checksum>37E36757</checksum>
     </file>
     <file>
       <filename>test_airflow.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>9F818FBE</checksum>
+      <checksum>9219EDE1</checksum>
     </file>
     <file>
       <filename>test_enclosure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>199ECD03</checksum>
+      <checksum>2A7EF627</checksum>
     </file>
     <file>
       <filename>constructions.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>BD3776F6</checksum>
-    </file>
-    <file>
-      <filename>hvac_sizing.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>AB9BBAC1</checksum>
+      <checksum>2BDDE11F</checksum>
     </file>
     <file>
       <filename>energyplus.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>00BB7C11</checksum>
+      <checksum>CA9A2E46</checksum>
     </file>
     <file>
-      <filename>simcontrols.rb</filename>
+      <filename>hvac_sizing.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>C18610A9</checksum>
-    </file>
-    <file>
-      <filename>test_validation.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>test</usage_type>
-      <checksum>E4E8816E</checksum>
+      <checksum>ED41663A</checksum>
     </file>
     <file>
-      <filename>test_defaults.rb</filename>
+      <filename>util.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>3065BE57</checksum>
+      <checksum>B185ACE7</checksum>
     </file>
     <file>
       <filename>weather.rb</filename>
@@ -494,34 +500,40 @@
       <checksum>5507213C</checksum>
     </file>
     <file>
-      <filename>meta_measure.rb</filename>
+      <filename>hotwater_appliances.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>5523EAA1</checksum>
+      <checksum>EF9BC498</checksum>
     </file>
     <file>
-      <filename>xmlhelper.rb</filename>
+      <filename>airflow.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>EEAB4FC6</checksum>
+      <checksum>73D23AF9</checksum>
     </file>
     <file>
-      <filename>hotwater_appliances.rb</filename>
+      <filename>misc_loads.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>EF9BC498</checksum>
+      <checksum>F085602D</checksum>
     </file>
     <file>
-      <filename>airflow.rb</filename>
+      <filename>geometry.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>73D23AF9</checksum>
+      <checksum>19DA45A2</checksum>
     </file>
     <file>
-      <filename>misc_loads.rb</filename>
+      <filename>meta_measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>F085602D</checksum>
+      <checksum>F0600D92</checksum>
+    </file>
+    <file>
+      <filename>xmlhelper.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>60F0330A</checksum>
     </file>
     <file>
       <version>
@@ -532,31 +544,25 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>ACE8AC03</checksum>
+      <checksum>6D448BA6</checksum>
     </file>
     <file>
-      <filename>geometry.rb</filename>
+      <filename>hpxml.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>19DA45A2</checksum>
+      <checksum>A829044D</checksum>
     </file>
     <file>
       <filename>hpxml_defaults.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>19252CCB</checksum>
-    </file>
-    <file>
-      <filename>hpxml.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>9504C475</checksum>
+      <checksum>5A575FCF</checksum>
     </file>
     <file>
       <filename>hvac.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>21E3089F</checksum>
+      <checksum>5737100F</checksum>
     </file>
   </files>
 </measure>
diff --git a/HPXMLtoOpenStudio/resources/EPvalidator.xml b/HPXMLtoOpenStudio/resources/EPvalidator.xml
@@ -1286,7 +1286,7 @@
       <sch:assert role='ERROR' test='count(h:SystemIdentifier) = 1'>Expected 1 element(s) for xpath: SystemIdentifier</sch:assert>
       <sch:assert role='ERROR' test='count(h:IsSharedSystem) &lt;= 1'>Expected 0 or 1 element(s) for xpath: IsSharedSystem</sch:assert> <!-- See [GeneratorType=Shared] -->
       <sch:assert role='ERROR' test='count(h:FuelType) = 1'>Expected 1 element(s) for xpath: FuelType</sch:assert>
-      <sch:assert role='ERROR' test='h:FuelType[text()="natural gas" or text()="propane"] or not(h:FuelType)'>Expected FuelType to be 'natural gas' or 'propane'</sch:assert>
+      <sch:assert role='ERROR' test='h:FuelType[text()="natural gas" or text()="fuel oil" or text()="fuel oil 1" or text()="fuel oil 2" or text()="fuel oil 4" or text()="fuel oil 5/6" or text()="diesel" or text()="propane" or text()="kerosene" or text()="coal" or text()="coke" or text()="bituminous coal" or text()="anthracite coal" or text()="wood" or text()="wood pellets"] or not(h:FuelType)'>Expected FuelType to be 'natural gas' or 'fuel oil' or 'fuel oil 1' or 'fuel oil 2' or 'fuel oil 4' or 'fuel oil 5/6' or 'diesel' or 'propane' or 'kerosene' or 'coal' or 'coke' or 'bituminous coal' or 'anthracite coal' or 'wood' or 'wood pellets'</sch:assert>
       <sch:assert role='ERROR' test='count(h:AnnualConsumptionkBtu) = 1'>Expected 1 element(s) for xpath: AnnualConsumptionkBtu</sch:assert>
       <sch:assert role='ERROR' test='number(h:AnnualConsumptionkBtu) &gt; 0 or not(h:AnnualConsumptionkBtu)'>Expected AnnualConsumptionkBtu to be greater than 0</sch:assert>
       <sch:assert role='ERROR' test='count(h:AnnualOutputkWh) = 1'>Expected 1 element(s) for xpath: AnnualOutputkWh</sch:assert>