Passes optional arg. (BT=CS%barotropic_CSp) in calls to horizontal_vi…

…scosity
NOAA-GFDL · Jun 27, 2019 · 8f96916 · 8f96916
1 parent 47886e3
commit 8f96916
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/src/core/MOM_dynamics_split_RK2.F90 b/src/core/MOM_dynamics_split_RK2.F90
@@ -689,8 +689,8 @@ subroutine step_MOM_dyn_split_RK2(u, v, h, tv, visc, &
 ! diffu = horizontal viscosity terms (u_av)
   call cpu_clock_begin(id_clock_horvisc)
   call horizontal_viscosity(u_av, v_av, h_av, CS%diffu, CS%diffv, &
-                            MEKE, Varmix, CS%barotropic_CSp, &
-                            G, GV, US, CS%hor_visc_CSp, OBC=CS%OBC)
+                            MEKE, Varmix, G, GV, US, CS%hor_visc_CSp, &
+                            OBC=CS%OBC, BT=CS%barotropic_CSp)
   call cpu_clock_end(id_clock_horvisc)
   if (showCallTree) call callTree_wayPoint("done with horizontal_viscosity (step_MOM_dyn_split_RK2)")
 
@@ -1147,14 +1147,11 @@ subroutine initialize_dyn_split_RK2(u, v, h, uh, vh, eta, Time, G, GV, US, param
                        CS%barotropic_CSp, restart_CS, calc_dtbt, CS%BT_cont, &
                        CS%tides_CSp)
 
-!  CS%barotropic_CSp => Barotropic_CSp
-!  CS%thickness_diffuse_CSp => thickness_diffuse_CSp
-
   if (.not. query_initialized(CS%diffu,"diffu",restart_CS) .or. &
       .not. query_initialized(CS%diffv,"diffv",restart_CS)) &
     call horizontal_viscosity(u, v, h, CS%diffu, CS%diffv, MEKE, VarMix, &
-                              CS%barotropic_CSp, G, GV, US, CS%hor_visc_CSp, & 
-                              OBC=CS%OBC)
+                              G, GV, US, CS%hor_visc_CSp, & 
+                              OBC=CS%OBC, BT=CS%barotropic_CSp)
   if (.not. query_initialized(CS%u_av,"u2", restart_CS) .or. &
       .not. query_initialized(CS%u_av,"v2", restart_CS)) then
     CS%u_av(:,:,:) = u(:,:,:)