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

Jump to bottom

Facade upgrades #617

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

Facade upgrades #617

wants to merge 92 commits into from

Commits on Jun 4, 2021

  1. Started work on YAMLs

    @ekpresent
    ekpresent committed Jun 4, 2021
    Configuration menu
    Copy the full SHA
    f4f6045 View commit details
    Browse the repository at this point in the history

  2. Minor yaml edits

    @ekpresent
    ekpresent committed Jun 4, 2021
    Configuration menu
    Copy the full SHA
    3b54b74 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2021

  1. Started adding the options to the primary project file

    @ekpresent
    ekpresent committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    e4802a6 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2021

  1. working option reference test project file

    @ekpresent
    ekpresent committed Jun 8, 2021
    Configuration menu
    Copy the full SHA
    4b0ae33 View commit details
    Browse the repository at this point in the history

  2. Added ACH50 reductions to options_lookup

    @ekpresent
    ekpresent committed Jun 8, 2021
    Configuration menu
    Copy the full SHA
    9a660f7 View commit details
    Browse the repository at this point in the history

  3. Started adding the ACH50 reductions to the project file

    @ekpresent
    ekpresent committed Jun 8, 2021
    Configuration menu
    Copy the full SHA
    0a36c04 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2021

  1. More YAML work

    @ekpresent
    ekpresent committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    557f127 View commit details
    Browse the repository at this point in the history

  2. YAML changes, possibly junk

    @ekpresent
    ekpresent committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    10db831 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'facade-upgrades' of github.com:NREL/resstock into facad… 

    …e-upgrades

Conflicts:
	facades-project-file.yml
    @ekpresent
    ekpresent committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    590030c View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2021

  1. A few changes to apply_logic

    @ekpresent
    ekpresent committed Jun 11, 2021
    Configuration menu
    Copy the full SHA
    46db0cb View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2021

  1. Copying tsv updates from resstock-estimation

    @afontani
    afontani committed Jun 15, 2021
    Configuration menu
    Copy the full SHA
    2a980b7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'windows_tsv' into facade-upgrades

    @afontani
    afontani committed Jun 15, 2021
    Configuration menu
    Copy the full SHA
    2809c58 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2021

  1. Merging in tsv updates from both the windows_tsv and the wall_type_ts… 

    …v_maker_res branches
    @afontani
    afontani committed Jun 17, 2021
    Configuration menu
    Copy the full SHA
    ae09528 View commit details
    Browse the repository at this point in the history

  2. Update sample_probabilities

    @afontani
    afontani committed Jun 17, 2021
    Configuration menu
    Copy the full SHA
    182c927 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/new_wall_type_tsv_from_lightbox' into facade-up… 

    …grades
    @afontani
    afontani committed Jun 17, 2021
    Configuration menu
    Copy the full SHA
    002d843 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2021

  1. Merge remote-tracking branch 'origin/develop' into facade-upgrades

    @afontani
    afontani committed Jun 18, 2021
    Configuration menu
    Copy the full SHA
    629952c View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2021

  1. Merge remote-tracking branch 'origin/windows_tsv' into facade-upgrades

    @afontani
    afontani committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    eefd212 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/develop' into facade-upgrades

    @afontani
    afontani committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    923f01e View commit details
    Browse the repository at this point in the history

  3. Latest results.

    GitHub Action committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    72756a4 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/windows_tsv' into facade-upgrades

    @afontani
    afontani committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    f016c8d View commit details
    Browse the repository at this point in the history

  5. Latest results.

    GitHub Action committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    d081f4c View commit details
    Browse the repository at this point in the history

  6. Update Windows option names in testing and doc files

    @afontani
    afontani committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    95c2d40 View commit details
    Browse the repository at this point in the history

  7. Latest results.

    GitHub Action committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    2344400 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2021

  1. Add facade exterior insulation options to options_lookup 

    Added R-6.5 (1" polyiso) and R-13 (2" polyiso) options to  wall insulation options that are in baseline and <R-19
    @ekpresent
    ekpresent committed Jun 24, 2021
    Configuration menu
    Copy the full SHA
    da418d9 View commit details
    Browse the repository at this point in the history

  2. Full set of insulation upgrade definitions into project file

    @ekpresent
    ekpresent committed Jun 24, 2021
    Configuration menu
    Copy the full SHA
    3236edf View commit details
    Browse the repository at this point in the history

  3. Facades project file: exterior finish options filled in

    @ekpresent
    ekpresent committed Jun 24, 2021
    Configuration menu
    Copy the full SHA
    3b153bf View commit details
    Browse the repository at this point in the history

  4. Finished window (except low SHGC) and infiltration options

    @ekpresent
    ekpresent committed Jun 24, 2021
    Configuration menu
    Copy the full SHA
    46ceee4 View commit details
    Browse the repository at this point in the history

  5. grouped options into upgrades in project file for test runs

    @ekpresent
    ekpresent committed Jun 24, 2021
    Configuration menu
    Copy the full SHA
    be9d9fa View commit details
    Browse the repository at this point in the history

  6. Project file syntax fixes

    @ekpresent
    ekpresent committed Jun 24, 2021
    Configuration menu
    Copy the full SHA
    279459d View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2021

  1. Remove "%" from keys in YAML file

    @ekpresent
    ekpresent committed Jun 25, 2021
    Configuration menu
    Copy the full SHA
    e9cf07c View commit details
    Browse the repository at this point in the history

  2. Updated buildstock_directory location in project file

    @ekpresent
    ekpresent committed Jun 25, 2021
    Configuration menu
    Copy the full SHA
    b15f54e View commit details
    Browse the repository at this point in the history

  3. Fixing YAML-options_lookup inconsistencies

    @ekpresent
    ekpresent committed Jun 25, 2021
    Configuration menu
    Copy the full SHA
    f2ac5b7 View commit details
    Browse the repository at this point in the history

  4. Add solar screen windows options to options_lookup.tsv

    @ekpresent
    ekpresent committed Jun 25, 2021
    Configuration menu
    Copy the full SHA
    45bc98b View commit details
    Browse the repository at this point in the history

  5. Saved the run file for the first mini run

    @ekpresent
    ekpresent committed Jun 25, 2021
    Configuration menu
    Copy the full SHA
    be9ef2d View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2021

  1. Added the window shading options to the project file 

    This is now a list of all options, once.
    @ekpresent
    ekpresent committed Jun 26, 2021
    Configuration menu
    Copy the full SHA
    a1c659f View commit details
    Browse the repository at this point in the history

  2. Arranged upgrades into agreed-upon packages in project file

    @ekpresent
    ekpresent committed Jun 26, 2021
    Configuration menu
    Copy the full SHA
    6c6d6fd View commit details
    Browse the repository at this point in the history

  3. Switched to TMY3 weather

    @ekpresent
    ekpresent committed Jun 26, 2021
    Configuration menu
    Copy the full SHA
    47ebf45 View commit details
    Browse the repository at this point in the history

  4. Fixed project file upgradable windows reference to first occurance

    @ekpresent
    ekpresent committed Jun 26, 2021
    Configuration menu
    Copy the full SHA
    add53dd View commit details
    Browse the repository at this point in the history

  5. Fixing small project file errors caught by YAML debugger

    @ekpresent
    ekpresent committed Jun 26, 2021
    Configuration menu
    Copy the full SHA
    12307d9 View commit details
    Browse the repository at this point in the history

  6. More small errors in project file fixed

    @ekpresent
    ekpresent committed Jun 26, 2021
    Configuration menu
    Copy the full SHA
    aa50c3f View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2021

  1. More small bug fixes in project file

    @ekpresent
    ekpresent committed Jun 28, 2021
    Configuration menu
    Copy the full SHA
    65fd678 View commit details
    Browse the repository at this point in the history

  2. Save successful test10No2 separately 

    This test ran just 10 buildings but included everything as intended to be in the full size run
    @ekpresent
    ekpresent committed Jun 28, 2021
    Configuration menu
    Copy the full SHA
    4c761d4 View commit details
    Browse the repository at this point in the history

  3. prepared project file for n=10k run

    @ekpresent
    ekpresent committed Jun 28, 2021
    Configuration menu
    Copy the full SHA
    9f68333 View commit details
    Browse the repository at this point in the history

  4. Changed NumApplyUpgradeOptions from 25 to 120 because there are at le… 

    …ast 97 in one upgrade
    @ekpresent
    ekpresent committed Jun 28, 2021
    Configuration menu
    Copy the full SHA
    e434aa7 View commit details
    Browse the repository at this point in the history

  5. Prepared project file for n=10 test with 120 options allowed per upgrade

    @ekpresent
    ekpresent committed Jun 28, 2021
    Configuration menu
    Copy the full SHA
    57b9550 View commit details
    Browse the repository at this point in the history

  6. Saved out test file that was successful in both baseline and upgrades… 

    …, prepped for med scale run
    @ekpresent
    ekpresent committed Jun 28, 2021
    Configuration menu
    Copy the full SHA
    b306b3e View commit details
    Browse the repository at this point in the history

  7. Added electric-only economic calculation files and one example results

    @ekpresent
    ekpresent committed Jun 28, 2021
    Configuration menu
    Copy the full SHA
    8c92a7a View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2021

  1. Adding some in-progress economic analysis work and correcting some er… 

    …rors in ACH50 options in options_lookup.tsv
    @ekpresent
    ekpresent committed Jun 30, 2021
    Configuration menu
    Copy the full SHA
    b8de291 View commit details
    Browse the repository at this point in the history

  2. Saved out test 10kNo2, and edited two incorrect options in the projec… 

    …t file
    @ekpresent
    ekpresent committed Jun 30, 2021
    Configuration menu
    Copy the full SHA
    492b936 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2021

  1. Adjusted econ analysis to use all fuels, ran on run10No3 (which has s… 

    …ome infiltration issues)
    @ekpresent
    ekpresent committed Jul 1, 2021
    Configuration menu
    Copy the full SHA
    d90cf41 View commit details
    Browse the repository at this point in the history

  2. Prepped YAML for microrun with Infiltration fixes

    @ekpresent
    ekpresent committed Jul 1, 2021
    Configuration menu
    Copy the full SHA
    90a4f77 View commit details
    Browse the repository at this point in the history

  3. Ran econ for run10No4, set up project file for run10kNo3 (infiltratio… 

    …n fixes)
    @ekpresent
    ekpresent committed Jul 1, 2021
    Configuration menu
    Copy the full SHA
    0453c46 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2021

  1. Standardized naming conventions in econ python file

    @ekpresent
    ekpresent committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    9d2dda8 View commit details
    Browse the repository at this point in the history

  2. Committing in-progress econ work 

    Currently all delta_allfuel_mmbtu values seem to be zero. That's a problem.
    @ekpresent
    ekpresent committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    2026eb6 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2021

  1. Updated econ work for review

    @ekpresent
    ekpresent committed Jul 6, 2021
    Configuration menu
    Copy the full SHA
    9d459bf View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2021

  1. Create facades-infiltration-test.yml

    @ekpresent
    ekpresent committed Jul 9, 2021
    Configuration menu
    Copy the full SHA
    d60bedb View commit details
    Browse the repository at this point in the history

  2. Fixing some typos in the infiltration test project file

    @ekpresent
    ekpresent committed Jul 9, 2021
    Configuration menu
    Copy the full SHA
    25d12db View commit details
    Browse the repository at this point in the history

  3. logic fixes in reference options in project file 

    This is pretty major. NOT was not working as I thought it was.
    @ekpresent
    ekpresent committed Jul 9, 2021
    Configuration menu
    Copy the full SHA
    04cc135 View commit details
    Browse the repository at this point in the history

  4. Redid the downselect and the vintage logic approach in project file

    @ekpresent
    ekpresent committed Jul 9, 2021
    Configuration menu
    Copy the full SHA
    ebd0b92 View commit details
    Browse the repository at this point in the history

  5. Update infiltration test yaml with corrected apply logic

    @ekpresent
    ekpresent committed Jul 9, 2021
    Configuration menu
    Copy the full SHA
    5237837 View commit details
    Browse the repository at this point in the history

  6. downselect logic fix

    @ekpresent
    ekpresent committed Jul 9, 2021
    Configuration menu
    Copy the full SHA
    5f82f59 View commit details
    Browse the repository at this point in the history

  7. Update downselect logic

    @afontani
    afontani committed Jul 9, 2021
    Configuration menu
    Copy the full SHA
    e64bb8b View commit details
    Browse the repository at this point in the history

  8. Prep to run infiltration_test a third time

    @ekpresent
    ekpresent committed Jul 9, 2021
    Configuration menu
    Copy the full SHA
    0e6de2e View commit details
    Browse the repository at this point in the history

  9. Fixed sampler in primary project file

    @ekpresent
    ekpresent committed Jul 9, 2021
    Configuration menu
    Copy the full SHA
    3a9f261 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2021

  1. Edits to Facades Economic Analysis.py based on aspeake's review

    @ekpresent
    ekpresent committed Jul 12, 2021
    Configuration menu
    Copy the full SHA
    8a2f016 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2021

  1. Merge remote-tracking branch 'origin/windows_tsv' into facade-upgrades

    @afontani
    afontani committed Jul 13, 2021
    Configuration menu
    Copy the full SHA
    db9aff8 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2021

  1. Latest results.

    GitHub Action committed Jul 14, 2021
    Configuration menu
    Copy the full SHA
    9a60a55 View commit details
    Browse the repository at this point in the history

  2. Facades Economic Analysis edits based on aspeake's review and pyarrow… 

    … needs
    @ekpresent
    ekpresent committed Jul 14, 2021
    Configuration menu
    Copy the full SHA
    ad43a91 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'facade-upgrades' of https://github.com/NREL/resstock in… 

    …to facade-upgrades
    @ekpresent
    ekpresent committed Jul 14, 2021
    Configuration menu
    Copy the full SHA
    f703db6 View commit details
    Browse the repository at this point in the history

  4. Removed clear storm options from infiltration apply_logic

    @ekpresent
    ekpresent committed Jul 14, 2021
    Configuration menu
    Copy the full SHA
    4697e8e View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2021

  1. Prepped project file for midsize run

    @ekpresent
    ekpresent committed Jul 15, 2021
    Configuration menu
    Copy the full SHA
    894bfe8 View commit details
    Browse the repository at this point in the history

  2. Added polyiso sheathing options back into options_lookup

    @ekpresent
    ekpresent committed Jul 15, 2021
    Configuration menu
    Copy the full SHA
    3fba8b0 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2021

  1. Edits to econ vizualizations, and econ postprocessing done for run10kNo4

    @ekpresent
    ekpresent committed Jul 16, 2021
    Configuration menu
    Copy the full SHA
    22cc0c7 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2021

  1. Merge branch 'develop' into facade-upgrades

    @ekpresent
    ekpresent committed Oct 1, 2021
    Configuration menu
    Copy the full SHA
    5fae3bb View commit details
    Browse the repository at this point in the history

  2. Latest results.

    GitHub Action committed Oct 1, 2021
    Configuration menu
    Copy the full SHA
    43ec31b View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2021

  1. YAML changes for prices, and siding nomenclature

    @ekpresent
    ekpresent committed Oct 12, 2021
    Configuration menu
    Copy the full SHA
    3e3c4b2 View commit details
    Browse the repository at this point in the history

  2. Added necessary Infiltration options to options_lookup for the 15% re… 

    …duction option
    @ekpresent
    ekpresent committed Oct 12, 2021
    Configuration menu
    Copy the full SHA
    84d4943 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2021

  1. Updated project file for first 4 of 7 upgrades

    @ekpresent
    ekpresent committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    7f1076b View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2021

  1. Project file updates for 7 upgrades - first pass completed

    @ekpresent
    ekpresent committed Oct 19, 2021
    Configuration menu
    Copy the full SHA
    a146948 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2021

  1. changes to project file and options lookup for running on eagle

    @ekpresent
    ekpresent committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    9884373 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2021

  1. Merge branch 'develop' into facade-upgrades

    @ekpresent
    ekpresent committed Nov 1, 2021
    Configuration menu
    Copy the full SHA
    bf80b6c View commit details
    Browse the repository at this point in the history

  2. Re-add "convert_to_json.py" to gitignore

    @ekpresent
    ekpresent committed Nov 1, 2021
    Configuration menu
    Copy the full SHA
    47f4cb5 View commit details
    Browse the repository at this point in the history

  3. Latest results.

    GitHub Action committed Nov 1, 2021
    Configuration menu
    Copy the full SHA
    126dbab View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2021

  1. remove siding update from standalone window measures in project file

    @ekpresent
    ekpresent committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    6f4b6ac View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2021

  1. project file updated to latest ACH50 agreement

    @ekpresent
    ekpresent committed Nov 5, 2021
    Configuration menu
    Copy the full SHA
    8cb0c04 View commit details
    Browse the repository at this point in the history

  2. cleaned up no-cost text

    @ekpresent
    ekpresent committed Nov 5, 2021
    Configuration menu
    Copy the full SHA
    5404dd0 View commit details
    Browse the repository at this point in the history

  3. changed upgrade names

    @ekpresent
    ekpresent committed Nov 5, 2021
    Configuration menu
    Copy the full SHA
    c0e197c View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2021

  1. Fix errors Prateek found

    @ekpresent
    ekpresent committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    dfc9350 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2021

  1. minor modifications to project file for first full run

    @ekpresent
    ekpresent committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    15f071d View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2021

  1. project file adjustments to successfully complete full run

    @ekpresent
    ekpresent committed Nov 13, 2021
    Configuration menu
    Copy the full SHA
    484d8af View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2022

  1. edited project file

    @ekpresent
    ekpresent committed Mar 15, 2022
    Configuration menu
    Copy the full SHA
    602348f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'facade-upgrades-yaml' into facade-upgrades 

    Conflicts:
	facades-project-file.yml
    @ekpresent
    ekpresent committed Mar 15, 2022
    Configuration menu
    Copy the full SHA
    34759b9 View commit details
    Browse the repository at this point in the history