Changeset 12193 for NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/step.F90

Timestamp:

2019-12-11T17:15:54+01:00 (4 years ago)

Author:

davestorkey

Message:

2019/dev_r11943_MERGE_2019: Merge in dev_r12072_TOP-01_ENHANCE-11_cethe

File:

• NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/step.F90 (modified) (3 diffs)

NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/step.F90

@@ -196 +196 @@
          IF(.NOT.ln_linssh) CALL dom_vvl_sf_nxt( kstp, Nbb, Nnn, Naa, kcall=2 )  ! after vertical scale factors (update depth average component)
       ENDIF
-                         CALL dyn_zdf( kstp, Nbb, Nnn, Nrhs, uu, vv, Naa  )      ! vertical diffusion    ==> after
-
-      IF( ln_dynspg_ts ) THEN                         
-                            CALL wzv        ( kstp, Nbb, Nnn, ww, Naa )          ! now cross-level velocity 
-         IF( ln_zad_Aimp )  CALL wAimp      ( kstp,      Nnn )                   ! Adaptive-implicit vertical advection partitioning
+                            CALL dyn_zdf    ( kstp, Nbb, Nnn, Nrhs, uu, vv, Naa  )  ! vertical diffusion
+      IF( ln_dynspg_ts ) THEN                                                       ! vertical scale factors and vertical velocity need to be updated
+                            CALL wzv        ( kstp, Nbb, Nnn, ww, Naa )             ! now cross-level velocity 
+         IF( ln_zad_Aimp )  CALL wAimp      ( kstp,      Nnn )                      ! Adaptive-implicit vertical advection partitioning
       ENDIF
       
@@ -212 +211 @@
       ! diagnostics and outputs
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-      IF( ln_floats  )   CALL flo_stp ( kstp, Nbb, Nnn )   ! drifting Floats
-      IF( ln_diacfl  )   CALL dia_cfl ( kstp,      Nnn )   ! Courant number diagnostics
-      IF( lk_diahth  )   CALL dia_hth ( kstp,      Nnn )   ! Thermocline depth (20 degres isotherm depth)
-      IF( ln_diadct  )   CALL dia_dct ( kstp,      Nnn )   ! Transports
-                         CALL dia_ar5 ( kstp,      Nnn )   ! ar5 diag
-      IF( ln_diaharm )   CALL dia_harm( kstp,      Nnn )   ! Tidal harmonic analysis
-                         CALL dia_wri ( kstp,      Nnn )   ! ocean model: outputs
+      IF( ln_floats  )   CALL flo_stp ( kstp, Nbb, Nnn )        ! drifting Floats
+      IF( ln_diacfl  )   CALL dia_cfl ( kstp,      Nnn )        ! Courant number diagnostics
+                         CALL dia_hth ( kstp,      Nnn )        ! Thermocline depth (20 degres isotherm depth)
+      IF( ln_diadct  )   CALL dia_dct ( kstp,      Nnn )        ! Transports
+                         CALL dia_ar5 ( kstp,      Nnn )        ! ar5 diag
+                         CALL dia_ptr ( kstp,      Nnn )        ! Poleward adv/ldf TRansports diagnostics
+      IF( ln_diaharm )   CALL dia_harm( kstp,      Nnn )        ! Tidal harmonic analysis
+                         CALL dia_wri ( kstp,      Nnn )        ! ocean model: outputs
       !
       IF( ln_crs     )   CALL crs_fld ( kstp,      Nnn )   ! ocean model: online field coarsening & output
@@ -253 +253 @@
                          CALL tra_ldf    ( kstp, Nbb, Nnn, ts, Nrhs )  ! lateral mixing
 
-!!gm : why CALL to dia_ptr has been moved here??? (use trends info?)
-      IF( ln_diaptr  )   CALL dia_ptr( Nnn )                           ! Poleward adv/ldf TRansports diagnostics
-!!gm
-                         CALL tra_zdf    ( kstp, Nbb, Nnn, Nrhs, ts, Naa  )  ! vert. mixing & after tracer  ==> after
+                         CALL tra_zdf    ( kstp, Nbb, Nnn, Nrhs, ts, Naa  )  ! vertical mixing and after tracer fields
       IF( ln_zdfnpc  )   CALL tra_npc    ( kstp,      Nnn, Nrhs, ts, Naa  )  ! update after fields by non-penetrative convection