Changeset 2528 for trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm.F90

Timestamp:

2010-12-27T18:33:53+01:00 (13 years ago)

Author:

rblod

Message:

Update NEMOGCM from branch nemo_v3_3_beta

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm.F90 (modified) (6 diffs, 1 prop)

trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm.F90

@@ -6 +6 @@
    !! History :  OPA  ! 2000-08  (G. Madec)  double diffusive mixing
    !!   NEMO     1.0  ! 2002-06  (G. Madec)  F90: Free form and module
+   !!            3.3  !  2010-10  (C. Ethe, G. Madec) reorganisation of initialisation phase
    !!----------------------------------------------------------------------
 #if defined key_zdfddm   ||   defined key_esopa
@@ -24 +25 @@
    PRIVATE
 
-   PUBLIC   zdf_ddm    ! called by step.F90
+   PUBLIC   zdf_ddm       ! called by step.F90
+   PUBLIC   zdf_ddm_init  ! called by opa.F90
 
    LOGICAL , PUBLIC, PARAMETER ::   lk_zdfddm = .TRUE.  !: double diffusive mixing flag
@@ -38 +40 @@
 #  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
-   !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
-   !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! NEMO/OPA 3.3 , NEMO Consortium (2010)
+   !! $Id$
+   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
 
@@ -86 +88 @@
       !!----------------------------------------------------------------------
 
-      IF ( kt == nit000 )   CALL zdf_ddm_init          ! Initialization (first time-step only)
-
       !                                                ! ===============
       DO jk = 2, jpkm1                                 ! Horizontal slab
@@ -98 +98 @@
             DO ji = 1, jpi
                ! stability indicator: msks=1 if rn2>0; 0 elsewhere
-               IF( rn2(ji,jj,jk) + 1.e-12  <= 0. ) THEN
-                  zmsks(ji,jj) = 0.e0
-               ELSE
-                  zmsks(ji,jj) = 1.e0
+               IF( rn2(ji,jj,jk) + 1.e-12  <= 0. ) THEN   ;   zmsks(ji,jj) = 0.e0
+               ELSE                                       ;   zmsks(ji,jj) = 1.e0
                ENDIF
                ! salt fingering indicator: msksf=1 if rrau>1; 0 elsewhere            
-               IF( rrau(ji,jj,jk) <= 1. ) THEN
-                  zmskf(ji,jj) = 0.e0
-               ELSE
-                  zmskf(ji,jj) = 1.e0
+               IF( rrau(ji,jj,jk) <= 1.          ) THEN   ;   zmskf(ji,jj) = 0.e0
+               ELSE                                       ;   zmskf(ji,jj) = 1.e0
                ENDIF
                ! diffusive layering indicators: 
-               !   mskdl1=1 if 0<rrau<1; 0 elsewhere
-               IF( rrau(ji,jj,jk) >= 1. ) THEN
-                  zmskd1(ji,jj) = 0.e0
-               ELSE
-                  zmskd1(ji,jj) = 1.e0
-               ENDIF
-               !   mskdl2=1 if 0<rrau<0.5; 0 elsewhere
-               IF( rrau(ji,jj,jk) >= 0.5 ) THEN
-                  zmskd2(ji,jj) = 0.e0
-               ELSE
-                  zmskd2(ji,jj) = 1.e0
+               !     ! mskdl1=1 if 0<rrau<1; 0 elsewhere
+               IF( rrau(ji,jj,jk) >= 1.          ) THEN   ;   zmskd1(ji,jj) = 0.e0
+               ELSE                                       ;   zmskd1(ji,jj) = 1.e0
+               ENDIF
+               !     ! mskdl2=1 if 0<rrau<0.5; 0 elsewhere
+               IF( rrau(ji,jj,jk) >= 0.5         ) THEN   ;   zmskd2(ji,jj) = 0.e0
+               ELSE                                       ;   zmskd2(ji,jj) = 1.e0
                ENDIF
                !   mskdl3=1 if 0.5<rrau<1; 0 elsewhere
-               IF( rrau(ji,jj,jk) <= 0.5 .OR. rrau(ji,jj,jk) >= 1. ) THEN
-                  zmskd3(ji,jj) = 0.e0
-               ELSE
-                  zmskd3(ji,jj) = 1.e0
+               IF( rrau(ji,jj,jk) <= 0.5 .OR. rrau(ji,jj,jk) >= 1. ) THEN   ;   zmskd3(ji,jj) = 0.e0
+               ELSE                                                         ;   zmskd3(ji,jj) = 1.e0
                ENDIF
             END DO
@@ -227 +217 @@
       WRITE(*,*) 'zdf_ddm: You should not have seen this print! error?', kt
    END SUBROUTINE zdf_ddm
+   SUBROUTINE zdf_ddm_init            ! Dummy routine
+   END SUBROUTINE zdf_ddm_init
 #endif