-
Notifications
You must be signed in to change notification settings - Fork 3
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
Add new spatial bed roughness variable for reg. Coulomb friction #129
base: develop
Are you sure you want to change the base?
Add new spatial bed roughness variable for reg. Coulomb friction #129
Conversation
This commit adds a new edRoughnessRC variable to MALI on the MPAS side. Corresponding changes are needed on the Albany side.
@@ -207,7 +209,7 @@ void createReducedMPI(int nLocalEntities, MPI_Comm& reduced_comm_id); | |||
|
|||
void importFields(std::vector<std::pair<int, int> >& marineBdyExtensionMap, | |||
double const* bedTopography_F, double const* lowerSurface_F, double const* thickness_F, | |||
double const* beta_F = 0, double const* stiffnessFactor_F = 0, double const* effecPress_F = 0, double const* muFriction_F = 0, double const* temperature_F = 0, double const* smb_F = 0, double eps = 0); | |||
double const* beta_F = 0, double const* stiffnessFactor_F = 0, double const* effecPress_F = 0, double const* muFriction_F = 0, double const* bedRoughness_F = 0, double const* temperature_F = 0, double const* smb_F = 0, double eps = 0); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mperego , is this change needed to match the variable name in the calling signature in the cpp file?
double const* beta_F = 0, double const* stiffnessFactor_F = 0, double const* effecPress_F = 0, double const* muFriction_F = 0, double const* bedRoughness_F = 0, double const* temperature_F = 0, double const* smb_F = 0, double eps = 0); | |
double const* beta_F = 0, double const* stiffnessFactor_F = 0, double const* effecPress_F = 0, double const* muFriction_F = 0, double const* bedRoughnessRC_F = 0, double const* temperature_F = 0, double const* smb_F = 0, double eps = 0); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's not needed because what matters to the compiler is the position and type of the parameter, but I think it's easier for debugging purposes to use the same names in the function declaration and definition.
This merge adds a new edRoughnessRC variable to MALI on the MPAS side. Corresponding changes are needed on the Albany side.