Skip to content

Commit

Permalink
Squashed 'hpxml-measures/' changes from 4e35921a1..862d05663
Browse files Browse the repository at this point in the history 
862d05663 Minor docs update.
fc08a1433 Merge pull request #765 from NREL/default_vent_fan_power
c0b0d06a4 Latest results.
8e56249cd Allows defaulting of mechanical ventilation fan power (by type).
e6e5c15e2 Merge pull request #674 from NREL/hvac_dhw_default_efficiencies
08db7a78c Update Changelog.md
47c8de4a6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
7befb82d2 Update projects
3df7ce7b0 Latest results.
c4228096c update the default efficiency of the electric type heating systems
17f6ebc69 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
f53765eff Merge pull request #763 from NREL/mech_vent_precond_energy_only
3ce2810d6 Latest results.
a2c4fb5dd Code changes from NREL/OpenStudio-HPXML#753, energy impact only.
c8872d6cb Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
95409f512 address comments
f6f88ca30 Merge pull request #761 from NREL/seasons_followup
4c8870a3c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
3cdc84532 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
6e5f10028 fix test_fireplaces
183acefa2 update test_defaults
fe1e69a8b Merge branch 'hvac_dhw_default_efficiencies' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
ecae4c26e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
dd56e58a7 update fireplace/stove efficiency defaulting
276f9403e Latest results.
8601281b4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
391100932 Latest results.
6d0c3755a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
544a15ad3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
beefde88b update documentation
4948ed5ed Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
fc1faeb7f coarse efficiency defaulting for fireplace/stove Use energyplus.rb for fuel type mapping
48da5c831 Merge branch 'hvac_dhw_default_efficiencies' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
b9d4fd4e2 code cleanup and add more tests
4ca0de478 Latest results.
bb4e92346 fix test_furnaces
4e2f3ab4c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
ee5afad48 fix base-misc-defaults.xml
631235b16 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
4bdbd77d3 pick up the rest of the initial comments
2255a1a29 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
3ad035b7e pick up some of the initial comments
21d7ecb8e another documentation update
f6c4f7c3d update documentation
f0e0c56b5 revert assertions for tankless and heatpump water heaters
8a0d1acd3 remove Fixmes
072c0f2ea Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
5955f3ea8 update hpxml for water heaters and change the assertions for water heater efficiencies
0728f7a1f update EPvalidator for water heating systems
861ef8a7b Bugfix and update EPvalidator.xml and hpxml.rb
8bf095e75 update test_defaults
2b0fe12a1 run tasks.rb
fdc7aadff Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
6a477f99a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
2e5032654 first pass

git-subtree-dir: hpxml-measures
git-subtree-split: 862d056638eb1df40cc0e2eb7be60cf1e5210a96
  • Loading branch information
@shorowit
shorowit committed May 19, 2021
1 parent 0e8508b commit 6deec8d
Show file tree
Hide file tree
Showing 23 changed files with 1,442 additions and 282 deletions.
3 changes: 3 additions & 0 deletions Changelog.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ __New Features__
- Adds an `--ep-input-format` argument to run_simulation.rb to choose epJSON as the EnergyPlus input file format instead of IDF.
- Allows `HeatingSeason` & `CoolingSeason` to be specified for defining heating and cooling equipment availability.
- Removes error-check for number of bedrooms based on conditioned floor area, per RESNET guidance.
- Revises shared mechanical ventilation preconditioning control logic to operate less often.
- Allows defaulting of HVAC/DHW system efficiency (by age).
- Allows defaulting of mechanical ventilation fan power (by type).

__Bugfixes__
- Improves ground reflectance when there is shading of windows/skylights.
Expand Down
186 changes: 105 additions & 81 deletions HPXMLtoOpenStudio/measure.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<error>Unable to extract OpenStudio::Measure::OSMeasure object from /mnt/c/git/openstudio-hpxml/HPXMLtoOpenStudio/measure.rb. The script should contain a class that derives from OpenStudio::Measure::OSMeasure and should close with a line stating the class name followed by .new.registerWithApplication.</error>
<name>hpxm_lto_openstudio</name>
<uid>b1543b30-9465-45ff-ba04-1d1f85e763bc</uid>
<version_id>c929f134-7b14-43a4-a9ee-11bb8d27da1f</version_id>
<version_modified>20210513T171148Z</version_modified>
<version_id>3a7ed856-c7c0-4fdd-8935-6790d45807f7</version_id>
<version_modified>20210517T151947Z</version_modified>
<xml_checksum>D8922A73</xml_checksum>
<class_name>HPXMLtoOpenStudio</class_name>
<display_name>HPXML to OpenStudio Translator</display_name>
Expand Down Expand Up @@ -149,12 +149,6 @@
<usage_type>resource</usage_type>
<checksum>38ED685E</checksum>
</file>
<file>
<filename>util.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>7DAA5F02</checksum>
</file>
<file>
<filename>materials.rb</filename>
<filetype>rb</filetype>
Expand Down Expand Up @@ -378,46 +372,52 @@
<checksum>19007457</checksum>
</file>
<file>
<filename>test_hotwater_appliance.rb</filename>
<filename>test_water_heater.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>E962DB16</checksum>
<checksum>C8BB1267</checksum>
</file>
<file>
<filename>simcontrols.rb</filename>
<filename>test_airflow.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>C18610A9</checksum>
<usage_type>test</usage_type>
<checksum>9219EDE1</checksum>
</file>
<file>
<filename>test_water_heater.rb</filename>
<filename>test_enclosure.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>C8BB1267</checksum>
<checksum>2A7EF627</checksum>
</file>
<file>
<filename>validator.rb</filename>
<filename>constructions.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>BF53D293</checksum>
<checksum>2BDDE11F</checksum>
</file>
<file>
<filename>test_validation.rb</filename>
<filename>energyplus.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>CA9A2E46</checksum>
</file>
<file>
<filename>test_generator.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>4C662AE0</checksum>
<checksum>19007457</checksum>
</file>
<file>
<filename>airflow.rb</filename>
<filename>test_lighting.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>99EB6060</checksum>
<usage_type>test</usage_type>
<checksum>CC725437</checksum>
</file>
<file>
<filename>geometry.rb</filename>
<filename>simcontrols.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>3AB6308D</checksum>
<checksum>C18610A9</checksum>
</file>
<file>
<filename>generator.rb</filename>
Expand All @@ -432,88 +432,112 @@
<checksum>2ADA335B</checksum>
</file>
<file>
<filename>waterheater.rb</filename>
<filename>xmlhelper.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>A9868999</checksum>
<checksum>CD54C911</checksum>
</file>
<file>
<filename>xmlhelper.rb</filename>
<filename>util.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>CD54C911</checksum>
<checksum>7DAA5F02</checksum>
</file>
<file>
<filename>pv.rb</filename>
<filename>minitest_helper.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>AF98955A</checksum>
<checksum>F3E1BE58</checksum>
</file>
<file>
<filename>test_airflow.rb</filename>
<filename>test_validation.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>9219EDE1</checksum>
<checksum>4C662AE0</checksum>
</file>
<file>
<filename>test_enclosure.rb</filename>
<filename>test_hotwater_appliance.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>2A7EF627</checksum>
<checksum>E962DB16</checksum>
</file>
<file>
<filename>constructions.rb</filename>
<filename>util.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>B185ACE7</checksum>
</file>
<file>
<filename>weather.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>2BDDE11F</checksum>
<checksum>9BDDB2C2</checksum>
</file>
<file>
<filename>energyplus.rb</filename>
<filename>pv.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>CA9A2E46</checksum>
<checksum>AF98955A</checksum>
</file>
<file>
<filename>version.rb</filename>
<filename>validator.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>1277B716</checksum>
<checksum>BF53D293</checksum>
</file>
<file>
<filename>hvac_sizing.rb</filename>
<filename>geometry.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>25E2DA28</checksum>
<checksum>3AB6308D</checksum>
</file>
<file>
<filename>util.rb</filename>
<filename>test_hvac.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>B185ACE7</checksum>
<checksum>F3E85A51</checksum>
</file>
<file>
<filename>minitest_helper.rb</filename>
<filename>hvac.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>F3E1BE58</checksum>
<checksum>96320EA4</checksum>
</file>
<file>
<filename>weather.rb</filename>
<filename>waterheater.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>9BDDB2C2</checksum>
<checksum>25442288</checksum>
</file>
<file>
<filename>schedules.rb</filename>
<filename>airflow.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>38A6C75D</checksum>
<checksum>E5C505B7</checksum>
</file>
<file>
<filename>lighting.rb</filename>
<filename>BaseElements.xsd</filename>
<filetype>xsd</filetype>
<usage_type>resource</usage_type>
<checksum>FD773DB8</checksum>
</file>
<file>
<filename>HPXMLDataTypes.xsd</filename>
<filetype>xsd</filetype>
<usage_type>resource</usage_type>
<checksum>CA8F8CC3</checksum>
</file>
<file>
<filename>HPXMLvalidator.xml</filename>
<filetype>xml</filetype>
<usage_type>resource</usage_type>
<checksum>E14BA8AB</checksum>
</file>
<file>
<filename>hpxml.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>C028223B</checksum>
<checksum>66982214</checksum>
</file>
<file>
<filename>constants.rb</filename>
Expand All @@ -522,69 +546,69 @@
<checksum>F895FFF9</checksum>
</file>
<file>
<filename>HPXMLDataTypes.xsd</filename>
<filetype>xsd</filetype>
<filename>hvac_sizing.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>CA8F8CC3</checksum>
<checksum>25E2DA28</checksum>
</file>
<file>
<filename>BaseElements.xsd</filename>
<filetype>xsd</filetype>
<filename>lighting.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>FD773DB8</checksum>
<checksum>C028223B</checksum>
</file>
<file>
<filename>HPXMLvalidator.xml</filename>
<filetype>xml</filetype>
<filename>lu_hvac_equipment_efficiency.csv</filename>
<filetype>csv</filetype>
<usage_type>resource</usage_type>
<checksum>E14BA8AB</checksum>
<checksum>69BCF0A4</checksum>
</file>
<file>
<filename>test_hvac.rb</filename>
<filename>lu_water_heater_efficiency.csv</filename>
<filetype>csv</filetype>
<usage_type>resource</usage_type>
<checksum>9EC3B4D6</checksum>
</file>
<file>
<filename>schedules.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>F3E85A51</checksum>
<usage_type>resource</usage_type>
<checksum>38A6C75D</checksum>
</file>
<file>
<filename>version.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>1277B716</checksum>
</file>
<file>
<version>
<software_program>OpenStudio</software_program>
<identifier>2.1.1</identifier>
<min_compatible>2.1.1</min_compatible>
<identifier>3.2.0</identifier>
<min_compatible>3.2.0</min_compatible>
</version>
<filename>measure.rb</filename>
<filetype>rb</filetype>
<usage_type>script</usage_type>
<checksum>76BEB7AB</checksum>
</file>
<file>
<filename>hvac.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>ECBD9662</checksum>
</file>
<file>
<filename>test_defaults.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>BB81D4C0</checksum>
<checksum>6E8F8702</checksum>
</file>
<file>
<filename>hpxml_defaults.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>EDF78BC3</checksum>
<checksum>5B7CE0A0</checksum>
</file>
<file>
<filename>EPvalidator.xml</filename>
<filetype>xml</filetype>
<usage_type>resource</usage_type>
<checksum>8EE695FA</checksum>
</file>
<file>
<filename>hpxml.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>4BBE084E</checksum>
<checksum>EABD489B</checksum>
</file>
</files>
</measure>
Loading

0 comments on commit 6deec8d

Please sign in to comment.