Changeset 7753 for trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zint.F90

Timestamp:

2017-03-03T12:46:59+01:00 (7 years ago)

Author:

mocavero

Message:

Reverting trunk to remove OpenMP

File:

• trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zint.F90 (modified) (4 diffs)

trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zint.F90

@@ -21 +21 @@
    !!----------------------------------------------------------------------
    !! NEMO/TOP 3.3 , NEMO Consortium (2010)
-   !! $Id$
+   !! $Id$ 
    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -36 +36 @@
       INTEGER, INTENT( in ) ::   kt      ! ocean time-step index
       !
-      INTEGER  :: ji, jj, jk             ! dummy loop indices
+      INTEGER  :: ji, jj                 ! dummy loop indices
       REAL(wp) :: zvar                   ! local variable
       !!---------------------------------------------------------------------
@@ -44 +44 @@
       ! Computation of phyto and zoo metabolic rate
       ! -------------------------------------------
-!$OMP PARALLEL
-!$OMP DO schedule(static) private(jk,jj,ji)
-      DO jk = 1, jpk
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               tgfunc (ji,jj,jk) = EXP( 0.063913 * tsn(ji,jj,jk,jp_tem) )
-               tgfunc2(ji,jj,jk) = EXP( 0.07608  * tsn(ji,jj,jk,jp_tem) )
-            END DO
-         END DO
-      END DO
+      tgfunc (:,:,:) = EXP( 0.063913 * tsn(:,:,:,jp_tem) )
+      tgfunc2(:,:,:) = EXP( 0.07608  * tsn(:,:,:,jp_tem) )
 
       ! Computation of the silicon dependant half saturation  constant for silica uptake
       ! ---------------------------------------------------
-!$OMP DO schedule(static) private(jj,ji,zvar)
       DO ji = 1, jpi
          DO jj = 1, jpj
@@ -66 +57 @@
       !
       IF( nday_year == nyear_len(1) ) THEN
-!$OMP DO schedule(static) private(jj,ji)
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               xksi   (ji,jj) = xksimax(ji,jj)
-               xksimax(ji,jj) = 0._wp
-            END DO
-         END DO
+         xksi   (:,:) = xksimax(:,:)
+         xksimax(:,:) = 0._wp
       ENDIF
-!$OMP END PARALLEL
       !
       IF( nn_timing == 1 )  CALL timing_stop('p4z_int')