Skip to content

Commit

Permalink
Merge pull request #85 from NREL/sf_updates
Browse files Browse the repository at this point in the history
Merging timeseries aggregation code into script located in buildstockdb.
  • Loading branch information
joseph-robertson committed Sep 15, 2017
2 parents 6d07352 + 9970efa commit ae4aa93
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 306 deletions.
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ faraday.log
/resources/inputs/pnw/Insulation Unfinished Attic H3.tsv
/resources/inputs/pnw/Insulation Unfinished Attic H1.tsv
/resources/inputs/pnw/Insulation Unfinished Attic H2.tsv
/analysis_results/resstock_pnw_metadata.csv
/analysis_results/resstock_national_metadata.csv

/.bundle
compare_to_beopt
/download_files.rb
Expand Down Expand Up @@ -51,7 +50,6 @@ resources/grid_ng.csv
resources/grid_oil.csv
resources/grid_prop.csv

analysis_results/data_points/
/project_resstock_national/housing_characteristics/buildstock.csv
/project_resstock_pnw/housing_characteristics/buildstock.csv
/project_resstock_testing/housing_characteristics/buildstock.csv
Expand Down
303 changes: 0 additions & 303 deletions resources/collect.py

This file was deleted.

0 comments on commit ae4aa93

Please sign in to comment.