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

Fix SAM issue 393 #413

Merged
merged 11 commits into from
Nov 6, 2020
Merged

Fix SAM issue 393 #413

merged 11 commits into from
Nov 6, 2020

Conversation

sjanzou
Copy link
Collaborator

@sjanzou sjanzou commented Oct 29, 2020

Adds additional project file checks and fixes issues with duplicate parametric outputs that corrupt SAM project files

@sjanzou sjanzou self-assigned this Oct 29, 2020
@sjanzou sjanzou mentioned this pull request Oct 29, 2020
Closed
brtietz
brtietz requested changes Oct 29, 2020
View reviewed changes
Copy link
Collaborator

@brtietz brtietz left a comment

Choose a reason for hiding this comment

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

@sjanzou I think there were some merge issues here. All of the batt_replacement_schedule variables and the GUI option were removed in #409. Is there a reason they needed to come back?

cpaulgilman
cpaulgilman approved these changes Oct 29, 2020
View reviewed changes
Copy link
Collaborator

@cpaulgilman cpaulgilman left a comment

Choose a reason for hiding this comment

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

This looks good Steve. I pushed a commit to revise the error message:

image

@dguittet dguittet removed their request for review October 29, 2020 17:22
@sjanzou
Copy link
Collaborator Author

sjanzou commented Oct 29, 2020

@sjanzou I think there were some merge issues here. All of the batt_replacement_schedule variables and the GUI option were removed in #409. Is there a reason they needed to come back?

Not sure why these were updated... Seems like when I merged develop into #393 these got updated for some reason... I will remove from this pull request.

@sjanzou
Copy link
Collaborator Author

sjanzou commented Oct 30, 2020

Revert changes per @brtietz and run 419 tests and verify defaults and forms from develop and close #393

@sjanzou sjanzou closed this Oct 30, 2020
@brtietz
Copy link
Collaborator

brtietz commented Oct 30, 2020

@sjanzou the state of this branch as of 52a789c looks good to me, but it didn't get merged into develop (closed instead of merged). Is that right?

@sjanzou sjanzou reopened this Nov 6, 2020
@sjanzou sjanzou merged commit 30bc29f into develop Nov 6, 2020
@sjanzou
Copy link
Collaborator Author

sjanzou commented Nov 6, 2020

Closes #393 as before

@dguittet dguittet deleted the SAM_393 branch December 23, 2020 22:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@brtietz brtietz brtietz requested changes

@cpaulgilman cpaulgilman cpaulgilman approved these changes

@mjprilliman mjprilliman Awaiting requested review from mjprilliman

Assignees

@sjanzou sjanzou

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@sjanzou @brtietz @cpaulgilman