Merge 0957fa1 into a582bff

mom-ocean · Feb 6, 2021 · 2fac63d · 2fac63d
2 parents a582bff + 0957fa1
commit 2fac63d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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.", &

diff --git 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