Changeset 461 for trunk/NEMO/OPA_SRC/LDF/ldfeiv.F90

Timestamp:

2006-05-10T19:15:54+02:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_update_052:RB: update lateral diffusion computation following the reorganization of both dynamics and tracers

File:

• trunk/NEMO/OPA_SRC/LDF/ldfeiv.F90 (modified) (6 diffs)

trunk/NEMO/OPA_SRC/LDF/ldfeiv.F90

@@ -10 +10 @@
    !!----------------------------------------------------------------------
    !!   ldf_eiv      : compute the eddy induced velocity coefficients
-   !!                  Same results but not same routine if 'key_autotasking'
+   !!                  Same results but not same routine if 'key_mpp_omp'
    !!                  is defined or not
    !!----------------------------------------------------------------------
@@ -41 +41 @@
 CONTAINS
 
-# if defined key_autotasking
-   !!----------------------------------------------------------------------
-   !!   'key_autotasking' :                            autotasking (j-slab)
+# if defined key_mpp_omp
+   !!----------------------------------------------------------------------
+   !!   'key_mpp_omp' :                  OpenMP /  NEC autotasking (j-slab)
    !!----------------------------------------------------------------------
 
@@ -79 +79 @@
          IF(lwp) WRITE(numout,*)
          IF(lwp) WRITE(numout,*) 'ldf_eiv : eddy induced velocity coefficients'
-         IF(lwp) WRITE(numout,*) '~~~~~~~   key_autotasking'
+         IF(lwp) WRITE(numout,*) '~~~~~~~   NEC autotasking / OpenMP : j-slab'
       ENDIF
       
@@ -176 +176 @@
                zaht      = ( 1. -  MIN( 1., ABS( ff(ji,jj) / zf20 ) ) ) * ( aht0 - zaht_min )  &
                   &      + aht0 * upsrnfh(ji,jj)                          ! enhanced near river mouths
-               ahtu(ji,jj) = MAX( MAX( zaht_min, aeiu(ji,jj) ) + zaht, aht0 )
-               ahtv(ji,jj) = MAX( MAX( zaht_min, aeiv(ji,jj) ) + zaht, aht0 )
-               ahtw(ji,jj) = MAX( MAX( zaht_min, aeiw(ji,jj) ) + zaht, aht0 )
+               ahtu(ji,jj) = MAX( zaht_min, aeiu(ji,jj) ) + zaht
+               ahtv(ji,jj) = MAX( zaht_min, aeiv(ji,jj) ) + zaht
+               ahtw(ji,jj) = MAX( zaht_min, aeiw(ji,jj) ) + zaht
             END DO
          END DO
@@ -249 +249 @@
 
       DO jk = 1, jpk
-#  if defined key_vectopt_loop  &&  ! defined key_autotasking
+#  if defined key_vectopt_loop  &&  ! defined key_mpp_omp
 !CDIR NOVERRCHK 
          DO ji = 1, jpij   ! vector opt.
@@ -360 +360 @@
          ENDIF
       ENDIF
-      
+
       IF( aeiv0 == 0.e0 ) THEN
          aeiu(:,:) = 0.e0