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

Latest OS-HPXML #999

Merged
merged 11 commits into from
Nov 1, 2022
Merged

Latest OS-HPXML #999

merged 11 commits into from
Nov 1, 2022

Conversation

joseph-robertson
Copy link
Contributor

Pull Request Description

Pulls in:

Checklist

Not all may apply:

  • Tests (and test files) have been updated
  • Documentation has been updated
  • Changelog has been updated
  • openstudio tasks.rb update_measures has been run
  • No unexpected regression test changes on CI (checked comparison artifacts)

…31ee9

4c519231ee9 Merge pull request #1198 from NREL/timestamp_convention
656680f8561 Latest results.
fc9fce103b7 First pass.
a5e00de5a94 Merge pull request #1197 from NREL/sip_rename
cfc0422dce5 Replaces `WallType/StructurallyInsulatedPanel` with `WallType/StructuralInsulatedPanel` per HPXML schema change.

git-subtree-dir: resources/hpxml-measures
git-subtree-split: 4c519231ee9604d0baaa8ee0a840b190559b8ee8
@joseph-robertson joseph-robertson added this to the ResStock v2.6.0 Beta milestone Oct 18, 2022
@joseph-robertson joseph-robertson self-assigned this Oct 18, 2022
@joseph-robertson joseph-robertson marked this pull request as ready for review October 26, 2022 18:44
@joseph-robertson joseph-robertson merged commit 0ae1158 into develop Nov 1, 2022
@joseph-robertson joseph-robertson deleted the latest-os-hpxml branch November 1, 2022 04:42
joseph-robertson added a commit that referenced this pull request Feb 3, 2023
…a8d95

fda505a8d95 Update measure argument description.
5ea2342916f Update changelog and docs.
a63142a44f7 Add reporting test for advanced output variables.
f574c52e842 Add reporting test and update template osw.
18193edc885 Add new optional argument for output variables.
602378b40ca Merge pull request #1001 from NREL/eri_reporting
ce9a1a6b90e Latest results.
1a9b90987d5 Increase number of output decimal places and a little code cleanup.
c67d0f7a780 Update xml
59bab55d0bf EC bugfix.
66d21ad412d Refactor/simplify ReportSimulationOutput for ERI purposes. No longer creates a separate *_ERI.csv.
0457f4db9f9 Revert "Add HPXML has_fuel helper method."
365c8e2fcdd Add HPXML has_fuel helper method.
c8b56ceb83a Fix case.
67e93b0c152 Clarify documentation for interior surfaces (or flat roofs) regarding Azimuth/Orientation defaulting.
a7f6341d493 Merge pull request #999 from NREL/shared_recirc_temperature
d5fc0daed83 Drop ABCDE
4bb47a2d00a Updated xml
5c3c071f772 Adds support for shared hot water recirculation systems controlled by temperature, per ANSI/RESNET/ICC 301-2019 Addendum C.
916014c91c8 Merge pull request #996 from NREL/battery-docs
48503939ee9 Merge pull request #995 from NREL/fossil_fuel_emissions_factors
d0a9528e078 Minor tweak.
9c4727d50e7 Adds some explanation for how batteries are controlled and other misc cleanup.
6d9edb4f618 Latest results.
e0369eb925d Rename "CO2" to "CO2e". Updated cambium data to be CO2e and combined (combustion + pre-combustion).
6c9cd855816 Updated default fossil fuel emissions factors to include pre-combustion (e.g., methane leakage for natural gas).
58bccc6420c Merge pull request #992 from NREL/minitest_helper2
9b7ce3f3c02 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into minitest_helper2
6a451ecdb45 Revert to original config
713fb844c91 Merge pull request #993 from NREL/goodbye_beta
bfa2365a843 Remove the "Beta" label from the BuildResidentialHPXML measure. [ci skip]
f5729c759b8 Aha, this test file was not loading minitest_helper.rb.
77ca82d4152 Try excluding build_residential_hpxml_test.rb
854d4ccb090 First, reproduce issue on CI.
d174ace1df1 Merge pull request #987 from NREL/hvac_iq_limits
9d40f9e25e6 Update Changelog.md [ci skip]
7a1644d70e9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_iq_limits
06bd81964cc Merge pull request #986 from NREL/docs_on_ci
afe5d64f823 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into docs_on_ci
e5de16e128d Merge pull request #988 from NREL/minitest_helper
66bf8248d02 Possible fix to obtain code coverage on CI?
e6ee2daa0cb Try reverting minitest_helper.rb change.
33b4d180cf9 Adds more stringent limits for `AirflowDefectRatio` and `ChargeDefectRatio` (-0.9 to 9, which now allows values from 1/10th to 10x the design value).
f1c13fb6871 Re-enable CI steps
913f947f19a Fix error?
3c21bf713a8 Install pip
3afc9dcf5c0 Install sphinx
f8e4ca4a4c8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into docs_on_ci
f0844a93edf Merge pull request #978 from NREL/leap-year-handling
040604b1106 Add newline
44224c6a06d Build docs on CI, store as artifacts.
852a36d084f Update workflow test file.
bc8ccc2868a Update error test.
219cbdfee88 Update error message.
69319016c04 Update changelog and docs.
f782deade4f Merge branch 'master' into leap-year-handling
39686d9de69 Merge pull request #980 from NREL/report-sim-output-setup-fix
a80a1f25183 Return if model not retrieved.
6dd4463a51d Latest results.
335370e3c0b Update defaults header test.
bbd8c3bcc1a Add test for throwing error.
24936969f9e Throw error if leap year with TMY.
14519b064f5 Clean up translator measure.
c7a8ad6a2ef Change to non leap year in test xml file.
6a1ea0ad3ba Update README.md

git-subtree-dir: resources/hpxml-measures
git-subtree-split: fda505a8d95267aaee4f8ae832f338f321981d00
joseph-robertson added a commit that referenced this pull request Feb 3, 2023
…f619e

75de13f619e Simpler fix to negative peak/design values.
51dbd82f910 Merge pull request #1007 from NREL/negative_peak_flow_rate
f5ee3eee6a6 Prevent possibility of trying to set, e.g., negative peak flow rate.
0a561c1369e Merge pull request #1006 from NREL/door_bugfix
b5440086603 Bugfix for cases where door R-value w/o air film goes negative. (Can occur for, e.g., CZ 1 where IECC door U-factor is 1.2.)
602378b40ca Merge pull request #1001 from NREL/eri_reporting
ce9a1a6b90e Latest results.
1a9b90987d5 Increase number of output decimal places and a little code cleanup.
c67d0f7a780 Update xml
59bab55d0bf EC bugfix.
66d21ad412d Refactor/simplify ReportSimulationOutput for ERI purposes. No longer creates a separate *_ERI.csv.
0457f4db9f9 Revert "Add HPXML has_fuel helper method."
365c8e2fcdd Add HPXML has_fuel helper method.
c8b56ceb83a Fix case.
67e93b0c152 Clarify documentation for interior surfaces (or flat roofs) regarding Azimuth/Orientation defaulting.
a7f6341d493 Merge pull request #999 from NREL/shared_recirc_temperature
d5fc0daed83 Drop ABCDE
4bb47a2d00a Updated xml
5c3c071f772 Adds support for shared hot water recirculation systems controlled by temperature, per ANSI/RESNET/ICC 301-2019 Addendum C.
916014c91c8 Merge pull request #996 from NREL/battery-docs
48503939ee9 Merge pull request #995 from NREL/fossil_fuel_emissions_factors
d0a9528e078 Minor tweak.
9c4727d50e7 Adds some explanation for how batteries are controlled and other misc cleanup.
6d9edb4f618 Latest results.
e0369eb925d Rename "CO2" to "CO2e". Updated cambium data to be CO2e and combined (combustion + pre-combustion).
6c9cd855816 Updated default fossil fuel emissions factors to include pre-combustion (e.g., methane leakage for natural gas).
58bccc6420c Merge pull request #992 from NREL/minitest_helper2
9b7ce3f3c02 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into minitest_helper2
6a451ecdb45 Revert to original config
713fb844c91 Merge pull request #993 from NREL/goodbye_beta
bfa2365a843 Remove the "Beta" label from the BuildResidentialHPXML measure. [ci skip]
f5729c759b8 Aha, this test file was not loading minitest_helper.rb.
77ca82d4152 Try excluding build_residential_hpxml_test.rb
854d4ccb090 First, reproduce issue on CI.
d174ace1df1 Merge pull request #987 from NREL/hvac_iq_limits
9d40f9e25e6 Update Changelog.md [ci skip]
7a1644d70e9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_iq_limits
06bd81964cc Merge pull request #986 from NREL/docs_on_ci
afe5d64f823 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into docs_on_ci
e5de16e128d Merge pull request #988 from NREL/minitest_helper
66bf8248d02 Possible fix to obtain code coverage on CI?
e6ee2daa0cb Try reverting minitest_helper.rb change.
33b4d180cf9 Adds more stringent limits for `AirflowDefectRatio` and `ChargeDefectRatio` (-0.9 to 9, which now allows values from 1/10th to 10x the design value).
f1c13fb6871 Re-enable CI steps
913f947f19a Fix error?
3c21bf713a8 Install pip
3afc9dcf5c0 Install sphinx
f8e4ca4a4c8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into docs_on_ci
f0844a93edf Merge pull request #978 from NREL/leap-year-handling
040604b1106 Add newline
44224c6a06d Build docs on CI, store as artifacts.
852a36d084f Update workflow test file.
bc8ccc2868a Update error test.
219cbdfee88 Update error message.
69319016c04 Update changelog and docs.
f782deade4f Merge branch 'master' into leap-year-handling
39686d9de69 Merge pull request #980 from NREL/report-sim-output-setup-fix
a80a1f25183 Return if model not retrieved.
6dd4463a51d Latest results.
335370e3c0b Update defaults header test.
bbd8c3bcc1a Add test for throwing error.
24936969f9e Throw error if leap year with TMY.
14519b064f5 Clean up translator measure.
c7a8ad6a2ef Change to non leap year in test xml file.
6a1ea0ad3ba Update README.md

git-subtree-dir: resources/hpxml-measures
git-subtree-split: 75de13f619e9b4b98f7f33889caf8de406f6ea07
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.

1 participant