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

Ssc 1074 ippppa to attic plus patch to develop #1280

Closed
wants to merge 12 commits into from

Conversation

brtietz
Copy link
Collaborator

@brtietz brtietz commented Feb 18, 2025

Looks like this pulled along a few patch issues as well.

Fixes #1074 - moves unused cmod file to attic

Pairs with NREL/SAM#2011

Copy link
Collaborator

@sjanzou sjanzou left a comment

Choose a reason for hiding this comment

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

Why are there so many non-ippppa changes here? Is this a merge from patch to develop, too?

}
state->q0 = q_upper;

Copy link
Collaborator

Choose a reason for hiding this comment

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

Was this previously incorrect or are you taking the opportunity to update formatting?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Previously incorrect. See #1278

@@ -479,7 +479,12 @@ bool windfile::open( const std::string &file )
std::vector<std::string> hdr;
int ncols = locate2(m_buf, hdr, ',');

for (size_t i = 0; (int)i < ncols; i++)
lat = std::numeric_limits<float>::quiet_NaN();
Copy link
Collaborator

Choose a reason for hiding this comment

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

Thanks for initializing.

@@ -30,7 +30,6 @@ set(SSC_SRC
cmod_csp_common_eqns.cpp
cmod_csp_common_eqns.h
cmod_csp_dsg_lf_ui.cpp
cmod_csp_heatsink.cpp
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why is this removed?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Whoops - looks like I used --ours a little too aggressively on the merge. This is a good reason to do two PRs instead of combining this with changes to develop. I'll close this one.

@brtietz
Copy link
Collaborator Author

brtietz commented Feb 19, 2025

Why are there so many non-ippppa changes here? Is this a merge from patch to develop, too?

Yes. We can do separate PRs for that if you prefer.

@brtietz brtietz closed this Feb 19, 2025
@brtietz brtietz deleted the ssc_1074_ippppa_to_attic branch February 19, 2025 16:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants