Skip to content

Commit

Permalink
Stream test update for the basal_physics branch
Browse files Browse the repository at this point in the history
When I compared the basal_physics branch to the main branch using the new LIVVkit,
the stream test failed. This is because which_ho_babc = 2 no longer has the same meaning.
In the stream config file, I set which_ho_babc = 15 to turn on the till yield stress
option used in the stream test. With this change, the stream test passes.

Also turned off verbose options for calving and inversion.
  • Loading branch information
whlipscomb committed May 17, 2024
1 parent c827d19 commit 98d9ada
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
1 change: 0 additions & 1 deletion libglissade/glissade_calving.F90
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ module glissade_calving
public :: verbose_calving

logical, parameter :: verbose_calving = .false.
!! logical, parameter :: verbose_calving = .true.

contains

Expand Down
3 changes: 1 addition & 2 deletions libglissade/glissade_inversion.F90
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ module glissade_inversion
! a target ice thickness field.
!-----------------------------------------------------------------------------

!! logical, parameter :: verbose_inversion = .false.
logical, parameter :: verbose_inversion = .true.
logical, parameter :: verbose_inversion = .false.

real(dp), parameter :: &
deltaT_ocn_maxval = 5.0d0 ! max allowed magnitude of deltaT_ocn (degC)
Expand Down
2 changes: 1 addition & 1 deletion tests/stream/stream.config
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ flow_law = 0 # 0 = isothermal, 2 = temperature dependent
evolution = 3 # 3 = inc. remapping, 4 = FO upwind

[ho_options]
which_ho_babc = 2 # till yield stress map taken from .nc input
which_ho_babc = 15 # till yield stress map taken from .nc input
which_ho_efvs = 2 # nonlinear eff. visc. w/ n=3
which_ho_sparse = 3 # 1 = SLAP GMRES, 3 = glissade parallel PCG, 4 = Trilinos for linear solver
which_ho_nonlinear = 0 # 0 = Picard, 1 = accelerated Picard
Expand Down

0 comments on commit 98d9ada

Please sign in to comment.