Changeset 563 for trunk/NEMO/OFF_SRC/TRA

Timestamp:

2006-11-13T14:34:05+01:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_bugfix_075:CE:change key_autotasking to key_mpp_omp

File:

• trunk/NEMO/OFF_SRC/TRA/zpshde.F90 (modified) (7 diffs)

trunk/NEMO/OFF_SRC/TRA/zpshde.F90

@@ -2 +2 @@
    !!==============================================================================
    !!                       ***  MODULE zpshde   ***
-   !! Ocean active tracers: 
+   !! z-coordinate - partial step : Horizontal Derivative
    !!==============================================================================
-#if defined key_partial_steps || defined key_esopa
-   !!----------------------------------------------------------------------
-   !!   'key_partial_steps' :               z-coordinate with partial steps
+   
    !!----------------------------------------------------------------------
    !!   zps_hde      :  Horizontal DErivative of T, S and rd at the last
    !!                   ocean level (Z-coord. with Partial Steps)
-   !!----------------------------------------------------------------------
-   !!   OPA 9.0 , LOCEAN-IPSL  (2005)
-   !!   $Header$
-   !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt
    !!----------------------------------------------------------------------
    !! * Modules used
@@ -37 +31 @@
 #  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
-
+   !!----------------------------------------------------------------------
+   !!  OPA 9.0 , LOCEAN-IPSL (2005) 
+   !! $Header$ 
+   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
+   !!----------------------------------------------------------------------
 CONTAINS
 
@@ -132 +130 @@
 
       ! Interpolation of T and S at the last ocean level
-# if defined key_vectopt_loop   &&   ! defined key_autotasking
+# if defined key_vectopt_loop   &&   ! defined key_mpp_omp
          jj = 1
          DO ji = 1, jpij-jpi   ! vector opt. (forced unrolled)
@@ -195 +193 @@
                pgsv(ji,jj) = vmask(ji,jj,1) * ( psal(ji,jj+1,ikv) - zsj(ji,jj) )
             ENDIF
-# if ! defined key_vectopt_loop   ||   defined key_autotasking
+# if ! defined key_vectopt_loop   ||   defined key_mpp_omp
          END DO
 # endif
@@ -207 +205 @@
 
       ! Gradient of density at the last level 
-# if defined key_vectopt_loop   &&   ! defined key_autotasking
+# if defined key_vectopt_loop   &&   ! defined key_mpp_omp
          jj = 1
          DO ji = 1, jpij-jpi   ! vector opt. (forced unrolled)
@@ -228 +226 @@
                pgrv(ji,jj) = vmask(ji,jj,1) * ( prd(ji,jj+1,ikv) - zrj(ji,jj) )
             ENDIF
-# if ! defined key_vectopt_loop   ||   defined key_autotasking
+# if ! defined key_vectopt_loop   ||   defined key_mpp_omp
          END DO
 # endif
@@ -240 +238 @@
    END SUBROUTINE zps_hde
 
-#else
-   !!----------------------------------------------------------------------
-   !!   Default option                                         Empty module
-   !!----------------------------------------------------------------------
-   USE par_kind
-CONTAINS
-   SUBROUTINE zps_hde ( kt, ptem, psal, prd ,   &      ! Empty routine
-                            pgtu, pgsu, pgru,   &
-                            pgtv, pgsv, pgrv  )
-      REAL(wp), DIMENSION(:,:,:) :: ptem, psal, prd
-      REAL(wp) :: pgtu, pgsu, pgru, pgtv, pgsv, pgrv
-      WRITE(*,*) 'zps_hde: You should not have seen this print! error?',   &
-         kt, ptem, psal, prd, pgtu, pgsu, pgru, pgtv, pgsv, pgrv
-   END SUBROUTINE zps_hde
-#endif
-
    !!======================================================================
 END MODULE zpshde