From 98d9adad98100d3508d19d0a2d9f89730c95ec8f Mon Sep 17 00:00:00 2001 From: William Lipscomb Date: Thu, 16 May 2024 20:24:53 -0600 Subject: [PATCH] Stream test update for the basal_physics branch 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. --- libglissade/glissade_calving.F90 | 1 - libglissade/glissade_inversion.F90 | 3 +-- tests/stream/stream.config | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libglissade/glissade_calving.F90 b/libglissade/glissade_calving.F90 index a01456d9..5be84f69 100644 --- a/libglissade/glissade_calving.F90 +++ b/libglissade/glissade_calving.F90 @@ -48,7 +48,6 @@ module glissade_calving public :: verbose_calving logical, parameter :: verbose_calving = .false. -!! logical, parameter :: verbose_calving = .true. contains diff --git a/libglissade/glissade_inversion.F90 b/libglissade/glissade_inversion.F90 index 907fbec8..270a9b08 100644 --- a/libglissade/glissade_inversion.F90 +++ b/libglissade/glissade_inversion.F90 @@ -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) diff --git a/tests/stream/stream.config b/tests/stream/stream.config index e7032a2b..46e3ea79 100644 --- a/tests/stream/stream.config +++ b/tests/stream/stream.config @@ -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