Changeset 9250 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/step.F90

Timestamp:

2018-01-17T08:25:53+01:00 (6 years ago)

Author:

gm

Message:

dev_merge_2017 : HPC09_ZDF: drag finalization: move dyn_bfr routine in zdfdrg (renamed zdf_drg_exp) and delete dynbfr.F90 module - result unchanged

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) (2 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -199 +199 @@
                             CALL wzv        ( kstp )              ! now cross-level velocity 
       ENDIF
-
-      IF( .NOT.ln_drgimp)   CALL dyn_bfr    ( kstp )  ! bottom friction
       
                          CALL dyn_zdf       ( kstp )  ! vertical diffusion
@@ -276 +274 @@
 !!jc2: dynnxt must be the latest call. e3t_b are indeed updated in that routine
                          CALL tra_nxt       ( kstp )  ! finalize (bcs) tracer fields at next time step and swap
-                         CALL dyn_nxt       ( kstp )  ! finalize (bcs) velocities at next time step and swap
+                         CALL dyn_nxt       ( kstp )  ! finalize (bcs) velocities at next time step and swap (always called after tra_nxt)
                          CALL ssh_swp       ( kstp )  ! swap of sea surface height
       IF(.NOT.ln_linssh) CALL dom_vvl_sf_swp( kstp )  ! swap of vertical scale factors