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

Test ADP/BF method #1302

Closed
wants to merge 5 commits into from
Closed

Conversation

shorowit
Copy link
Contributor

Pull Request Description

Testing NREL/OpenStudio-HPXML#1707

Checklist

Not all may apply:

c6435fab6e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into adp_bf_method_design_shr
0d8be0fe07 Merge pull request #1836 from NREL/fix_partial_outputs
3f8efb3bea Bugfix.
260f10fdcb Bugfix.
d4bd5e0047 Reorganizes code so that output files are written last in the HPXMLtoOpenStudio measure.
12fee34156 measure.xml updated after running RuboCop. no offenses detected, measure.xml gets overwritten by CI anyway
4779ada0bd changed variable name from hvac_cooling_shr to hvac_cooling_shr_rated in apply_hvac_equipment_adjustments; cosmetic change only
a71a1165d6 accepting incoming master to get adp branch up to date
1c418dc882 succesfully ran Rubocop
5df10ebe08 pulling in master after addressing adp_bf review comments
9c683e7fd8 running Rubocop
40f3831b3a adding comments re a_o_rated to address Jon Winkler review comment 2
cb5e1d1f0e adding informative messages to design airflow calculation for central cooling equipment
0692d10ae5 concluded merge from diverging local and origin adp_bf_branches
178f5da6b6 addressing first Jon W. comment re adp_bf review
18cf4138d8 Latest results.
49372e7ac8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into adp_bf_method_design_shr
0a7b1f3a41 fixes to get_hvac_size_limits to ensure adp_bf_branch runs without error
18f106b82c descriptive comments on get_hvac_size_limits
ce0994b905 / \ line extension + divisor in hvac_sizing.rb
50bb97246a Latest results.
a7d7e4158f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into adp_bf_method_design_shr
8b94164910 successful? merge of latest master into adp_bf_method_design_shr to update changes re. negative elevation fix. looking thru modified files shows no merge conflict indicators (<<<, >>>).
237309723f updating comments on HVACSizingValues attributes to match master. No attributes added, only changes were in the comments next to each attribute
1d3a43a518 changing comments on get_nominal_speed method to match remote master
547cf7f838 removing :Design_SHR property from HVACSizingValues class definition, since it is no longer used
c07cb17356 refactor to rename hvac_sizings.Design_SHR object property to local variable design_shr
d373f6eb0c Latest results.
776661a963 manually resolved merge conflicts in results.csv
599ec246d4 resolved merge conflicts in measure.xml
ba79c8ab1b adp_bf_method branch up to date w/ master, merge conflicts resolved manually, final commit before submitting PR for review
2de64ea1d7 last explanatory comment before marking adp_bf_method PR for review
14f36ebf42 removing puts statements before PR review
1edc822502 Latest results.
49fd105224 Re-enable test, remove files.
0b0cc26ee9 Merge branch 'master' into adp_bf_method_design_shr
f598241990 correct hvac_sizing and removing duplicated HPXMLtoOpenStudio directory that was incorrectly copied to docs folder
83d3094c38 hvac_sizing.rb, measure.xml, and docs updates after running RuboCop
4d5cecab82 remove unit test for Psychrometrics.CalculateSHR(), since test_error.xml is now running without error
f660286106 test_error.xml running without failure. haven't inspected annual or timeseries results yet. change was to calculated A_o at rated conditions (using class variables in hvac.rb for IDB, IWB, and using psychrometrics.rb helper function for rated indoor clg humidity ratio at sea level barometric pressure (not sure pressure is correct, confirm w/ Jon?), and pass this into CoilAoFactor. CoilAoFactor should stay constant throughout the iteration for design airflow.
38cb97108a added files after git restore HPXMLtoOpenStudio to recover HPXMLtoOpenStudio folder lost on local
487c702b85 defined test_calculate_SHR() in hvac_sizing_test.rb
315916fa70 Latest results.
400a43f629 Temporarily disable test to get CI results.
a887009ac1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into adp_bf_method_design_shr
8f4b83daa6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into adp_bf_method_design_shr
308c1f7544 Fix error and minor refactoring.
3f8f26d77a confident in ADP/BF
1ca7c4a356 finished writing code for ADP/BF implementation. ADP/BF method is a better approach to calculating the design SHR and design airflow through the cooling coil for the following OS-HPXML equipment types: Central AC, A2A HP used for cooling, Mini-Split AC, and ducted MSHP used for cooling
b177cb9866 more work on iteration for design airflow
f0d925c051 more comments
c721a0185b iteration for ADP/BF
26a55b36c6 fixed unit conversion on cool_cap_rated so that Psychrometrics.rb doesn't numerically fail. hvac_cooling_ap.rated_shr and hvac_cooling_shr showing 0.05 discrepancy. ask team if this is a problem?
d37f8c146a using pre-existing coil ao factor stored in cooling additional properties to calculate design SHR. Cool Cap Design throwing undefined variable error in Psychrometrics.CalculateSHR
85b2e27f70 work on implementing ADP/BF. coil a_o factor already calculated in hvac.rb?
0391906f9b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into adp_bf_method_design_shr
74bb5facff removing pesky return 1.0 that shouldn't be there, preventing it from screwing things up when running OS CLI
f9ed1b8a5f fixed typo in descriptive comments of psychrometrics.rb
79053154fe fixed typo in comments of CoilAoFactor method in psychrometrics.rb
1e3ef9a3b1 refactor add_cooling_system function variable input order convention to match add_heating_system function variable input order convention
2cdde89a4b renamed A_o from A_o rated because A_o is not a function of design vs. rated conditions
c1a78271fd calculating A_o_rated with correct unit conversions and methods in psychometrics.rb
af58345529 Translating E+ coil bypass factor method to recalculate cool_cap_design
6861e467a6 Merge branch 'master' into adp_bf_method_design_shr
2aca92f616 Committing comments for ADP/BF
49e998de65 hvac_sizing.rb
af484e8b5a adding explanatory comments
82e23b660b Merge remote-tracking branch 'origin/master' into acca_manual_s
1ac11a24d6 adding comment on apply_equipment_adjustments
698aaf46a3 Committing pseudo_code_heat_pump_sizing.txt to branch OS_ACCA_Man_S_update

git-subtree-dir: resources/hpxml-measures
git-subtree-split: c6435fab6ee6f9daed51afc24e39df3fe9bd454c
50c9c7d181 Unrelated code cleanup

git-subtree-dir: resources/hpxml-measures
git-subtree-split: 50c9c7d181fe5c7143479fd9051432ed4ec8e6c0
@shorowit shorowit self-assigned this Sep 18, 2024
@shorowit shorowit closed this Sep 20, 2024
@shorowit shorowit deleted the adp_bf_method_design_shr branch September 20, 2024 20:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant