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

Feature/wsieg1 #184

Merged
merged 5 commits into from
Jan 23, 2024
Merged

Feature/wsieg1 #184

merged 5 commits into from
Jan 23, 2024

Conversation

yliu250
Copy link
Collaborator

@yliu250 yliu250 commented Dec 6, 2023

Initial commit of the updates for the wsieg1 model using control blocks

Copy link
Collaborator

@abhyshr abhyshr left a comment

Choose a reason for hiding this comment

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

Looks good to merge.

@@ -6,6 +6,9 @@
// -----------------------------------------------------------
/**
* @file wsieg1.cpp
* @author Shuangshuang Jin
Copy link
Collaborator

Choose a reason for hiding this comment

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

Remove the author and date, we will not be adding individual authors in the code.

@@ -30,7 +33,8 @@ gridpack::dynamic_simulation::Wsieg1Model::Wsieg1Model(void)
SecondGenExists = false;
OptionToModifyLimitsForInitialStateLimitViolation = true;
w = 0.0;
dx1LL = 0;
printf("---yuan debug constructor---\n");
Copy link
Collaborator

Choose a reason for hiding this comment

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

Please remove printf statement

@@ -41,7 +45,7 @@ gridpack::dynamic_simulation::Wsieg1Model::Wsieg1Model(void)
dx3Turb1_1 = 0;
dx4Turb2_1 = 0;
dx5Turb3_1 = 0;
dx6Turb4_1 = 0;
dx6Turb4_1 = 0;*/
Copy link
Collaborator

Choose a reason for hiding this comment

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

Please remove this commented out cod AND any future instances of commented out code.

if (!data->getValue(GOVERNOR_IBLOCK, &Iblock, idx)) Iblock = 0.0; // Iblock

int debug_print_params=1;
if (debug_print_params) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

What is debug_print_parama? Where does it come from? Please remove all this printing.

} else
u5 = 0;
//-- yuan comment and add below -//
// u4 = NGV_blk.init_given_y(u5); // Implemented a .int_given_y method for PiecewiseSlope in dblock
Copy link
Collaborator

Choose a reason for hiding this comment

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

Please remove any commented out code and remove any personalized comments such as "yuan ---"

u1 = Leadlag_blk.init_given_y(0.0);
//-- yuan comment and add above -//

//-- yuan comment below -//
Copy link
Collaborator

Choose a reason for hiding this comment

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

Any commented out code should be removed!

@abhyshr abhyshr merged commit 594e684 into develop Jan 23, 2024
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