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

ResStock-HPXML #169

Closed
wants to merge 32 commits into from
Closed

ResStock-HPXML #169

wants to merge 32 commits into from

Conversation

nmerket
Copy link
Member

@nmerket nmerket commented Jul 14, 2020

Pull Request Description

This is the companion PR to: NREL/resstock#443

OS-BuildStock (branch: restructure-v3) requires OpenStudio 3.0.0. Therefore, buildstockbatch will need to move to OpenStudio 3.0.0. [Update: now requires OpenStudio 3.1.0.]

Checklist

Not all may apply

  • Code changes (must work)
  • Tests exercising your feature/bug fix (check coverage report on CircleCI build -> Artifacts)
  • All other unit tests passing
  • Update validation for project config yaml file changes
  • Update documentation
  • Run a small batch run to make sure it all works (local is fine, unless an Eagle specific feature)
  • Runs successfully on local docker

@nmerket nmerket mentioned this pull request Jul 14, 2020
7 tasks
@nmerket nmerket changed the title OpenStudio-HPXML ResStock-HPXML Jul 14, 2020
Copy link
Member Author

@nmerket nmerket left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@joseph-robertson The main thing I did was rename references to building_unit_id back to building_id. Can you look over that and verify I didn't mess it up too much? Also I merged in the develop branch and tried to fix any merge conflicts.

These notes below are mostly for me, but if you have any insights, please chime in.

buildstockbatch/base.py Outdated Show resolved Hide resolved
timeseries_filepath = os.path.join(sim_dir, 'run', 'enduse_timeseries.csv')
timeseries_filepath = os.path.join(sim_dir, 'run', 'results_timeseries.csv')
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think ComStock is still writing out enduse_timeseries.csv so we may need to either get them to do the same or have a conditional look for the new filename here.

tsdf = pd.read_csv(timeseries_filepath, parse_dates=[0])
tsdf = pd.read_csv(timeseries_filepath, parse_dates=['Time'], skiprows=[1])
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe want to make this parse_dates=[0] again. I think someone changed it from "Time" to "time" and that broke everything. Using 0 makes it just parse the first column.

Comment on lines 405 to 410
for measure_dir in measure_names.keys():
for measure_name in measure_names[measure_dir].keys():
measure_path = os.path.join(measure_dir, measure_name)

if measure_names[measure_dir][measure_name] in cfg.keys() or \
measure_names[measure_dir][measure_name] == 'residential_simulation_controls':
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a lot. As part of the refactor I want to do I'd like to do this validation as part of the workflow generator class.

buildstockbatch/eagle.py Outdated Show resolved Hide resolved
buildstockbatch/postprocessing.py Outdated Show resolved Hide resolved
buildstockbatch/test/test_base.py Outdated Show resolved Hide resolved
buildstockbatch/test/test_base.py Outdated Show resolved Hide resolved
@nmerket nmerket self-assigned this Aug 26, 2020
@nmerket nmerket marked this pull request as draft January 12, 2021 21:43
@joseph-robertson joseph-robertson deleted the restructure branch March 4, 2021 15:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants