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.

Sign up for GitHub

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

Run/euss #953

Draft
wants to merge 138 commits into
base: develop
Choose a base branch
from
Draft

Run/euss #953

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
138 commits
Select commit Hold shift + click to select a range
964711b
Stubbed out the EUSS project file
ekpresent Apr 27, 2022
63b1503
Early work on project file
ekpresent Apr 27, 2022
e70b395
Add 30% ACH50 reduction to options_lookup
ekpresent Apr 27, 2022
530afb2
More early work on the project file
ekpresent Apr 27, 2022
878e785
Add R-10 interior foundation wall insulation option to options_lookup
ekpresent Apr 28, 2022
7230e5e
Add MSHP SEER 15 9 HSPF to options_lookup
ekpresent Apr 28, 2022
9748d0e
Add ASHP SEER 24, HSPF 13 to options lookup
ekpresent Apr 28, 2022
e9898df
More early work on the project file
ekpresent Apr 28, 2022
0618ab3
More early project file work
ekpresent Apr 29, 2022
32534d9
Put in apply logic for dual fuel upgrade
ekpresent Apr 29, 2022
3319282
More project file apply logic
ekpresent Apr 29, 2022
ca643c6
Merge remote-tracking branch 'origin/develop' into euss
afontani May 2, 2022
5627853
Change timestep
ejhw May 2, 2022
b8bf77b
Update EUSS-project-file.yml
ejhw May 3, 2022
6b7acac
Add cost for drill and fill
ejhw May 3, 2022
0caef9c
Added cooking range parts to project file
ekpresent May 5, 2022
da6ba63
Add HPWH options and apply logic to project file
ekpresent May 5, 2022
350dd30
Costs, lifetimes, and organizational edits to project file
ekpresent May 6, 2022
e34757e
Removed some resolved flags and questions from project file
ekpresent May 6, 2022
ecb85b4
Project file fixes from Eric's QC
ekpresent May 9, 2022
7079cac
Merge remote-tracking branch 'origin/develop' into euss
afontani May 11, 2022
9135139
Fix indent errors
ejhw May 12, 2022
aa25de0
heat pump commit
whiphi92 May 12, 2022
de4177e
Merge branch 'euss' of https://github.com/NREL/resstock into euss
whiphi92 May 12, 2022
0a33f7d
Remove unvented comment
ejhw May 12, 2022
26434a0
High Eff Heat Pump
whiphi92 May 12, 2022
e85fe23
heat pump eff
whiphi92 May 12, 2022
26594c5
Insulation ceiling updates
ejhw May 12, 2022
b215df3
Merge branch 'euss' of https://github.com/NREL/resstock into euss
ejhw May 12, 2022
f1d716b
Foundation wall costs
ejhw May 13, 2022
1377677
Split out cost for heated basements
ejhw May 13, 2022
562b4f7
Range lifetime
ejhw May 13, 2022
a18fb46
Insulation wall lifetime
ejhw May 13, 2022
86e9c53
Update range costs
ejhw May 13, 2022
8e186c8
Update range cost comment
ejhw May 13, 2022
f095b7d
Dryer costs
ejhw May 13, 2022
47dae41
HPWH costs
ejhw May 13, 2022
6fcd516
Add reference case from abctypol
ejhw May 13, 2022
a74f580
Dropped Phil's heat pump upgrades into project file verbatim
ekpresent May 13, 2022
8ddc280
Update envelope lifetimes
ejhw May 13, 2022
8cae4dc
More HPWH costs
ejhw May 13, 2022
d47b817
Missing ref *
ejhw May 13, 2022
515f74c
Change cooling from None to HP
ejhw May 16, 2022
83d69df
Try apply logic alias
ejhw May 16, 2022
8f605d0
Move HVAC Cooling Efficiency|Heat Pump
ejhw May 16, 2022
d7bbb78
Pkg names
ejhw May 16, 2022
527d98c
Rem unnecessary blocks
ejhw May 16, 2022
ac95b32
Fix logic
ejhw May 16, 2022
27280f5
Simplify dual fuel section
ejhw May 16, 2022
bd00a0f
Finished putting the current HP logic into main project file
ekpresent May 16, 2022
6860c19
Merge branch 'euss' of https://github.com/NREL/resstock into euss
ekpresent May 16, 2022
eabdbd0
Rem "dual" from sec. htg strings
ejhw May 16, 2022
4cfbbc3
Merge branch 'euss' of https://github.com/NREL/resstock into euss
ejhw May 16, 2022
5cc3e0c
Update option names
ejhw May 16, 2022
9c93d5f
Updates with Phil
ejhw May 16, 2022
c9ee2ac
better labels in project file
ekpresent May 16, 2022
d95776e
Merge branch 'euss' of https://github.com/NREL/resstock into euss
ekpresent May 16, 2022
8d60099
Update HP costs
ejhw May 16, 2022
f0282a1
Newline fixes
ejhw May 16, 2022
99252fd
Fix yml syntax
ejhw May 16, 2022
133258a
minor yml changes, trying out commit from VS code
whiphi92 May 16, 2022
5161f3e
some options lookup changes [skip ci]
whiphi92 May 17, 2022
973cd72
updated electric backup yml + options [skip ci]
whiphi92 May 17, 2022
fece0cd
options lookup electric back up changes [skip ci]
whiphi92 May 17, 2022
9a444d3
Small edits to project file
ekpresent May 17, 2022
d4d8497
quick and dirty fixes due to validator complaints
ekpresent May 17, 2022
6167be7
small project file fix
ekpresent May 17, 2022
4dd9508
minor options_lookup addition
ekpresent May 17, 2022
52d863d
changes to yml and options lookup [skip ci]
whiphi92 May 17, 2022
0c2421d
tweaked heat pump yml [skip ci]
whiphi92 May 17, 2022
5cc0132
Pkg name [skip ci]
ejhw May 17, 2022
09fff69
Merge branch 'euss-hp-updates' of https://github.com/NREL/resstock in…
ejhw May 17, 2022
1c865d7
final yml+options changes before testing [skip ci]
whiphi92 May 17, 2022
2dbee42
minor formatting change [skip ci]
whiphi92 May 17, 2022
c6117a4
cost multiplier correction [skip ci]
whiphi92 May 17, 2022
63cd3f4
fix fuel type error and fixed options [skip ci]
whiphi92 May 18, 2022
7328d57
options_lookup mismatch fix [skip ci]
whiphi92 May 18, 2022
7544358
minor fixes [skip ci]
whiphi92 May 18, 2022
0da2e58
tweaked shared heating options [skip ci]
whiphi92 May 18, 2022
7c16a64
minor fixes to project file
ekpresent May 19, 2022
0defd24
Work on integrating the heat pump revisions into the project file
ekpresent May 19, 2022
718586c
Add partitioning and simulation_output_report
rajeee May 19, 2022
c3efed8
Project file HP apply logic revisions
ekpresent May 19, 2022
e0ee9c0
Cleaning up the format and apply logic on the dual-fuel upgrade
ekpresent May 20, 2022
2cb5ee7
change yml refs to be more pleasant [skip ci]
whiphi92 May 20, 2022
8d4f17e
shared heating logic to cooling eff [skip ci]
whiphi92 May 20, 2022
ff5857a
added heat pump options to packages containing heat pumps in project …
ekpresent May 20, 2022
b112b47
Merge branch 'euss-hp-updates' of https://github.com/NREL/resstock in…
ekpresent May 20, 2022
3bbb070
comment out unused refs [skip ci]
whiphi92 May 20, 2022
8385c3e
fixed some project file bugs found by validator, more remain
ekpresent May 20, 2022
2c79d53
fixed very minor merge conflict
ekpresent May 20, 2022
afa4803
project file as submitted for 2nd test run at n=10k
ekpresent May 20, 2022
084f054
fixed partitioning and timesteps for test02
ekpresent May 20, 2022
f0f315c
fixed ndatapoints
ekpresent May 20, 2022
42a9653
now actually 10k
ekpresent May 20, 2022
e254d69
Fix logic errors
rajeee Jun 8, 2022
127a405
Merge branch 'run/euss' into euss-hp-updates
rajeee Jun 15, 2022
d28158a
remove redundant yaml
rajeee Jun 15, 2022
f755e37
Merge pull request #933 from NREL/euss-hp-updates
rajeee Jun 15, 2022
9e985d5
Merge branch 'develop' into run/euss
rajeee Jun 16, 2022
3796739
adjustments to yml and lookup [skip ci]
whiphi92 Jun 16, 2022
127197d
add outputs for temp [skip ci]
whiphi92 Jun 16, 2022
f8982c1
Merge pull request #941 from NREL/dual-fuel-check
rajeee Jun 17, 2022
ab670dc
project file for run full1-2018
ekpresent Jun 17, 2022
3e33f04
project file as used for full1 2012
ekpresent Jun 17, 2022
99531e4
project file used for 2018 full 20220620
ekpresent Jun 20, 2022
18cc5d6
project file used for TMY3 run full 20220620
ekpresent Jun 20, 2022
9ab8292
project file as used for TMY3 run full 20220622
ekpresent Jun 22, 2022
52408a4
split main project file and testing project file
ekpresent Jul 1, 2022
b3a5abd
updated secondary boiler input [skip ci]
whiphi92 Jul 5, 2022
57448b3
Merge branch 'develop' of https://github.com/NREL/resstock into run/e…
shorowit Jul 6, 2022
3c3ee73
create n=500 project file for testing
ekpresent Jul 6, 2022
091a8ca
add 10k test yaml
rajeee Jul 7, 2022
c38056c
Squashed 'resources/hpxml-measures/' changes from 37d7a7ba05..c7ed80f2da
shorowit Jul 8, 2022
e8e5d93
Merge commit 'c38056c084e70c7fa103e5023e13e1796747d0cc' into run/euss…
shorowit Jul 8, 2022
88e3130
Merge branch 'develop' of https://github.com/NREL/resstock into run/e…
shorowit Jul 8, 2022
203dab7
Merge branch 'develop' into run/euss
rajeee Jul 12, 2022
8edebc5
Merge branch 'run/euss' of https://github.com/NREL/resstock into run/…
shorowit Jul 12, 2022
3aacbb6
Merge pull request #952 from NREL/run/euss_emissions_bugfix
shorowit Jul 12, 2022
490327a
project file as used for uploadonly 2022-07-15
ekpresent Jul 15, 2022
9cb64f1
Merge branch 'weather_dump_bugfix' of https://github.com/NREL/resstoc…
shorowit Jul 19, 2022
7c31829
new project files for recent full and test runs
Aug 3, 2022
76c068d
Add emissions scenarios
afontani Aug 5, 2022
a3f4114
Add emission scenarios to the project yaml
afontani Aug 8, 2022
d5912bd
Update emissions (4 not 6 scenarios)
ekpresent Aug 26, 2022
e0d32f1
Measure package names update
ekpresent Aug 26, 2022
5da76f5
Final run
rajeee Aug 26, 2022
8495159
Final Run 2018
rajeee Sep 1, 2022
7389967
data/enumeration dictionaries [skip ci]
whiphi92 Sep 2, 2022
742b3a8
Merge branch 'run/euss' of https://github.com/NREL/resstock into run/…
whiphi92 Sep 2, 2022
b446948
updated dictionary [skip ci]
whiphi92 Sep 9, 2022
1c497ed
adding 2012/TMY3 ymls [skip ci]
whiphi92 Sep 9, 2022
1495857
changed years in ymls [skip ci]
whiphi92 Sep 9, 2022
0bdb6ef
Correct yml file update [skip ci]
whiphi92 Sep 9, 2022
70538bc
updated project files for each year [skip ci]
whiphi92 Sep 12, 2022
3c4cc1d
Updated data and enumeration dicts [skip ci]
whiphi92 Sep 15, 2022
904a062
updated yml files [skip ci]
Sep 28, 2022
4882824
conflict merge dicts [skip ci]
Sep 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
heat pump eff 
updating the correct yml and directory cleanup
  • Loading branch information
@whiphi92
whiphi92 committed May 12, 2022
commit e85fe2371dcfe59a0a8a375141ca1cb2d261e4ad
106 changes: 85 additions & 21 deletions EUSS-heat-pump-file.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
schema_version: '0.3'
buildstock_directory: ../ # Relative to this file or absolute
project_directory: project_national # Relative to buildstock_directory
output_directory: C:/Users/pwhite2/Documents/dual_fuel
output_directory: C:/Users/pwhite2/Documents/dual_fuel_min_high_eff
# weather_files_url: https://data.nrel.gov/system/files/156/BuildStock_TMY3_FIPS.zip
weather_files_path: C:/Users/pwhite2/Documents/weather/BuildStock_2018_FIPS.zip

Expand Down Expand Up @@ -126,26 +126,90 @@ upgrades:
- not: HVAC Heating Efficiency|MSHP, SEER 25, 12.7 HSPF
- not: HVAC Heating Efficiency|MSHP, SEER 33, 13.3 HSPF

# - upgrade_name: high efficiency heat pumps
# options:
# - option: HVAC Heating Efficiency|ASHP, SEER 15, 9.0 HSPF, EUSS
# apply_logic:
# or:
# - not: HVAC Heating Efficiency|ASHP, SEER 16, 9.0 HSPF
# - not: HVAC Heating Efficiency|ASHP, SEER 17, 8.7 HSPF
# - not: HVAC Heating Efficiency|ASHP, SEER 18, 9.3 HSPF
# - not: HVAC Heating Efficiency|ASHP, SEER 22, 10 HSPF
# - not: HVAC Heating Efficiency|ASHP, SEER 24, 13 HSPF
# - not: HVAC Heating Efficiency|ASHP, SEER 15, 9.0 HSPF
# - option: HVAC Heating Efficiency|MSHP, SEER 15, 9.0 HSPF, EUSS
# apply_logic:
# or:
# - not: HVAC Heating Efficiency|MSHP, SEER 15, 9.0 HSPF
# - not: HVAC Heating Efficiency|MSHP, SEER 29.3, 14 HSPF
# - not: HVAC Heating Efficiency|MSHP, SEER 18.0, 9.6 HSPF, 60% Conditioned
# - not: HVAC Heating Efficiency|MSHP, SEER 17, 9.5 HSPF
# - not: HVAC Heating Efficiency|MSHP, SEER 25, 12.7 HSPF
# - not: HVAC Heating Efficiency|MSHP, SEER 33, 13.3 HSPF

- upgrade_name: high efficiency heat pumps
# ASHP
options:
- option: HVAC Heating Efficiency|MSHP, SEER 24, 13 HSPF, EUSS
apply_logic:
- or:
- and:
- HVAC Has Ducts|Yes
- HVAC Has Shared System|None
- and:
- HVAC Has Shared System|Heating Only
- HVAC Cooling Type|Central AC
- or:
- not: HVAC Heating Efficiency|ASHP, SEER 16, 9.0 HSPF
- not: HVAC Heating Efficiency|ASHP, SEER 17, 8.7 HSPF
- not: HVAC Heating Efficiency|ASHP, SEER 18, 9.3 HSPF
- not: HVAC Heating Efficiency|ASHP, SEER 22, 10 HSPF
- not: HVAC Heating Efficiency|ASHP, SEER 24, 13 HSPF
- not: HVAC Heating Efficiency|ASHP, SEER 15, 9.0 HSPF
- option: HVAC Cooling Efficiency|None
apply_logic:
- or:
- and:
- HVAC Has Ducts|Yes
- HVAC Has Shared System|None
- and:
- HVAC Has Shared System|Heating Only
- HVAC Cooling Type|Central AC
- or:
- not: HVAC Heating Efficiency|ASHP, SEER 16, 9.0 HSPF
- not: HVAC Heating Efficiency|ASHP, SEER 17, 8.7 HSPF
- not: HVAC Heating Efficiency|ASHP, SEER 18, 9.3 HSPF
- not: HVAC Heating Efficiency|ASHP, SEER 22, 10 HSPF
- not: HVAC Heating Efficiency|ASHP, SEER 24, 13 HSPF
- not: HVAC Heating Efficiency|ASHP, SEER 15, 9.0 HSPF
- option: HVAC Heating Type|Ducted Heat Pump
apply_logic:
- or:
- and:
- HVAC Has Ducts|Yes
- HVAC Has Shared System|None
- and:
- HVAC Has Shared System|Heating Only
- HVAC Cooling Type|Central AC
- or:
- not: HVAC Heating Efficiency|ASHP, SEER 16, 9.0 HSPF
- not: HVAC Heating Efficiency|ASHP, SEER 17, 8.7 HSPF
- not: HVAC Heating Efficiency|ASHP, SEER 18, 9.3 HSPF
- not: HVAC Heating Efficiency|ASHP, SEER 22, 10 HSPF
- not: HVAC Heating Efficiency|ASHP, SEER 24, 13 HSPF
- not: HVAC Heating Efficiency|ASHP, SEER 15, 9.0 HSPF
# MSHP
- option: HVAC Heating Efficiency|MSHP, SEER 29.3, 14 HSPF, EUSS
apply_logic:
- not: HVAC Cooling Type|Central AC
- or:
- HVAC Has Ducts|No
- HVAC Has Shared System|Heating Only
- HVAC Has Shared System|Cooling Only
- HVAC Has Shared System|Heating and Cooling
- or:
- not: HVAC Heating Efficiency|MSHP, SEER 15, 9.0 HSPF
- not: HVAC Heating Efficiency|MSHP, SEER 29.3, 14 HSPF
- not: HVAC Heating Efficiency|MSHP, SEER 18.0, 9.6 HSPF, 60% Conditioned
- not: HVAC Heating Efficiency|MSHP, SEER 17, 9.5 HSPF
- not: HVAC Heating Efficiency|MSHP, SEER 25, 12.7 HSPF
- not: HVAC Heating Efficiency|MSHP, SEER 33, 13.3 HSPF
- option: HVAC Cooling Efficiency|None
apply_logic:
- not: HVAC Cooling Type|Central AC
- or:
- HVAC Has Ducts|No
- HVAC Has Shared System|Heating Only
- HVAC Has Shared System|Cooling Only
- HVAC Has Shared System|Heating and Cooling
- or:
- not: HVAC Heating Efficiency|MSHP, SEER 15, 9.0 HSPF
- not: HVAC Heating Efficiency|MSHP, SEER 29.3, 14 HSPF
- not: HVAC Heating Efficiency|MSHP, SEER 18.0, 9.6 HSPF, 60% Conditioned
- not: HVAC Heating Efficiency|MSHP, SEER 17, 9.5 HSPF
- not: HVAC Heating Efficiency|MSHP, SEER 25, 12.7 HSPF
- not: HVAC Heating Efficiency|MSHP, SEER 33, 13.3 HSPF




Expand Down
Loading