Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ResStock-HPXML #443

Merged
merged 2,403 commits into from Feb 10, 2022
Merged

ResStock-HPXML #443

merged 2,403 commits into from Feb 10, 2022

Conversation

joseph-robertson
Copy link
Contributor

@joseph-robertson joseph-robertson commented Apr 30, 2020

Pull Request Description

Subtree to: NREL/OpenStudio-HPXML#372.

Closes #774.

Checklist

Not all may apply:

  • Unit tests have been added or updated
  • All rake tasks have been run, and pass
  • Documentation has been modified appropriately
  • Any new options are added to project_testing
  • project_testing runs without any failures
  • No unexpected regression test changes
  • All tests are passing (green) on circleci
  • The changelog has been updated appropriately
  • This branch is up-to-date with master

For more information on how to perform these checklist items, see the documentation's Advanced Tutorial.

@codecov-io
Copy link

codecov-io commented May 7, 2020

Codecov Report

Merging #443 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #443   +/-   ##
=======================================
  Coverage   19.51%   19.51%           
=======================================
  Files          32       32           
  Lines       21327    21327           
=======================================
  Hits         4162     4162           
  Misses      17165    17165           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 42d2385...42d2385. Read the comment docs.

@codecov-commenter
Copy link

codecov-commenter commented May 19, 2020

Codecov Report

Merging #443 into master will decrease coverage by 73.57%.
The diff coverage is 47.45%.

Impacted file tree graph

@@             Coverage Diff             @@
##           master     #443       +/-   ##
===========================================
- Coverage   93.44%   19.86%   -73.58%     
===========================================
  Files         168       33      -135     
  Lines       49518    20941    -28577     
===========================================
- Hits        46271     4160    -42111     
- Misses       3247    16781    +13534     
Impacted Files Coverage Δ
...es/hpxml-measures/BuildResidentialHPXML/measure.rb 71.45% <ø> (ø)
...sures/BuildResidentialHPXML/resources/constants.rb 48.38% <ø> (ø)
...asures/BuildResidentialHPXML/resources/geometry.rb 2.10% <ø> (ø)
...asures/BuildResidentialHPXML/resources/location.rb 25.00% <ø> (ø)
...sures/BuildResidentialHPXML/resources/schedules.rb 17.89% <ø> (ø)
resources/buildstock.rb 66.94% <45.61%> (+0.28%) ⬆️
project_testing/tests/test.rb 80.00% <100.00%> (ø)
resources/meta_measure.rb 34.81% <0.00%> (-34.82%) ⬇️
resources/run_sampling.rb 86.18% <0.00%> (-0.56%) ⬇️
...sources/measures/ResidentialHVACFurnace/measure.rb
... and 178 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2a880aa...3f10132. Read the comment docs.

@joseph-robertson joseph-robertson changed the title ResStock-HPXML Restructure, OpenStudio 3.0.0 ResStock-HPXML Jun 4, 2020
joseph-robertson added a commit that referenced this pull request Jul 8, 2020
33045dedf Update build measure for fixed heater.
cb423405e Merge branch 'master' into build-res-hpxml-v3
63a8b426b Merge pull request #444 from NREL/fixed_space_heater
5fdf842b7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into fixed_space_heater
2a1c35d72 Merge pull request #443 from NREL/fix_tests_on_windows
df475efa0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into fix_tests_on_windows
cfd1b0751 Allow FixedHeater (as opposed to PortableHeater) as a HeatingSystemType.
1615cc56a Merge pull request #442 from NREL/adobe_walls
f0e45399c Avoid IO.sysopen for capturing stderr, as it results in the file not being closed on Windows, causing errors when running tests.
684c9bc34 Allow Adobe for WallType.
7dad7d574 Merge pull request #440 from NREL/EPvalidator_bugfix
6a53d5a7f Merge branch 'master' into EPvalidator_bugfix
f915131fb Merge pull request #438 from NREL/error_output
9b7a1e3bd Fix LightingGroup XPath in EPvalidator.rb
0b5c8ea35 Merge branch 'master' into build-res-hpxml-v3
ba6e64c80 Adds more informative output message if OS measure error or E+ error.
b3b3adf0c Merge pull request #437 from NREL/ashrae140_htg_clg
6ba03ab29 Switch to mkdir_p.
5111ab04a More merging of workflow code.
d70c63272 Rename argument.
a64124869 Switches to TMY3 weather for A140 runs. Merges code from hpxml_translator_test.rb and run_simulation.rb into meta_measure.rb.
25b3ba623 Fix test.
679627944 Retrieve HVAC sizing values before runner is reset.
118afa4f2 Small fix to logging.
6b19cbfda Fix ASHRAE 140 test files to only provide heating or cooling with the ideal air system, not both.

git-subtree-dir: resources/hpxml-measures
git-subtree-split: 33045dedfba401e669ebc9e80bf671692bcdc1f4
@nmerket nmerket mentioned this pull request Aug 27, 2020
7 tasks
@nmerket
Copy link
Member

nmerket commented Sep 25, 2020

I'm working on getting this to run in buildstockbatch. A few notes:

First, I'm running into an issue with weather files. The weather files directory is mounted into the simulation container as read only because usually many containers are using that directory at the same time and I don't want them trying to write there and cause conflicts. It looks like the BuildResidentialHPXML measure creates a -cache.csv file for the weather file it is using from the epw and tries to write it back to the directory. I'm not familiar with why we do this, but ideas for fixes include:

  • pregenerating all the cache files before simulations begin
  • including cache files in weather zip

Second, can we do away with the data_point_out.zip? We end up putting all them in a tarball later thereby double archiving them. As mentioned in NREL/buildstockbatch#182, that causes a problem to get at the data inside the zip files that are inside the tar.gz files.

@shorowit
Copy link
Contributor

Regarding the cache.csv files, this is used to avoid parsing the EPW file for (subsequent) simulations that reference the same EPW. So it's sole purpose is to reduce runtimes. My recollection is that it was around half a second per simulation, but it's been a while since we've checked.

I don't think it's worth "including cache files in weather zip", since that will be additional burden for an analyst to figure out how to do it for AMY/custom weather files.

In addition to "pregenerating all the cache files before simulations begin", a couple other ideas come to mind:

  • Update BuildResidentialHPXML to check if it can write to a dir and, if not, fallback to a temp directory. (Would that work here?)
  • Update BuildResidentialHPXML to check if it can write to a dir and, if not, do not create the cache file. (In other words, ResStock would not get the reduced runtimes.)

@shorowit
Copy link
Contributor

Regarding the data_point.zip, I assume you're talking about the one that is automatically generated by the OpenStudio-workflow gem (and not specific to ResStock-HPXML)?

If so, I believe there's only one way that it can be suppressed, which is by using the "fast" run option in the OSW (example). However, this option will suppress a number of things (like prevent the OSM file from being written), so that might not be of interest for ResStock?

@joseph-robertson joseph-robertson changed the base branch from master to develop December 8, 2020 17:24
@codecov-io
Copy link

codecov-io commented Feb 2, 2021

Codecov Report

❗ No coverage uploaded for pull request base (develop@cb9373c). Click here to learn what that means.
The diff coverage is n/a.

❗ Current head f1a459f differs from pull request most recent head afa690a. Consider uploading reports for the commit afa690a to get more accurate results
Impacted file tree graph

@@            Coverage Diff             @@
##             develop     #443   +/-   ##
==========================================
  Coverage           ?   65.04%           
==========================================
  Files              ?        7           
  Lines              ?     1107           
  Branches           ?        0           
==========================================
  Hits               ?      720           
  Misses             ?      387           
  Partials           ?        0           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update cb9373c...afa690a. Read the comment docs.

@joseph-robertson joseph-robertson changed the base branch from develop to sync-tsvs May 17, 2021 20:21
Copy link
Contributor Author

@joseph-robertson joseph-robertson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these leftover changes from merging develop in?

@aspeake
Copy link
Contributor

aspeake commented Jun 7, 2021

Are these leftover changes from merging develop in?

@joseph-robertson which commit are you referring to? Some of these changes are, namely the updates to integrity_checks.rb to work with changes to methods in buildstock.rb on develop. The tsv changes are updates after the sampling probability bug fix in resstock-estimation.

joseph-robertson and others added 24 commits February 1, 2022 13:06
ResStock-HPXML: Emissions calculations (e.g., CO2)
17acfbcfe2 Merge pull request #973 from NREL/cambium-rows-cols
9b172b13d0 Latest results.
893d4ebdd2 Bugfix.
0040f64a77 Remove expensive non-numeric error check up front and just check for errors during reporting measure instead.
841af07e93 Minor docs update. [ci skip]
ffa007b43e Fix tests.
2ad98659e8 A couple bugfixes.
29be5aea4a Update docs. [ci skip]
a0b5f6d256 Allow electricity emissions files to have multiple columns and header rows.
85529c53a1 Merge pull request #972 from NREL/battery-sample-files
877fe1dd2f Latest results.
17c2762031 Renames a few battery sample files.
d84426f05e Minor schematron fix.
e0a867d1fe Tiny docs update. [ci skip]
320c6419d8 Merge pull request #971 from NREL/hp_backup_system_central
d3ae0ce222 Latest results.
3fd69efd2b Update test.
d97d54ca14 Bugfix and removal of validation test that is now obsolete.
a7d386d838 run task
a6c56056b6 Allows a heat pump separate backup system to be a central system (e.g., central furnace w/ ducts). Previously only non-central system types were allowed (boiler, electric resistance, wall/floor furnace, etc.); now every type of heating system is allowed.
89ab5898e9 Merge pull request #966 from NREL/apartment-attics
77f086ad64 Merge branch 'master' into apartment-attics
fe225daec4 Typo.
fa3744f27b Update argument descriptions.
10f3f19746 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into apartment-attics
e9858a0796 Update changelog.
a44d2536f1 Add code to support unconditioned attics for apartment units.
63ff5c9474 Add extra mf tests for flat roof and vented attic.
6e5a9001dd Remove inset and balcony arguments, and associated code.
cf2464ca12 Update build error test for mf with conditioned attic.
374cf6d74e Merge branch 'master' into apartment-attics
cd664acc69 Start with some code cleanup.

git-subtree-dir: resources/hpxml-measures
git-subtree-split: 17acfbcfe29bd77ddadabf7cabab8b6b7d3d2958
…ucture-v3

# Conflicts:
#	test/base_results/baseline/annual/results_output.csv
#	test/base_results/baseline/timeseries/results_output.csv
ResStock-HPXML: Update Assembly R-Values
…cfcf9

2224e6cfcf9 Merge pull request #974 from NREL/buildreshpxml_validation
5690f8cddf6 Merge branch 'master' into buildreshpxml_validation
82aa7c1e1ba Cleanup.
e30122ae250 Merge pull request #977 from NREL/epvalidator_cleanup
3c8e6682ca5 Clean up apply_defaults arg.
f9a982fd307 Remove test.
ea76e6bddb9 Misc cleanup to EPvalidator.xml. Remove more elements that don't need to be included because they are required by the XSD schema.
c05535eb5f0 Minor cleanup.
9b6360253bd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into buildreshpxml_validation
98f7bee5ed5 Merge pull request #975 from NREL/ci_improvements
b30ad295e9a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ci_improvements
8e71a4a6760 Fix coverage?
5081166736c Need to run bundle
029d399af05 Bugfix.
0f2285c5806 Splits unit tests and workflow tests into parallel CI jobs. Also fixes #962.
c7b50d42ce3 Unrelated cleanup.
3c960583b4a BuildResidentialHPXML measure: Adds an optional argument for whether the HPXML file is validated; defaults to false. Most workflows were validating the HPXML twice (once at the end of BuildResidentialHPXML and once at the beginning of HPXMLtoOpenStudio), which incurs a performance penalty. We now only apply validation in the BuildResidentialHPXML measure in special circumstances (e.g., creating sample files and unit tests).

git-subtree-dir: resources/hpxml-measures
git-subtree-split: 2224e6cfcf913ac7815b8f4688b250ee5c86f924
@aspeake aspeake self-requested a review February 10, 2022 16:42
Copy link
Contributor

@aspeake aspeake left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍👍

@joseph-robertson joseph-robertson merged commit dbba639 into develop Feb 10, 2022
@joseph-robertson joseph-robertson deleted the restructure-v3 branch February 10, 2022 16:54
@afontani
Copy link
Contributor

Awesome work @joseph-robertson, @aspeake, @shorowit!!!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Release checklist
7 participants