Changeset 2104 for branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/DYN/dynzdf.F90

Timestamp:

2010-09-17T14:35:46+02:00 (14 years ago)

Author:

cetlod

Message:

update DEV_r2006_merge_TRA_TRC according to review

File:

• branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/DYN/dynzdf.F90 (modified) (6 diffs)

branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/DYN/dynzdf.F90

@@ -4 +4 @@
    !! Ocean dynamics :  vertical component of the momentum mixing trend
    !!==============================================================================
-   !! History :  9.0  !  05-11  (G. Madec)  Original code
+   !! History :  1.0  !  2005-11  (G. Madec)  Original code
+   !!            3.3  !  2010-10  (C. Ethe, G. Madec) reorganisation of initialisation phase
    !!----------------------------------------------------------------------
 
    !!----------------------------------------------------------------------
    !!   dyn_zdf      : Update the momentum trend with the vertical diffusion
-   !!       zdf_ctl  : initializations of the vertical diffusion scheme
+   !!   dyn_zdf_init : initializations of the vertical diffusion scheme
    !!----------------------------------------------------------------------
    USE oce             ! ocean dynamics and tracers variables
@@ -30 +31 @@
    PUBLIC   dyn_zdf_init  !  routine called by opa.F90
 
-   INTEGER  ::   nzdf = 0              ! type vertical diffusion algorithm used 
-      !                                ! defined from ln_zdf...  namlist logicals)
-
-   REAL(wp) ::   r2dt                  ! time-step, = 2 rdttra
-      !                                ! except at nit000 (=rdttra) if neuler=0
+   INTEGER  ::   nzdf = 0   ! type vertical diffusion algorithm used, defined from ln_zdf... namlist logicals
+   REAL(wp) ::   r2dt       ! time-step, = 2 rdttra except at nit000 (=rdttra) if neuler=0
 
    !! * Substitutions
@@ -41 +39 @@
 #  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
-   !!  OPA 9.0 , LOCEAN-IPSL (2005) 
+   !! NEMO/OPA 3,3 , LOCEAN-IPSL (2010) 
    !! $Id$
    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
@@ -60 +58 @@
 
       !                                          ! set time step
-      IF( neuler == 0 .AND. kt == nit000    ) THEN   ;   r2dt =      rdt      ! = rdtra (restarting with Euler time stepping)
-      ELSEIF(               kt <= nit000 + 1) THEN   ;   r2dt = 2. * rdt      ! = 2 rdttra (leapfrog)
+      IF( neuler == 0 .AND. kt == nit000     ) THEN   ;   r2dt =      rdt   ! = rdtra (restart with Euler time stepping)
+      ELSEIF(               kt <= nit000 + 1 ) THEN   ;   r2dt = 2. * rdt   ! = 2 rdttra (leapfrog)
       ENDIF
 
@@ -71 +69 @@
       SELECT CASE ( nzdf )                       ! compute lateral mixing trend and add it to the general trend
       !
-      CASE ( 0 )   ;   CALL dyn_zdf_exp    ( kt, r2dt )      ! explicit scheme
-      CASE ( 1 )   ;   CALL dyn_zdf_imp    ( kt, r2dt )      ! implicit scheme
+      CASE ( 0 )   ;   CALL dyn_zdf_exp( kt, r2dt )      ! explicit scheme
+      CASE ( 1 )   ;   CALL dyn_zdf_imp( kt, r2dt )      ! implicit scheme
       !
       CASE ( -1 )                                      ! esopa: test all possibility with control print
-                       CALL dyn_zdf_exp    ( kt, r2dt )
+                       CALL dyn_zdf_exp( kt, r2dt )
                        CALL prt_ctl( tab3d_1=ua, clinfo1=' zdf0 - Ua: ', mask1=umask,               &
             &                        tab3d_2=va, clinfo2=       ' Va: ', mask2=vmask, clinfo3='dyn' )
-                       CALL dyn_zdf_imp    ( kt, r2dt )
+                       CALL dyn_zdf_imp( kt, r2dt )
                        CALL prt_ctl( tab3d_1=ua, clinfo1=' zdf1 - Ua: ', mask1=umask,               &
             &                        tab3d_2=va, clinfo2=       ' Va: ', mask2=vmask, clinfo3='dyn' )
@@ -108 +106 @@
       USE zdfkpp
       !!----------------------------------------------------------------------
-
+      !
       ! Choice from ln_zdfexp read in namelist in zdfini
       IF( ln_zdfexp ) THEN   ;   nzdf = 0           ! use explicit scheme
       ELSE                   ;   nzdf = 1           ! use implicit scheme
       ENDIF
-
+      !
       ! Force implicit schemes
       IF( lk_zdftke_old .OR. lk_zdftke .OR. lk_zdfkpp )   nzdf = 1   ! TKE or KPP physics
       IF( ln_dynldf_iso                               )   nzdf = 1   ! iso-neutral lateral physics
       IF( ln_dynldf_hor .AND. ln_sco                  )   nzdf = 1   ! horizontal lateral physics in s-coordinate
-
+      !
       IF( lk_esopa )    nzdf = -1                   ! Esopa key: All schemes used
-
+      !
       IF(lwp) THEN                                  ! Print the choice
          WRITE(numout,*)