Changeset 463 for trunk/NEMO/OPA_SRC/ZDF/zdfevd.F90

Timestamp:

2006-05-10T19:26:55+02:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_update_054:RB: take into account tracers and dynamics reorganization, change atsk to jki

File:

• trunk/NEMO/OPA_SRC/ZDF/zdfevd.F90 (modified) (3 diffs)

trunk/NEMO/OPA_SRC/ZDF/zdfevd.F90

@@ -73 +73 @@
       avmu_evd (:,:,:) = avmu(:,:,:) 
 
-      SELECT CASE ( nevdm )
+      SELECT CASE ( n_evdm )
  
       CASE ( 1 )           ! enhance vertical eddy viscosity and diffusivity (if rn2<-1.e-12)
@@ -79 +79 @@
          DO jk = 1, jpkm1                                 ! Horizontal slab
             !                                             ! ===============
-#   if defined key_vectopt_loop   &&   ! defined key_autotasking
+#   if defined key_vectopt_loop   &&   ! defined key_mpp_omp
 !!!         WHERE( rn2(:,:,jk) <= -1.e-12 ) avt(:,:,jk) = tmask(:,:,jk) * avevd   ! agissant sur T SEUL!
             jj = 1                     ! big loop forced
@@ -129 +129 @@
             !                                             ! ===============
 !!!         WHERE( rn2(:,:,jk) <= -1.e-12 ) avt(:,:,jk) = tmask(:,:,jk) * avevd   ! agissant sur T SEUL! 
-#   if defined key_vectopt_loop   &&   ! defined key_autotasking
+#   if defined key_vectopt_loop   &&   ! defined key_mpp_omp
             jj = 1                     ! big loop forced
             DO ji = 1, jpij