Changeset 786 for branches/dev_001_GM/NEMO/OPA_SRC/TRA/trazdf.F90

Timestamp:

2008-01-10T18:11:23+01:00 (16 years ago)

Author:

gm

Message:

dev_001_GM - merge TRC-TRA on OPA only, trabbl & zpshde not done and trdmld not OK - compilation OK

File:

• branches/dev_001_GM/NEMO/OPA_SRC/TRA/trazdf.F90 (modified) (7 diffs)

branches/dev_001_GM/NEMO/OPA_SRC/TRA/trazdf.F90

@@ -14 +14 @@
    USE dom_oce         ! ocean space and time domain variables 
    USE zdf_oce         ! ocean vertical physics variables
+   USE zdfddm          ! vertical mixing: double diffusion
 
    USE trazdf_exp      ! vertical diffusion: explicit (tra_zdf_exp     routine)
    USE trazdf_imp      ! vertical diffusion: implicit (tra_zdf_imp     routine)
-   USE trazdf_imp_jki  ! vertical diffusion  implicit (tra_zdf_imp_jki routine)
 
    USE ldftra_oce      ! ocean active tracers: lateral physics
@@ -47 +47 @@
 #  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
-   !!  OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Header$ 
+   !! NEMO/OPA 2.4 , LOCEAN-IPSL (2008) 
+   !! $Id:$ 
    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -84 +84 @@
       SELECT CASE ( nzdf )                       ! compute lateral mixing trend and add it to the general trend
       CASE ( -1 )                                       ! esopa: test all possibility with control print
-         CALL tra_zdf_exp    ( kt, r2dt )
+         CALL tra_zdf_exp    ( kt, r2dt,   avt       , tb, ta )   ! temperature
+         CALL tra_zdf_exp    ( kt, r2dt, fsavs(:,:,:), tb, ta )   ! salinity
          CALL prt_ctl( tab3d_1=ta, clinfo1=' zdf0 - Ta: ', mask1=tmask,               &
             &          tab3d_2=sa, clinfo2=       ' Sa: ', mask2=tmask, clinfo3='tra' )
-         CALL tra_zdf_imp    ( kt, r2dt )
-         CALL prt_ctl( tab3d_1=ta, clinfo1=' zdf1 - Ta: ', mask1=tmask,               &
-            &          tab3d_2=sa, clinfo2=       ' Sa: ', mask2=tmask, clinfo3='tra' )
-         CALL tra_zdf_imp_jki( kt, r2dt )
-         CALL prt_ctl( tab3d_1=ta, clinfo1=' zdf2 - Ta: ', mask1=tmask,               &
-            &          tab3d_2=sa, clinfo2=       ' Sa: ', mask2=tmask, clinfo3='tra' )
+         CALL tra_zdf_imp( kt, r2dt, 'TRA' )                      ! T & S zdf trends
 
       CASE ( 0 )                                       ! explicit scheme
-         CALL tra_zdf_exp    ( kt, r2dt )
-         IF( l_trdtra )   THEN                         ! save the vertical diffusive trends for further diagnostics
+         CALL tra_zdf_exp    ( kt, r2dt,   avt       , tb, ta )   ! temperature
+         CALL tra_zdf_exp    ( kt, r2dt, fsavs(:,:,:), tb, ta )   ! salinity
+         IF( l_trdtra )   THEN                                    ! zdf trends diagnostics
             ztrdt(:,:,:) = ta(:,:,:) - ztrdt(:,:,:)
             ztrds(:,:,:) = sa(:,:,:) - ztrds(:,:,:)
-            CALL trd_mod( ztrdt, ztrds, jptra_trd_zdf, 'TRA', kt )
+            CALL trd_tra( kt, jp_tem, jpt_trd_ldf, 'TRA', ptrd3d=ztrdt)
+            CALL trd_tra( kt, jp_sal, jpt_trd_ldf, 'TRA', ptrd3d=ztrds)
          ENDIF
 
-      CASE ( 1 )                                       ! implicit scheme (k-j-i loop)
-         CALL tra_zdf_imp    ( kt, r2dt )
-         IF( l_trdtra )   THEN                         ! save the vertical diffusive trends for further diagnostics
+      CASE ( 1 )                                       ! implicit scheme
+         CALL tra_zdf_imp( kt, r2dt, 'TRA' )                      ! T & S zdf trends
+         IF( l_trdtra )   THEN                                    ! zdf trends diagnostics
             DO jk = 1, jpkm1
                ztrdt(:,:,jk) = ( ( ta(:,:,jk) - tb(:,:,jk) ) / r2dt(jk) ) - ztrdt(:,:,jk)
                ztrds(:,:,jk) = ( ( sa(:,:,jk) - sb(:,:,jk) ) / r2dt(jk) ) - ztrds(:,:,jk)
             END DO
-            CALL trd_mod( ztrdt, ztrds, jptra_trd_zdf, 'TRA', kt )
-         ENDIF
-
-      CASE ( 2 )                                       ! implicit scheme (j-k-i loop)
-         CALL tra_zdf_imp_jki( kt, r2dt )
-         IF( l_trdtra )   THEN                         ! save the vertical diffusive trends for further diagnostics
-            DO jk = 1, jpkm1
-               ztrdt(:,:,jk) = ( ( ta(:,:,jk) - tb(:,:,jk) ) / r2dt(jk) ) - ztrdt(:,:,jk)
-               ztrds(:,:,jk) = ( ( sa(:,:,jk) - sb(:,:,jk) ) / r2dt(jk) ) - ztrds(:,:,jk)
-            END DO
-            CALL trd_mod( ztrdt, ztrds, jptra_trd_zdf, 'TRA', kt )
+            CALL trd_tra( kt, jp_tem, jpt_trd_zdf, 'TRA', ptrd3d=ztrdt)
+            CALL trd_tra( kt, jp_sal, jpt_trd_zdf, 'TRA', ptrd3d=ztrds)
          ENDIF
 
@@ -127 +116 @@
       IF(ln_ctl)   CALL prt_ctl( tab3d_1=ta, clinfo1=' zdf  - Ta: ', mask1=tmask,               &
          &                       tab3d_2=sa, clinfo2=       ' Sa: ', mask2=tmask, clinfo3='tra' )
-
+      !
    END SUBROUTINE tra_zdf
 
@@ -153 +142 @@
 
       ! Choice from ln_zdfexp already read in namelist in zdfini module
-      IF( ln_zdfexp ) THEN               ! use explicit scheme
-         nzdf = 0
-      ELSE                               ! use implicit scheme
-         nzdf = 1
+      IF( ln_zdfexp ) THEN   ;   nzdf = 0              ! use explicit scheme
+      ELSE                   ;   nzdf = 1              ! use implicit scheme
       ENDIF
 
@@ -169 +156 @@
       ENDIF
 
-      ! NEC autotasking / OpenMP
-#if defined key_mpp_omp
-      IF( nzdf == 1 )   nzdf = 2                       ! j-k-i loop
-#endif
-
       ! Test: esopa
       IF( lk_esopa )    nzdf = -1                      ! All schemes used
@@ -184 +166 @@
          IF( nzdf ==  0 )   WRITE(numout,*) '              Explicit time-splitting scheme'
          IF( nzdf ==  1 )   WRITE(numout,*) '              Implicit (euler backward) scheme'
-         IF( nzdf ==  2 )   WRITE(numout,*) '              Implicit (euler backward) scheme with j-k-i loops'
       ENDIF