Merge branch 'dev/gfdl' of github.com:NOAA-GFDL/MOM6 into dev/gfdl

NOAA-GFDL · Jun 14, 2017 · e8b7f0e · e8b7f0e
2 parents db3a5b5 + 1e8c2b4
commit e8b7f0e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/core/MOM.F90 b/src/core/MOM.F90
@@ -568,7 +568,7 @@ subroutine step_MOM(fluxes, state, Time_start, time_interval, CS)
     call create_group_pass(CS%pass_tau_ustar_psurf, fluxes%ustar(:,:), G%Domain)
   if (ASSOCIATED(fluxes%p_surf)) &
     call create_group_pass(CS%pass_tau_ustar_psurf, fluxes%p_surf(:,:), G%Domain)
-  if (CS%thickness_diffuse .OR. CS%mixedlayer_restrat) &
+  if ((CS%thickness_diffuse .and. (.not.CS%thickness_diffuse_first .or. CS%t_dyn_rel_adv == 0)) .OR. CS%mixedlayer_restrat) &
     call create_group_pass(CS%pass_h, h, G%Domain) !###, halo=max(2,cont_stensil))
 
   do_pass_Ray = .FALSE.