-
Notifications
You must be signed in to change notification settings - Fork 9
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
EUSS measure package tests #119
Merged
Merged
Changes from all commits
Commits
Show all changes
470 commits
Select commit
Hold shift + click to select a range
2b8daaf
using OS standards fan curve and fan efficiencies
ed349c1
Merge remote-tracking branch 'origin/wenyi/updateKaleido' into euss_k…
07341e6
Merge branch 'main' into euss_kitchen_equip
4197585
incremental updates to tests
74a0d97
updates to measure for 100% max airflow and to use standards method for
b270e05
screening for VAV terminals
f04cdce
updates for new economizer implementation
6a85291
updating performance data with Lennox xion products
JanghyunJK 10d6c33
rated cop regression update with lennox xion products
JanghyunJK 8d1ed22
adding/applying low stage eir performances from lennox xion products
JanghyunJK f047e10
nil error fix
JanghyunJK 31b6d54
Merge branch 'main' into aallen/nighttime_oa_control
8694d05
fixing incomplete sample space
JanghyunJK 67e1f47
fix for applying high/low eir performances
JanghyunJK dd2ece8
updates to measure applicability
8acb6f1
updating modeler description
dcc511b
corrections to measure applicability criteria
bada6be
corrections to handling of non-unitary systems
aae0e58
updates to measure
ef198d7
updates to name of new schedule
8b468b2
updates to measure to address review comments
5299246
adding another DOAS check
df84dec
implementing updated economizer approach
cb69084
Merge remote-tracking branch 'origin/main' into aallen/nighttime_oa_c…
6fc0cd3
updates to tsvs
16d0c57
updates to tsvs and measure comments
3efffcd
tsvs
f6c28dd
updates to screen out psz with gas boiler systems
d25ce94
finish tests
78d885e
Merge branch 'main' into origin/ccaradon/euss_hprtu_hr
483a8d9
Update options lookup files
9a1b1c9
Remove OA autosize bug
0ff1245
both options lookup updates
JanghyunJK 324e424
both options lookup updates
JanghyunJK 8c9489d
re-including stripmall
JanghyunJK d524f62
setting upsizing allowance default to 0%
JanghyunJK 4e78b0c
adding empty sql check
JanghyunJK a9fcd5d
typos
JanghyunJK e5def76
Merge branch 'main' into jk/vrf-25pct-sizing-allowance
JanghyunJK 52a1e18
Merge branch 'main' into jk/hprtu-std-performance
JanghyunJK 22682e8
std perf description added
JanghyunJK eb3e581
Update measure.rb
JanghyunJK aff4d29
using os convert method
JanghyunJK 29e886b
misc typo
JanghyunJK 3cc9278
refactor output var section
JanghyunJK df38f6c
changing puts to registerInfo
JanghyunJK 61314b4
Merge branch 'main' into jk/economzier-final-ems-merge
JanghyunJK 461cf37
misc
JanghyunJK 8ef88bf
refactor output var section
JanghyunJK 1dc295f
sql empty check revised
JanghyunJK 0a647cd
fix flow rate object error
ae56b5b
delete empty file
fc37ed5
refactoring for checking min oa rates
JanghyunJK 338f814
Remove baseboard error. Remove autosize of OA.
f8b4b7f
Merge branch 'main' into ccaradon/hp_boiler_fix
111725a
Merge branch 'main' into mprapros/euss_gto_measures
0ab194b
Update comstock_measure_comparison.py
000531e
Merge branch 'main' into jx/demand-flexibility
JieXiong9119 2ce8c0a
Merge branch 'main' into origin/ccaradon/euss_hprtu_hr
0f9c25c
measure updates
014a072
Merge remote-tracking branch 'origin/jk/economzier-final-ems-merge' i…
34e6a4a
removing apply measure arg
JanghyunJK 425d724
Merge branch 'jk/hprtu-std-performance' into origin/ccaradon/euss_hpr…
4601de2
move econ and dcv out of loop
174e9fa
remove HR from options lookup
b4f94f9
update applicability for dcv and econ
87b0b2e
updates to measure to screen out hospitals
af47885
updates to screeen out hospitals
da55eb3
updates to measure
68f5615
updates to measure based on testing
9fa2e5c
Merge branch 'main' into jk/economzier-final-ems-merge
JanghyunJK 36feb1a
adding ems friendly name
JanghyunJK 9b39a38
Merge remote-tracking branch 'origin/jk/economzier-final-ems-merge' i…
42b13f9
fix VAV applicability and pump settings
517cf46
change ground pump settings
23ac0ea
improving DCV screening
944c623
ems friendly for all vars
JanghyunJK 9cd0149
Clean up measure code
bca2e95
updates to advanced rtu measure to reifne measure applicability
ba805d8
updates to measure
12c8189
correction to typo
938d826
Clean up print statements; revise staging modification requires to en…
7c3db33
Update threshold for removing stage
407c58c
test updates
5ab6806
test models
5c7a2ad
Merge remote-tracking branch 'origin/jk/hprtu-std-performance' into e…
a63c10c
making correction
ebbd76a
uncommenting method
c97d539
Merge remote-tracking branch 'origin/jk/economzier-final-ems-merge' i…
629a377
Merge remote-tracking branch 'origin/ccaradon/hp_boiler_fix' into eus…
2d2c813
modifying how fan airflow rates are set
ca845e3
correcting typo
d7c8fa0
getting rid of commented out code
93a324b
Fix to ensure there is always a speed 3; clean up some print statements
7343fae
Remove redundant options; remove economizer defaults
51f56fc
Merge branch 'main' into origin/ccaradon/euss_hprtu_2
51793fb
update measure
JieXiong9119 e190524
updates to fan motor efficiency
a24cc62
update measure
JieXiong9119 17ae599
clean test models
JieXiong9119 976b896
Merge branch 'main' into euss_kitchen_equip
a0d73cd
add return true
5a2eeda
Update measure test and deprecated method.
2df268f
Fix tests; update ERV logic to match ERV measure
269f29b
Merge branch 'main' into origin/ccaradon/euss_hprtu_2
478f4a4
clean up print statements
39b79f6
Merge remote-tracking branch 'origin/jk/economzier-final-ems-merge' i…
d4778e6
console measure updates
ee57c77
update sensitivity report measure
JieXiong9119 905df3c
correcting dcv implementation
5d7ffcc
Merge branch 'mprapros/euss_gto_measures' of https://github.com/NREL/…
3fff15c
Merge remote-tracking branch 'origin/rhorsey/bsb-23-10-upgrade' into …
2269706
options lookup fix for kestrel
67d5e2a
Update dispatch_schedule_generation.rb
JieXiong9119 7932215
corrections to dcv implementation
b9d1149
updates to screening unapplicable system types
5d59ac1
Update qoi_report measure
JieXiong9119 9dc666a
correction to old measure name
07e8330
Merge remote-tracking branch 'origin/jk/economzier-final-ems-merge' i…
af4927a
incorporating economizer ems updates
adae583
Merge branch 'main' into mprapros/euss_gto_measures
a4225ff
update qoi_report measure and supporting measure
JieXiong9119 703e9fc
Merge branch 'main' into origin/ccaradon/euss_hprtu_2
ChristopherCaradonna 4a94742
update qoi report var name
JieXiong9119 e0ec151
add catch for PVAV or VAV air loops with one thermal zone
587e242
Merge branch 'mprapros/euss_gto_measures' of https://github.com/NREL/…
7a9094a
add return true and fix indentation
544a854
updates to measure applicability
c9ca546
Merge branch 'mprapros/euss_gto_measures' of https://github.com/NREL/…
3b81417
updates to measure
01e0f90
Update comstock_column_definitions.csv
JieXiong9119 71f7904
updates to xml
d4bd3af
updates to screen out evaporative coolers
cacc583
Merge branch 'main' into origin/ccaradon/euss_hprtu_2
ChristopherCaradonna e552660
updates to measure
69c0b2b
unit test draft
JanghyunJK 2265737
updates to measure applicability
25deaed
updates to comments
7f61346
updates to measure
4422eff
Update comstock_column_definitions
JieXiong9119 24cd3a0
exclude some zones from getting GHP and add baseboards
708755f
Merge branch 'main' into jk/vrf-25pct-sizing-allowance
JanghyunJK 74865e9
Merge remote-tracking branch 'origin/jk/economizer-damper-fault-fix' …
a4d58d4
first final draft for unit testing for requested oa
JanghyunJK 8fd1ca9
remove old PVAV EMS sensors
45fddfc
double borefield size to prevent GHEDesigner errors
a54df84
Merge branch 'main' into jk/economzier-final-ems-merge
JanghyunJK 3f91d65
unit test cleaning
JanghyunJK b988689
Update measure.xml
JanghyunJK a4d1411
fix comments
4f50559
Merge branch 'main' into jk/hprtu-std-performance
JanghyunJK 47f6b62
update options_lookups.tsv
JieXiong9119 1cd786e
Merge branch 'main' into jx/demand-flexibility
JieXiong9119 abc2841
Remove return air functionality and replace with effectivness modifier.
d79d60c
Merge branch 'main' into origin/ccaradon/euss_hprtu_2
ChristopherCaradonna 79d000d
Merge branch 'main' into jk/economzier-final-ems-merge
JanghyunJK e11e1ef
Merge branch 'main' into jk/vrf-25pct-sizing-allowance
JanghyunJK e758991
update options_lookup.tsv
JieXiong9119 aa9c3c6
baseboard lookup fix
978dec5
additional logic for unconditioned zones or zones that get baseboards
fa630a5
Update hvac_economizer_test.rb
JanghyunJK 0bd5701
Merge branch 'origin/ccaradon/euss_hprtu_2' into euss_package_testing
adf7ee7
Merge remote-tracking branch 'origin/jk/economzier-final-ems-merge' i…
6a597ba
Merge branch 'main' into jx/demand-flexibility
JieXiong9119 bd7ca01
correction to applicability criteria
d604301
updates to test
857aba7
updates to test
e39327c
fix related to min oa flow rate
JanghyunJK c444e15
fixing test to check against oa mass flow rate
JanghyunJK 1829950
adding outpatient test model that includes discrepancy between actual…
JanghyunJK 584e2dc
Update measure.xml
JanghyunJK 2ea5dfe
fix for dummy var naming
JanghyunJK 23b0f5b
Merge branch 'main' into mprapros/euss_gto_measures
eca1e8f
Merge remote-tracking branch 'origin/jk/hprtu-std-performance' into e…
dfc064c
Revert "double borefield size to prevent GHEDesigner errors"
1fea60a
do not skip air loops with ERVs
afec95f
measure fixes
9bb5deb
measure fixes
aacd511
Revert "Revert "double borefield size to prevent GHEDesigner errors""
1bda766
Merge remote-tracking branch 'origin/jk/economzier-final-ems-merge' i…
28bd9f9
apply nighttime var sch for ems actuating
JanghyunJK 037f4a1
more description
JanghyunJK fe5f9dc
typo
JanghyunJK 34f00aa
change borefield size back to 300
5530361
corrections to indents
1b907e1
cleaning up indents and comments
51f134c
clenaing up indents and comments
62ea7d6
Update hvac_economizer_test.rb
JanghyunJK f51d21a
test models 3.7 update
JanghyunJK 0363156
updates to check for min OA flow rates
e127e79
loosening min oa rate calc flag
JanghyunJK 9822d49
Update measure.xml
JanghyunJK 1c1431d
change ghedeisgner failure to not applicable
77f4bce
updates to measure and measure tests
c54ab30
updates to measure
073d670
Fix postprocessing bug
ee68ee4
Merge remote-tracking branch 'origin/ccaradon/utility_postprocessing_…
d59e0ea
delete extra cooling coil causing issues with Std. Perf option
f3e3042
Merge branch 'origin/ccaradon/euss_hprtu_2' into euss_package_testing
ea0b0f5
remove model output folders
JanghyunJK 14d2dfd
reverting test models
JanghyunJK ce459e8
update test and clean
JanghyunJK 346cafa
Update applicability check
JieXiong9119 010ee12
Merge branch 'main' into jx/demand-flexibility
JieXiong9119 399b9bb
adding nighttime output var
JanghyunJK 815294a
Update measure.xml
JanghyunJK 5591eef
Update hvac_economizer_test.rb
JanghyunJK 834a85b
Update Warehouse_economizer_test.osm
JanghyunJK 055122e
apply ems to only applicable economizers
JanghyunJK 4b69f26
update measure
JieXiong9119 dc2034e
Merge branch 'main' into euss_package_testing
8455965
Merge branch 'aallen/advanced_rtu' into euss_package_testing
9c83130
Merge branch 'aallen/nighttime_oa_control' into euss_package_testing
bd50f36
Merge branch 'mprapros/euss_gto_measures' into euss_package_testing
1edce35
Merge remote-tracking branch 'origin/euss_kitchen_equip' into euss_pa…
4664a68
Merge branch 'jk/economzier-final-ems-merge' into euss_package_testing
30bc807
updates to TSVs
64b305f
Merge branch 'aallen/advanced_rtu' into euss_package_testing
b0bb2a3
update measure
JieXiong9119 d73dd46
adding if for zone exhaust fan
JanghyunJK 372b0c3
Update measure.xml
JanghyunJK 72a72cf
correcting mistake in check for initialization
99eb6f1
Merge branch 'aallen/nighttime_oa_control' into aallen/advanced_rtu
344e779
merging changes from unoccupied OA controls branch
1ac0210
updates to measure.xml
0ac1cb6
removing old test file
efc64b9
cleaning up comments
26ee03f
updates to measure.xml
bb67614
merge remote-tracking branch 'origin/aallen/advanced_rtu' into euss_p…
e9a516d
adding applicability to exclude evap cooler
JanghyunJK a6e7d3e
updates to measure.xml
ab606b2
removing added puts statement
d9c5641
Merge branch 'aallen/advanced_rtu' into euss_package_testing
9d930ed
measure fixes to accommodate gas unit heaters in warehouses
4928de7
updates to measure.xml
864f5b6
Merge branch 'mprapros/euss_gto_measures' into euss_package_testing
25649ce
Merge branch 'jk/economzier-final-ems-merge' into euss_package_testing
99e71d4
update dispatch_schedule_generation.rb
JieXiong9119 50b6c9a
fix borehole depth reporting
e6a11f1
console measure applicability fix
520db9c
Merge branch 'mprapros/euss_gto_measures' into euss_package_testing
06eb7c7
clean up
67024b3
Merge branch 'ccaradon/fix_utility_bill_post_proc' into euss_package_…
72dde61
update options for load shift
JieXiong9119 5360c5a
Merge branch 'jk/vrf-25pct-sizing-allowance' into euss_package_testing
7900ea1
Update options_lookup.tsv
96ee5e7
Merge remote-tracking branch 'origin/jx/demand-flexibility' into euss…
7b014b3
update upgrade measure naming
aece9d2
update options_lookup.tsv
JieXiong9119 b1e5dbe
Merge remote-tracking branch 'origin/jx/demand-flexibility' into euss…
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Get rid of "puts" statements throughout.