Skip to content

Commit

Permalink
Clean-up after rebase
Browse files Browse the repository at this point in the history
Fix a few small issues after rebasing onto MALI-Dev/develop
  • Loading branch information
trhille committed Mar 2, 2023
1 parent 6d73a85 commit 43bda37
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 4 deletions.
3 changes: 2 additions & 1 deletion components/mpas-albany-landice/src/Registry.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1227,6 +1227,7 @@ is the value of that variable from the *previous* time level!
/>
<var name="calvingThicknessFromThreshold" type="real" dimensions="nCells Time" units="m" time_levs="1"
description="thickness of ice that calves on a given timestep for only processes that generate calving based on a threshold. This includes mask calving, damage calving, iceberg and small island detection, and velocity speed limit."
/>
<var name="groundedCalvingThickness" type="real" dimensions="nCells Time" units="m" time_levs="1"
description="thickness of grounded ice that calves on a given timestep (less than or equal to ice thickness)"
/>
Expand Down Expand Up @@ -1312,7 +1313,6 @@ is the value of that variable from the *previous* time level!
<var name="damageSource" type="real" dimensions="nCells Time" units="s^{-1}" time_levs="1"
description="damage source term"
/>
/>
<var name="basalWaterThickness" type="real" dimensions="nCells Time" units="m" time_levs="1"
description="thickness of basal water"
/>
Expand Down Expand Up @@ -1385,6 +1385,7 @@ is the value of that variable from the *previous* time level!
/>
<var name="dtFaceMeltingCFLratio" type="real" dimensions="Time" units="none" time_levs="1" default_value="0.0"
description="ratio of timestep being used to the maximum timestep calculated for the face-melting CFL condition. This metric can be used to assess the accuracy of the face-melting CFL calculation being lagged by a timestep."
/>
<var name="groundedFaceMeltingThickness" type="real" dimensions="nCells Time" units="m" time_levs="1"
description="Equivalent plan-view averaged thickness of grounded ice that melts on a given timestep from front ablation (less than or equal to ice thickness). Used in mass budget calculations."
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,6 @@ subroutine li_compute_global_stats(domain, memberName, timeLevel, err)
real (kind=RKIND), pointer :: iceThicknessMax, iceThicknessMin, iceThicknessMean
real (kind=RKIND), pointer :: totalSfcMassBal, totalBasalMassBal
real (kind=RKIND), pointer :: totalGroundedSfcMassBal, totalFloatingSfcMassBal
real (kind=RKIND), pointer :: totalFaceMeltingFlux
real (kind=RKIND), pointer :: totalGroundedBasalMassBal, totalFloatingBasalMassBal
real (kind=RKIND), pointer :: totalGroundedCalvingFlux, totalFloatingCalvingFlux
real (kind=RKIND), pointer :: totalFaceMeltingFlux, &
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3765,7 +3765,7 @@ subroutine mask_calving(domain, err)
dCalvingThickness(:) = 0.0_RKIND
! update mask
call li_calculate_mask(meshPool, velocityPool, geometryPool, err_tmp)
call li_calculate_mask(meshPool, velocityPool, geometryPool, domain, err_tmp)
err = ior(err, err_tmp)
localMaskCellCount = 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,6 @@ subroutine prepare_advection(domain, err)
real (kind=RKIND), dimension(:,:), pointer :: layerNormalVelocity
real (kind=RKIND), pointer :: calvingCFLdt, faceMeltingCFLdt
real (kind=RKIND), dimension(:), pointer :: groundedToFloatingThickness
real (kind=RKIND), pointer :: calvingCFLdt
integer, pointer :: processLimitingTimestep
integer, dimension(:), pointer :: edgeMask

Expand Down

0 comments on commit 43bda37

Please sign in to comment.