Skip to content

Commit

Permalink
Squashed 'hpxml-measures/' changes from 758b04c18..58373423d
Browse files Browse the repository at this point in the history 
58373423d Merge pull request #310 from NREL/outside-boundary-conditions
c73454270 bugfix, collapse other housing unit schedules, fix hardcoding living space name
e4af0c4cd remove base-misc-locations-other.xml, fixed rh/hr issue
44322a232 Merge branch 'outside-boundary-conditions' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions
d9d8ba28a some small issues
ce8e83bc1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions
ec4db5bd6 Revert the part of the HPWH ducting program that was related to internal gains.
c195a7e6f Merge pull request #382 from NREL/hpxml_datatype_conversions
e2a371e3d Relax test tolerance.
57649b906 Also handle 1/0 (integer) conversion to boolean.
e1d6d1e50 Update documentation. [ci skip]
9be79f874 other housing unit surface changed to use sch
199846419 Merge branch 'outside-boundary-conditions' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions
532da3817 minor changes
b98e91185 Improve datatype conversions used by HPXML class. In particular, prevents automatically converting non-integer values to integers.
ec6be234d Oops. Bugfix.
67c580886 Remove unnecessary @mf_temp_sch_map variable and other minor code cleanup. Also removed some HPWH code (ducting, etc.) that isn't being used. Should be functionally the same.
8af5cae9a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions
2f21345eb Remove old test files.
bef9fb811 Merge pull request #355 from NREL/enclosure_error_checking
e36a773e4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into enclosure_error_checking
b51b7e632 Compromise to allow for ASHRAE 140 while still generally requiring lighting.
dc80c7835 Merge pull request #381 from NREL/lighting-cleanup
cdfc22de4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into enclosure_error_checking
e12e1f335 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions
bf90de843 minor changes
24339bdcd remove window location error checking
b1d213959 accommodate new report arg
ededf86d2 merge conflict bugfix
9aeb4d5d4 update_measures
9af8bb38f Merge branch 'os_v3' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions
b9d8d01d3 combined coefficient assumption
d92f4c82e update_measures
6b9e30881 Merge branch 'os_v3' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions
0f7c405cc report test accommodation column name
53ee01125 v3.0 othersidecoefficient schedule
d18a6cab1 Merge branch 'os_v3' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions
ee9ce6231 Adds tests.
9140754df First pass on adding better space type-specific error checking of surfaces.
ac46e80b5 revert base*
e0c2b70cc changes to corresponding tests
ceff63ec1 some changes to test files
6fc3c83c7 test base-miscs-locations-other.xml added
d89da3018 new test files for mf spaces
b2c540d21 bugfix
ad6e1b87c duct bugfixes and cleanup(somehow)
c54595ab7 changes to first batch of suggestions
f67623496 some changes after merging master
6bb69608a rake
5f54ffdff Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions
698592b83 added a "Surface" outside boundary condition subsurface to verify previous implementation bug was fixed
e20411be4 ran update_measures
10ed69e8b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions
b53264d9d fix a bug in assigning outside boundary condition to subsurfaces
30c5e9d1f default dishwasher and cooking range locations
c36cc8d04 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions
2ea13f695 invalid
d22772623 merge
1ceebc35a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions
0ab037a62 bugfix, new warning resolved
f0de0eefc one more fix...
7a3e191bf bugfix
f6a775d64 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions
450b6d3a5 cleanup and minor changes
9cddaa86d revert test
bbae3f637 cleanup
be90fb9dd dishwasher test bugfix
51d2f8f7d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions
6df50bf38 fixed some merge and ci failure issues
0416fb61c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions
b73a20457 surface hvac_sizing and appliance progresses
5f4977166 current appliance location init
96560fb88 Unnecessary line
a175069a0 duct location
0e480802d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions
178ba2550 one remaining issue of merging new hpxml class
ef81d7033 rubocop
beb4cac4d conflicts and issues
fd13012cc pulled in masters
81d8a85cf oops, removed the wrong line
81d1add00 remove diagnostic puts
e6e5494fe waterheater sharing obc schedule with surfaces
a5c4f1c61 progress on water heater location
bfff94d5e ran rake + conflicts resolved
ba6de136b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions
fff4145aa Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions
7ac14a3bc subsurface on foundation wall
09e957c60 hpxml schema changes, new enumerations
9cd567460 addressed subsurfaces
400dbd0c2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions
fbf4cb261 fixme comment
c962c5f00 MES program to read conditioned zone temperature
a3eee53b2 something left from previous commit, added report tests.
538a7581c new space type test files combined.
b3016f3f2 remove diagnostic print
28dbe99a3 Other side coefficient, 0 convection first for debugging

git-subtree-dir: hpxml-measures
git-subtree-split: 58373423d5022ace89d39aa9de0bbe576d687c5c
  • Loading branch information
@shorowit
shorowit committed May 11, 2020
1 parent 7991277 commit c63484d
Show file tree
Hide file tree
Showing 309 changed files with 8,798 additions and 1,539 deletions.
331 changes: 227 additions & 104 deletions HPXMLtoOpenStudio/measure.rb
View file

Large diffs are not rendered by default.

74 changes: 37 additions & 37 deletions HPXMLtoOpenStudio/measure.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<schema_version>3.0</schema_version>
<name>hpxm_lto_openstudio</name>
<uid>b1543b30-9465-45ff-ba04-1d1f85e763bc</uid>
<version_id>d6f2323a-954c-4f43-bdd8-dd5bc75614bd</version_id>
<version_modified>20200506T161627Z</version_modified>
<version_id>d802e8e7-c029-4d71-8209-fbb0de306ce7</version_id>
<version_modified>20200508T162653Z</version_modified>
<xml_checksum>D8922A73</xml_checksum>
<class_name>HPXMLtoOpenStudio</class_name>
<display_name>HPXML to OpenStudio Translator</display_name>
Expand Down Expand Up @@ -378,12 +378,6 @@
<usage_type>resource</usage_type>
<checksum>2B988139</checksum>
</file>
<file>
<filename>geometry.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>87AECAD9</checksum>
</file>
<file>
<filename>pv.rb</filename>
<filetype>rb</filetype>
Expand All @@ -403,64 +397,76 @@
<checksum>1FBD8519</checksum>
</file>
<file>
<filename>waterheater.rb</filename>
<filename>constructions.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>6D71A9DC</checksum>
<checksum>75ED1225</checksum>
</file>
<file>
<filename>hotwater_appliances.rb</filename>
<filename>test_hvac.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>72183EEA</checksum>
</file>
<file>
<filename>hvac.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>DFBA9690</checksum>
</file>
<file>
<filename>lighting.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>99CC5C12</checksum>
<checksum>3F5031E7</checksum>
</file>
<file>
<filename>xmlhelper.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>99A4AED4</checksum>
<checksum>C5E10D06</checksum>
</file>
<file>
<filename>constructions.rb</filename>
<filename>geometry.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>75ED1225</checksum>
<checksum>F9E6A41F</checksum>
</file>
<file>
<filename>constants.rb</filename>
<filename>waterheater.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>ACCF3BE7</checksum>
<checksum>EF402693</checksum>
</file>
<file>
<filename>hvac_sizing.rb</filename>
<filename>hotwater_appliances.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>6AFAA191</checksum>
<checksum>0A146CFB</checksum>
</file>
<file>
<filename>airflow.rb</filename>
<filename>constants.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>F0FA85C2</checksum>
<checksum>94C25DD3</checksum>
</file>
<file>
<filename>test_hvac.rb</filename>
<filename>hvac_sizing.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>72183EEA</checksum>
<usage_type>resource</usage_type>
<checksum>AB99DF79</checksum>
</file>
<file>
<filename>hvac.rb</filename>
<filename>airflow.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>DFBA9690</checksum>
<checksum>43B04C2F</checksum>
</file>
<file>
<filename>hpxml.rb</filename>
<filename>EPvalidator.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>AAA315D1</checksum>
<checksum>37C6B651</checksum>
</file>
<file>
<version>
Expand All @@ -471,19 +477,13 @@
<filename>measure.rb</filename>
<filetype>rb</filetype>
<usage_type>script</usage_type>
<checksum>B3A6AC32</checksum>
</file>
<file>
<filename>EPvalidator.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>3B0FDF07</checksum>
<checksum>1767DF95</checksum>
</file>
<file>
<filename>lighting.rb</filename>
<filename>hpxml.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>3F5031E7</checksum>
<checksum>313741EE</checksum>
</file>
</files>
</measure>
24 changes: 13 additions & 11 deletions HPXMLtoOpenStudio/resources/EPvalidator.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ def self.run_validator(hpxml_doc)
zero_or_five = [0, 5]
zero_or_six = [0, 6]
zero_or_seven = [0, 7]
zero_or_nine = [0, 9]
zero_or_more = nil
one = [1]
one_or_more = []
nine = [9]

requirements = {

Expand Down Expand Up @@ -170,7 +170,7 @@ def self.run_validator(hpxml_doc)
# [Wall]
'/HPXML/Building/BuildingDetails/Enclosure/Walls/Wall' => {
'SystemIdentifier' => one, # Required by HPXML schema
'ExteriorAdjacentTo[text()="outside" or text()="attic - vented" or text()="attic - unvented" or text()="basement - conditioned" or text()="basement - unconditioned" or text()="crawlspace - vented" or text()="crawlspace - unvented" or text()="garage" or text()="other housing unit"]' => one,
'ExteriorAdjacentTo[text()="outside" or text()="attic - vented" or text()="attic - unvented" or text()="basement - conditioned" or text()="basement - unconditioned" or text()="crawlspace - vented" or text()="crawlspace - unvented" or text()="garage" or text()="other housing unit" or text()="other heated space" or text()="other multifamily buffer space" or text()="other non-freezing space"]' => one,
'InteriorAdjacentTo[text()="living space" or text()="attic - vented" or text()="attic - unvented" or text()="basement - conditioned" or text()="basement - unconditioned" or text()="crawlspace - vented" or text()="crawlspace - unvented" or text()="garage"]' => one,
'WallType[WoodStud | DoubleWoodStud | ConcreteMasonryUnit | StructurallyInsulatedPanel | InsulatedConcreteForms | SteelFrame | SolidConcrete | StructuralBrick | StrawBale | Stone | LogWall]' => one,
'Area' => one,
Expand All @@ -184,7 +184,7 @@ def self.run_validator(hpxml_doc)
# [RimJoist]
'/HPXML/Building/BuildingDetails/Enclosure/RimJoists/RimJoist' => {
'SystemIdentifier' => one, # Required by HPXML schema
'ExteriorAdjacentTo[text()="outside" or text()="attic - vented" or text()="attic - unvented" or text()="basement - conditioned" or text()="basement - unconditioned" or text()="crawlspace - vented" or text()="crawlspace - unvented" or text()="garage" or text()="other housing unit"]' => one,
'ExteriorAdjacentTo[text()="outside" or text()="attic - vented" or text()="attic - unvented" or text()="basement - conditioned" or text()="basement - unconditioned" or text()="crawlspace - vented" or text()="crawlspace - unvented" or text()="garage" or text()="other housing unit" or text()="other heated space" or text()="other multifamily buffer space" or text()="other non-freezing space"]' => one,
'InteriorAdjacentTo[text()="living space" or text()="attic - vented" or text()="attic - unvented" or text()="basement - conditioned" or text()="basement - unconditioned" or text()="crawlspace - vented" or text()="crawlspace - unvented" or text()="garage"]' => one,
'Area' => one,
'Azimuth' => zero_or_one,
Expand All @@ -197,7 +197,7 @@ def self.run_validator(hpxml_doc)
# [FoundationWall]
'/HPXML/Building/BuildingDetails/Enclosure/FoundationWalls/FoundationWall' => {
'SystemIdentifier' => one, # Required by HPXML schema
'ExteriorAdjacentTo[text()="ground" or text()="basement - conditioned" or text()="basement - unconditioned" or text()="crawlspace - vented" or text()="crawlspace - unvented" or text()="garage" or text()="other housing unit"]' => one,
'ExteriorAdjacentTo[text()="ground" or text()="basement - conditioned" or text()="basement - unconditioned" or text()="crawlspace - vented" or text()="crawlspace - unvented" or text()="garage" or text()="other housing unit" or text()="other heated space" or text()="other multifamily buffer space" or text()="other non-freezing space"]' => one,
'InteriorAdjacentTo[text()="basement - conditioned" or text()="basement - unconditioned" or text()="crawlspace - vented" or text()="crawlspace - unvented" or text()="garage"]' => one, # See [VentedCrawlspace]
'Height' => one,
'Area' => one,
Expand Down Expand Up @@ -225,7 +225,7 @@ def self.run_validator(hpxml_doc)
# [FrameFloor]
'/HPXML/Building/BuildingDetails/Enclosure/FrameFloors/FrameFloor' => {
'SystemIdentifier' => one, # Required by HPXML schema
'ExteriorAdjacentTo[text()="outside" or text()="attic - vented" or text()="attic - unvented" or text()="basement - conditioned" or text()="basement - unconditioned" or text()="crawlspace - vented" or text()="crawlspace - unvented" or text()="garage" or text()="other housing unit above" or text()="other housing unit below"]' => one,
'ExteriorAdjacentTo[text()="outside" or text()="attic - vented" or text()="attic - unvented" or text()="basement - conditioned" or text()="basement - unconditioned" or text()="crawlspace - vented" or text()="crawlspace - unvented" or text()="garage" or text()="other housing unit above" or text()="other housing unit below" or text()="other heated space" or text()="other multifamily buffer space" or text()="other non-freezing space"]' => one,
'InteriorAdjacentTo[text()="living space" or text()="attic - vented" or text()="attic - unvented" or text()="basement - conditioned" or text()="basement - unconditioned" or text()="crawlspace - vented" or text()="crawlspace - unvented" or text()="garage"]' => one,
'Area' => one,
'Insulation/SystemIdentifier' => one, # Required by HPXML schema
Expand Down Expand Up @@ -472,7 +472,7 @@ def self.run_validator(hpxml_doc)
## [HVACDuct]
'/HPXML/Building/BuildingDetails/Systems/HVAC/HVACDistribution/DistributionSystemType/AirDistribution/Ducts[DuctType="supply" or DuctType="return"]' => {
'DuctInsulationRValue' => one,
'DuctLocation[text()="living space" or text()="basement - conditioned" or text()="basement - unconditioned" or text()="crawlspace - vented" or text()="crawlspace - unvented" or text()="attic - vented" or text()="attic - unvented" or text()="garage" or text()="outside"]' => one,
'DuctLocation[text()="living space" or text()="basement - conditioned" or text()="basement - unconditioned" or text()="crawlspace - vented" or text()="crawlspace - unvented" or text()="attic - vented" or text()="attic - unvented" or text()="garage" or text()="outside" or text()="other housing unit" or text()="other heated space" or text()="other multifamily buffer space" or text()="other non-freezing space"]' => one,
'DuctSurfaceArea' => one,
},

Expand Down Expand Up @@ -533,7 +533,7 @@ def self.run_validator(hpxml_doc)
'../WaterFixture' => one_or_more, # See [WaterFixture]
'SystemIdentifier' => one, # Required by HPXML schema
'WaterHeaterType[text()="storage water heater" or text()="instantaneous water heater" or text()="heat pump water heater" or text()="space-heating boiler with storage tank" or text()="space-heating boiler with tankless coil"]' => one, # See [WHType=Tank] or [WHType=Tankless] or [WHType=HeatPump] or [WHType=Indirect] or [WHType=CombiTankless]
'[not(Location)] | Location[text()="living space" or text()="basement - unconditioned" or text()="basement - conditioned" or text()="attic - unvented" or text()="attic - vented" or text()="garage" or text()="crawlspace - unvented" or text()="crawlspace - vented" or text()="other exterior"]' => one,
'[not(Location)] | Location[text()="living space" or text()="basement - unconditioned" or text()="basement - conditioned" or text()="attic - unvented" or text()="attic - vented" or text()="garage" or text()="crawlspace - unvented" or text()="crawlspace - vented" or text()="other exterior" or text()="other housing unit" or text()="other heated space" or text()="other multifamily buffer space" or text()="other non-freezing space"]' => one,
'FractionDHWLoadServed' => one,
'HotWaterTemperature' => zero_or_one,
'UsesDesuperheater' => zero_or_one, # See [Desuperheater]
Expand Down Expand Up @@ -659,7 +659,7 @@ def self.run_validator(hpxml_doc)
# [ClothesWasher]
'/HPXML/Building/BuildingDetails/Appliances/ClothesWasher' => {
'SystemIdentifier' => one, # Required by HPXML schema
'[not(Location)] | Location[text()="living space" or text()="basement - conditioned" or text()="basement - unconditioned" or text()="garage"]' => one,
'[not(Location)] | Location[text()="living space" or text()="basement - conditioned" or text()="basement - unconditioned" or text()="garage" or text()="other"]' => one, # Use "other" for space type of multifamily buffer space, non-freezing space, other housing unit, and other heated space
'ModifiedEnergyFactor | IntegratedModifiedEnergyFactor' => zero_or_one,
'ModifiedEnergyFactor | IntegratedModifiedEnergyFactor | RatedAnnualkWh | LabelElectricRate | LabelGasRate | LabelAnnualGasCost | LabelUsage | Capacity' => zero_or_seven,
'extension/UsageMultiplier' => zero_or_one,
Expand All @@ -668,7 +668,7 @@ def self.run_validator(hpxml_doc)
# [ClothesDryer]
'/HPXML/Building/BuildingDetails/Appliances/ClothesDryer' => {
'SystemIdentifier' => one, # Required by HPXML schema
'[not(Location)] | Location[text()="living space" or text()="basement - conditioned" or text()="basement - unconditioned" or text()="garage"]' => one,
'[not(Location)] | Location[text()="living space" or text()="basement - conditioned" or text()="basement - unconditioned" or text()="garage" or text()="other"]' => one, # Use "other" for space type of multifamily buffer space, non-freezing space, other housing unit, and other heated space
'FuelType[text()="natural gas" or text()="fuel oil" or text()="propane" or text()="electricity" or text()="wood"]' => one,
'EnergyFactor | CombinedEnergyFactor' => zero_or_one,
'EnergyFactor | CombinedEnergyFactor | ControlType' => zero_or_two,
Expand All @@ -678,6 +678,7 @@ def self.run_validator(hpxml_doc)
# [Dishwasher]
'/HPXML/Building/BuildingDetails/Appliances/Dishwasher' => {
'SystemIdentifier' => one, # Required by HPXML schema
'[not(Location)] | Location[text()="living space" or text()="basement - conditioned" or text()="basement - unconditioned" or text()="garage" or text()="other"]' => one, # Use "other" for space type of multifamily buffer space, non-freezing space, other housing unit, and other heated space
'RatedAnnualkWh | EnergyFactor' => zero_or_one,
'RatedAnnualkWh | EnergyFactor | LabelElectricRate | LabelGasRate | LabelAnnualGasCost | LabelUsage | PlaceSettingCapacity' => zero_or_six,
'extension/UsageMultiplier' => zero_or_one,
Expand All @@ -686,7 +687,7 @@ def self.run_validator(hpxml_doc)
# [Refrigerator]
'/HPXML/Building/BuildingDetails/Appliances/Refrigerator' => {
'SystemIdentifier' => one, # Required by HPXML schema
'[not(Location)] | Location[text()="living space" or text()="basement - conditioned" or text()="basement - unconditioned" or text()="garage"]' => one,
'[not(Location)] | Location[text()="living space" or text()="basement - conditioned" or text()="basement - unconditioned" or text()="garage" or text()="other"]' => one, # Use "other" for space type of multifamily buffer space, non-freezing space, other housing unit, and other heated space
'RatedAnnualkWh | extension/AdjustedAnnualkWh' => zero_or_more,
'extension/UsageMultiplier' => zero_or_one,
},
Expand All @@ -703,6 +704,7 @@ def self.run_validator(hpxml_doc)
# [CookingRange]
'/HPXML/Building/BuildingDetails/Appliances/CookingRange' => {
'SystemIdentifier' => one, # Required by HPXML schema
'[not(Location)] | Location[text()="living space" or text()="basement - conditioned" or text()="basement - unconditioned" or text()="garage" or text()="other"]' => one, # Use "other" for space type of multifamily buffer space, non-freezing space, other housing unit, and other heated space
'FuelType[text()="natural gas" or text()="fuel oil" or text()="propane" or text()="electricity" or text()="wood"]' => one,
'IsInduction' => zero_or_one,
'extension/UsageMultiplier' => zero_or_one,
Expand All @@ -711,7 +713,7 @@ def self.run_validator(hpxml_doc)

# [Lighting]
'/HPXML/Building/BuildingDetails/Lighting' => {
'LightingGroup[LightingType[LightEmittingDiode | CompactFluorescent | FluorescentTube] and Location[text()="interior" or text()="exterior" or text()="garage"]]' => zero_or_nine, # See [LightingGroup]
'LightingGroup[LightingType[LightEmittingDiode | CompactFluorescent | FluorescentTube] and Location[text()="interior" or text()="exterior" or text()="garage"]]' => nine, # See [LightingGroup]
'extension/UsageMultiplier' => zero_or_one,
},

Expand Down
Loading

0 comments on commit c63484d

Please sign in to comment.