From a1bf2e3dcaaf8ba1bfcce83aebb3ced18aa613d7 Mon Sep 17 00:00:00 2001 From: Matthew Harrison Date: Fri, 5 Feb 2021 16:49:37 -0500 Subject: [PATCH 1/2] initialize field-specific vertical extent for target data in fixed sponge case --- src/parameterizations/vertical/MOM_ALE_sponge.F90 | 1 + 1 file changed, 1 insertion(+) diff --git a/src/parameterizations/vertical/MOM_ALE_sponge.F90 b/src/parameterizations/vertical/MOM_ALE_sponge.F90 index aa224dba41..fe6072681c 100644 --- a/src/parameterizations/vertical/MOM_ALE_sponge.F90 +++ b/src/parameterizations/vertical/MOM_ALE_sponge.F90 @@ -666,6 +666,7 @@ subroutine set_up_ALE_sponge_field_fixed(sp_val, G, GV, f_ptr, CS) endif ! stores the reference profile + CS%Ref_val(CS%fldno)%nz_data = CS%nz_data allocate(CS%Ref_val(CS%fldno)%p(CS%nz_data,CS%num_col)) CS%Ref_val(CS%fldno)%p(:,:) = 0.0 do col=1,CS%num_col From 3e75098e4f06d03b5dcc23a24906fffae42bf9f7 Mon Sep 17 00:00:00 2001 From: Matthew Harrison Date: Fri, 5 Feb 2021 17:31:29 -0500 Subject: [PATCH 2/2] revert default name for sponge inverse damping timescale and prevent logging of sponge_uv_state file if not used --- src/initialization/MOM_state_initialization.F90 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/initialization/MOM_state_initialization.F90 b/src/initialization/MOM_state_initialization.F90 index b54d9702a6..3e745dcafd 100644 --- a/src/initialization/MOM_state_initialization.F90 +++ b/src/initialization/MOM_state_initialization.F90 @@ -1785,9 +1785,6 @@ subroutine initialize_sponges_file(G, GV, US, use_temperature, tv, u, v, param_f call get_param(param_file, mdl, "SPONGE_STATE_FILE", state_file, & "The name of the file with the state to damp toward.", & default=damping_file) - call get_param(param_file, mdl, "SPONGE_UV_STATE_FILE", state_uv_file, & - "The name of the file with the state to damp UV toward.", & - default=damping_file) call get_param(param_file, mdl, "SPONGE_PTEMP_VAR", potemp_var, & "The name of the potential temperature variable in "//& "SPONGE_STATE_FILE.", default="PTEMP") @@ -1798,6 +1795,9 @@ subroutine initialize_sponges_file(G, GV, US, use_temperature, tv, u, v, param_f "Apply sponges in u and v, in addition to tracers.", & default=.false.) if (sponge_uv) then + call get_param(param_file, mdl, "SPONGE_UV_STATE_FILE", state_uv_file, & + "The name of the file with the state to damp UV toward.", & + default=damping_file) call get_param(param_file, mdl, "SPONGE_U_VAR", u_var, & "The name of the zonal velocity variable in "//& "SPONGE_UV_STATE_FILE.", default="UVEL") @@ -1810,7 +1810,7 @@ subroutine initialize_sponges_file(G, GV, US, use_temperature, tv, u, v, param_f "SPONGE_STATE_FILE.", default="ETA") call get_param(param_file, mdl, "SPONGE_IDAMP_VAR", Idamp_var, & "The name of the inverse damping rate variable in "//& - "SPONGE_DAMPING_FILE.", default="IDAMP") + "SPONGE_DAMPING_FILE.", default="Idamp") if (sponge_uv) then call get_param(param_file, mdl, "SPONGE_UV_DAMPING_FILE", uv_damping_file, & "The name of the file with sponge damping rates for the velocity variables.", &