Changeset 789 for trunk/NEMO/OPA_SRC/ZDF/zdfbfr.F90

Timestamp:

2008-01-11T19:04:56+01:00 (17 years ago)

Author:

rblod

Message:

Suppress jki routines and associated key_mpp_omp

File:

• trunk/NEMO/OPA_SRC/ZDF/zdfbfr.F90 (modified) (8 diffs)

trunk/NEMO/OPA_SRC/ZDF/zdfbfr.F90

@@ -80 +80 @@
 
       CASE( 0 )                 ! no-slip boundary condition
-# 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)
@@ -93 +93 @@
                avmu(ji,jj,ikbu) = 2. * avmu(ji,jj,ikbum1)
                avmv(ji,jj,ikbv) = 2. * avmv(ji,jj,ikbvm1)
-# if ! defined key_vectopt_loop   ||   defined key_mpp_omp
+# if ! defined key_vectopt_loop
             END DO
 # endif
@@ -99 +99 @@
 
       CASE( 1 )                 ! linear botton friction
-# 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)
@@ -110 +110 @@
                avmu(ji,jj,ikbu) = bfri1 * fse3uw(ji,jj,ikbu)
                avmv(ji,jj,ikbv) = bfri1 * fse3vw(ji,jj,ikbv)
-# if ! defined key_vectopt_loop   ||   defined key_mpp_omp
+# if ! defined key_vectopt_loop
             END DO
 # endif
@@ -116 +116 @@
 
       CASE( 2 )                 ! quadratic botton friction
-# if defined key_vectopt_loop   &&   ! defined key_mpp_omp
+# if defined key_vectopt_loop
          jj = 1
 !CDIR NOVERRCHK
@@ -142 +142 @@
                avmu(ji,jj,ikbu) = bfri2 * zecu * fse3uw(ji,jj,ikbu)
                avmv(ji,jj,ikbv) = bfri2 * zecv * fse3vw(ji,jj,ikbv)
-# if ! defined key_vectopt_loop   ||   defined key_mpp_omp
+# if ! defined key_vectopt_loop
             END DO
 # endif
@@ -148 +148 @@
 
       CASE( 3 )                 ! free-slip boundary condition
-# 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)
@@ -159 +159 @@
                avmu(ji,jj,ikbu) = 0.e0
                avmv(ji,jj,ikbv) = 0.e0
-# if ! defined key_vectopt_loop   ||   defined key_mpp_omp
+# if ! defined key_vectopt_loop
             END DO
 # endif