Changeset 1197 for trunk/NEMO/TOP_SRC/TRP/trcbbl_adv.h90

Timestamp:

2008-09-22T10:03:39+02:00 (16 years ago)

Author:

cetlod

Message:

remove useless CPP key, key_mpp_omp in passive tracers transport routines, see ticket:49

File:

• trunk/NEMO/TOP_SRC/TRP/trcbbl_adv.h90 (modified) (17 diffs)

trunk/NEMO/TOP_SRC/TRP/trcbbl_adv.h90

@@ -110 +110 @@
       ! mbathy= number of w-level, minimum value=1 (cf dommsk.F)
 
-#if defined key_vectopt_loop   &&   ! defined key_mpp_omp
+#if defined key_vectopt_loop
       jj = 1
       DO ji = 1, jpij   ! vector opt. (forced unrolling)
@@ -124 +124 @@
             zunb(ji,jj) = un(ji,jj,mbku(ji,jj)) 
             zvnb(ji,jj) = vn(ji,jj,mbkv(ji,jj)) 
-#if ! defined key_vectopt_loop   ||   defined key_mpp_omp
+#if ! defined key_vectopt_loop
          END DO
 #endif
@@ -260 +260 @@
       ! partial steps correction   
       
-#if defined key_vectopt_loop   &&   ! defined key_mpp_omp
+#if defined key_vectopt_loop
        jj = 1
        DO ji = 1, jpij-jpi   ! vector opt. (forced unrolling)
@@ -280 +280 @@
                 v_trc_bbl(ji,jj,ikv) = zalphay(ji,jj) * vn(ji,jj,ikv) * ze3v / fse3v(ji,jj,ikv)       
              ENDIF
-#if ! defined key_vectopt_loop   ||   defined key_mpp_omp
+#if ! defined key_vectopt_loop
           END DO
 #endif
@@ -291 +291 @@
        ! if not partial step loop over the whole domain no lbc call
 
-#if defined key_vectopt_loop   &&   ! defined key_mpp_omp
+#if defined key_vectopt_loop
       jj = 1
       DO ji = 1, jpij   ! vector opt. (forced unrolling)
@@ -304 +304 @@
                v_trc_bbl(ji,jj,ikv) = zalphay(ji,jj) * vn(ji,jj,ikv)       
             ENDIF
-#if ! defined key_vectopt_loop   ||   defined key_mpp_omp
+#if ! defined key_vectopt_loop
          END DO
 #endif
@@ -313 +313 @@
        DO jn = 1, jptra
 
-#if defined key_vectopt_loop   &&   ! defined key_mpp_omp
+#if defined key_vectopt_loop
           jj = 1
           DO ji = 1, jpij   ! vector opt. (forced unrolling)
@@ -322 +322 @@
                 ik = mbkt(ji,jj)                               ! index of the bottom ocean T-level
                 ztrb(ji,jj) = trb(ji,jj,ik,jn) * tmask(ji,jj,1)    ! masked now T at the ocean bottom 
-#if ! defined key_vectopt_loop   ||   defined key_mpp_omp
+#if ! defined key_vectopt_loop
              END DO
 #endif
@@ -333 +333 @@
           ! ... Second order centered tracer flux at u and v-points
        
-# if defined key_vectopt_loop   &&   ! defined key_mpp_omp
+# if defined key_vectopt_loop
           jj = 1
           DO ji = 1, jpij-jpi   ! vector opt. (forced unrolling)
@@ -349 +349 @@
                 zwy(ji,jj) = ( ( zfvj + ABS( zfvj ) ) * ztrb(ji  ,jj  )   &
                    &          +( zfvj - ABS( zfvj ) ) * ztrb(ji  ,jj+1) ) * 0.5
-#if ! defined key_vectopt_loop   ||   defined key_mpp_omp
+#if ! defined key_vectopt_loop
              END DO
 #endif
           END DO
      
-# if defined key_vectopt_loop   &&   ! defined key_mpp_omp
+# if defined key_vectopt_loop
           jj = 1
           DO ji = jpi+2, jpij-jpi-1   ! vector opt. (forced unrolling)
@@ -369 +369 @@
                 ! add it to the general tracer trends
                 tra(ji,jj,ik,jn) = tra(ji,jj,ik,jn) + ztra
-#if ! defined key_vectopt_loop   ||   defined key_mpp_omp
+#if ! defined key_vectopt_loop
              END DO
 #endif
@@ -409 +409 @@
        IF( ln_zps ) THEN 
      
-# if defined key_vectopt_loop   &&   ! defined key_mpp_omp
+# if defined key_vectopt_loop
           jj = 1
           DO ji = 1, jpij-jpi   ! vector opt. (forced unrolling)
@@ -427 +427 @@
                 zwu(ji,jj) = zalphax(ji,jj) * e2u(ji,jj) * ze3u  
                 zwv(ji,jj) = zalphay(ji,jj) * e1v(ji,jj) * ze3v
-#if ! defined key_vectopt_loop   ||   defined key_mpp_omp
+#if ! defined key_vectopt_loop
              END DO
 #endif
@@ -434 +434 @@
        ELSE
 
-# if defined key_vectopt_loop   &&   ! defined key_mpp_omp
+# if defined key_vectopt_loop
           jj = 1
           DO ji = 1, jpij-jpi   ! vector opt. (forced unrolling)
@@ -445 +445 @@
                 zwu(ji,jj) = zalphax(ji,jj) * e2u(ji,jj) * fse3u(ji,jj,iku) 
                 zwv(ji,jj) = zalphay(ji,jj) * e1v(ji,jj) * fse3v(ji,jj,ikv) 
-#if ! defined key_vectopt_loop   ||   defined key_mpp_omp
+#if ! defined key_vectopt_loop 
              END DO
 #endif
@@ -451 +451 @@
        ENDIF
 
-# if defined key_vectopt_loop   &&   ! defined key_mpp_omp
+# if defined key_vectopt_loop
        jj = 1
        DO ji = jpi+2, jpij-jpi-1   ! vector opt. (forced unrolling)
@@ -467 +467 @@
                 &   ) / zbt
 
-# if ! defined key_vectopt_loop   ||   defined key_mpp_omp
+# if ! defined key_vectopt_loop
           END DO
 # endif