Skip to content

MALI: Several Improvements related to handling Albany velocity solver #402

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

Closed
wants to merge 9 commits into from
Closed

MALI: Several Improvements related to handling Albany velocity solver #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
10b6f59
Adding boundary conditions info whe printing the ascii mesh. Minor bu…
mperego Aug 30, 2019
b514e40
Modified the logic to determined whether the finite element mesh need…
mperego Nov 8, 2019
297eb88
Remove old code for LIFEV from the Interface_velocty_solver.*pp. Clea…
mperego Nov 8, 2019
fb222d4
Modify write_ascii_mesh so that it can mesh can be printed in parallel.
mperego Nov 8, 2019
69f9946
Remove functions computing the tet/prism mesh connectivity.
mperego Nov 8, 2019
7dbf97b
Several changes to the Interface_velocity_solver:
mperego Nov 8, 2019
66e0b31
Remove option to send to Albany list of contiguous Ids
mperego Nov 11, 2019
43996c3
Interface_velocity_solver: consolidate functions to create reversed c…
mperego Nov 11, 2019
e5f9ac2
Modify albany input files of some tests to use Prisms and remove old …
mperego Nov 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/core_landice/Registry.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -931,7 +931,7 @@ is the value of that variable from the *previous* time level!
<var name="dynamicThickening" type="real" dimensions="nCells Time" units="m a^{-1}"
description="diagnostic field of dynamic thickening rate (calculated as negative of flux divergence)"
/>
<var name="cellMask" type="integer" dimensions="nCells Time" units="none"
<var name="cellMask" type="integer" dimensions="nCells Time" units="none" time_levs="1"
description="bitmask indicating various properties about the ice sheet on cells. cellMask only needs to be a restart field if config_allow_additional_advance = false (to keep the mask of initial ice extent)"
/>
<var name="edgeMask" type="integer" dimensions="nEdges Time" units="none"
Expand Down Expand Up @@ -1127,6 +1127,10 @@ is the value of that variable from the *previous* time level!
units="none" description="flag needed by external velocity solvers that indicates if the region to solve on the block's domain has changed (treated as a logical)"
packages="higherOrderVelocity"
/>
<var name="cellIceMaskChanged" type="integer" dimensions="Time"
units="none" description="flag needed by external velocity solvers that indicates if the region to solve on the block's domain has changed (treated as a logical)"
packages="higherOrderVelocity"
/>
<var name="dirichletVelocityMask" type="integer" dimensions="nVertInterfaces nCells Time"
units="none" time_levs="2"
description="mask of where Dirichlet boundary conditions should be applied to the velocity solution. 1 means apply a Dirichlet boundary condition, 0 means do not. (higher-order dycores only)"
Expand All @@ -1139,9 +1143,14 @@ is the value of that variable from the *previous* time level!
<var name="floatingEdges"
type="integer" dimensions="nEdges Time"
units="unitless"
time_levs="2"
description="edges which are floating have a value of 1. non floating edges have a value of 0."
packages="higherOrderVelocity"
/>
<var name="floatingEdgesChanged" type="integer" dimensions="Time"
units="none" description="flag needed by external velocity solvers that indicates if the floating edges ids have changed (treated as a logical)"
packages="higherOrderVelocity"
/>
</var_struct>

<!-- ================ -->
Expand Down
2 changes: 1 addition & 1 deletion src/core_landice/analysis_members/mpas_li_global_stats.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ subroutine li_compute_global_stats(domain, memberName, timeLevel, err)
call mpas_pool_get_array(meshPool, 'dvEdge', dvEdge)
call mpas_pool_get_array(geometryPool, 'thickness', thickness)
call mpas_pool_get_array(geometryPool, 'bedTopography', bedTopography)
call mpas_pool_get_array(geometryPool, 'cellMask', cellMask)
call mpas_pool_get_array(geometryPool, 'cellMask', cellMask, timeLevel=1)
call mpas_pool_get_array(geometryPool, 'sfcMassBalApplied', sfcMassBalApplied)
call mpas_pool_get_array(geometryPool, 'groundedSfcMassBalApplied', groundedSfcMassBalApplied)
call mpas_pool_get_array(geometryPool, 'basalMassBal', basalMassBal)
Expand Down
2 changes: 1 addition & 1 deletion src/core_landice/analysis_members/mpas_li_regional_stats.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ subroutine li_compute_regional_stats(domain, memberName, timeLevel, err)
call mpas_pool_get_array(meshPool, 'cellsOnEdge', cellsOnEdge)
call mpas_pool_get_array(geometryPool, 'thickness', thickness)
call mpas_pool_get_array(geometryPool, 'bedTopography', bedTopography)
call mpas_pool_get_array(geometryPool, 'cellMask', cellMask)
call mpas_pool_get_array(geometryPool, 'cellMask', cellMask, timeLevel=1)
call mpas_pool_get_array(geometryPool, 'edgeMask', edgeMask)
call mpas_pool_get_array(geometryPool, 'sfcMassBalApplied', sfcMassBalApplied)
call mpas_pool_get_array(geometryPool, 'groundedSfcMassBalApplied', groundedSfcMassBalApplied)
Expand Down
Loading