forked from E3SM-Project/E3SM
-
Notifications
You must be signed in to change notification settings - Fork 4
Add debris-bed friction slip law #135
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
Open
jeremy-brooks-1
wants to merge
4
commits into
develop
Choose a base branch
from
jeremy-brooks-1/mali/debris-friction-full
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
fa6b5ca
Add new spatial bed roughness variable for reg. Coulomb friction
matthewhoffman 1c01189
Fixing typos and exporting effective pressure field
mperego 079213d
Debris-friction slip law interface
jeremy-brooks-1 4b67208
Adding spatial debris-bed friction fields to MPAS
jeremy-brooks-1 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -90,7 +90,7 @@ void velocity_solver_solve_l1l2(double const* lowerSurface_F, | |
|
|
||
| void velocity_solver_solve_fo(double const* bedTopography_F, double const* lowerSurface_F, | ||
| double const* thickness_F, double * beta_F, double const* smb_F, double const* temperature_F, double const* stiffnessFactor_F, | ||
| double const* effecPress_F, double const* muFriction_F, | ||
| double* effecPress_F, double const* muFriction_F, double const* bedRoughnessRC_F, double const* bulkFriction_F, double const* basalDebris_F, | ||
| double* const dirichletVelocityXValue = 0, double* const dirichletVelocitYValue = 0, | ||
| double* u_normal_F = 0, double* bodyForce_F = 0, double* dissipation_heat_F = 0, | ||
| double* xVelocityOnCell = 0, double* yVelocityOnCell = 0, double const * deltat = 0, | ||
|
|
@@ -134,6 +134,7 @@ void write_ascii_mesh(int const* indexToCellID_F, | |
| double const* surfaceAirTemperature_F, double const* basalHeatFlux_F, | ||
| double const* stiffnessFactor_F, | ||
| double const* effecPress_F, double const* muFriction_F, | ||
| double const* bedRoughnessRC_F, double const* bulkFriction_F, double const* basalDebris_F, | ||
| double const* thickness_F, double const* thicknessUncertainty_F, | ||
| double const* smb_F, double const* smbUncertainty_F, | ||
| double const* bmb_F, double const* bmbUncertainty_F, | ||
|
|
@@ -161,8 +162,11 @@ extern void velocity_solver_solve_fo__(int nLayers, int nGlobalVertices, | |
| const std::vector<double>& bedTopographyData, | ||
| const std::vector<double>& smbData, | ||
| const std::vector<double>& stiffnessFactorData, | ||
| const std::vector<double>& effecPressData, | ||
| std::vector<double>& effecPressData, | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @mperego , was this change intentional? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes. Now Albany can return the effective pressure used (e.g., the open-connection one). |
||
| const std::vector<double>& muFrictionData, | ||
| const std::vector<double>& bedRoughnessData, | ||
| const std::vector<double>& bulkFrictionData, | ||
| const std::vector<double>& basalDebrisData, | ||
| const std::vector<double>& temperatureDataOnPrisms, | ||
| std::vector<double>& bodyForceOnBasalCell, | ||
| std::vector<double>& dissipationHeatOnPrisms, | ||
|
|
@@ -207,7 +211,8 @@ 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* bulkFriction_F = 0, double const* basalDebris_F = 0, double const* temperature_F = 0, double const* smb_F = 0, double eps = 0); | ||
|
|
||
| void import2DFieldsObservations(std::vector<std::pair<int, int> >& marineBdyExtensionMap, | ||
| double const * lowerSurface_F, | ||
|
|
@@ -231,6 +236,7 @@ std::vector<int> extendMaskByOneLayer(int const* verticesMask_F); | |
| void exportDissipationHeat(double * dissipationHeat_F); | ||
| void exportBodyForce(double * bodyForce_F); | ||
| void exportBeta(double * beta_F); | ||
| void exportEffectivePressure(double * effecPress_F); | ||
|
|
||
| void get_prism_velocity_on_FEdges(double* uNormal, | ||
| const std::vector<double>& velocityOnCells, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 , are these the correct units we should use here? Do we need to account for any scaling that Albany does here? (noting that I'm not sure if Jeremy had implemented scaling on these fields on the Albany side)
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.
Based on how they are used in Albany, I think
bedRoughnessRCis fine, butbasalDebrisFactorshould be in kPa yr m^{-1}, likemuFriction. We can convert the unis in the interface_velocity_solver.cpp file.