Changeset 7753 for trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zlim.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/p4zlim.F90 (modified) (6 diffs)

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

@@ -97 +97 @@
       IF( nn_timing == 1 )  CALL timing_start('p4z_lim')
       !
-!$OMP PARALLEL
-!$OMP DO schedule(static) private(jk,jj,ji,zno3,zferlim,zconcd,zconcd2,zconcn,zconcn2,z1_trbphy,z1_trbdia) &
-!$OMP& private(zconc1d,zconc1dnh4,zconc0n,zconc0nnh4,zdenom,zlim1,zlim2,zlim3,zlim4,zratio,zironmin)
       DO jk = 1, jpkm1
          DO jj = 1, jpj
@@ -176 +173 @@
          END DO
       END DO
-!$OMP END DO NOWAIT
 
       ! Compute the fraction of nanophytoplankton that is made of calcifiers
       ! --------------------------------------------------------------------
-!$OMP DO schedule(static) private(jk,jj,ji,zlim1,zlim2,zlim3,ztem1,ztem2,zetot1,zetot2)
       DO jk = 1, jpkm1
          DO jj = 1, jpj
@@ -204 +199 @@
          END DO
       END DO
-!$OMP END DO NOWAIT
-      !
-!$OMP DO schedule(static) private(jk,jj,ji)
+      !
       DO jk = 1, jpkm1
          DO jj = 1, jpj
@@ -217 +210 @@
          END DO
       END DO
-!$OMP END PARALLEL
       !
       IF( lk_iomput .AND. knt == nrdttrc ) THEN        ! save output diagnostics
@@ -249 +241 @@
          &                xksi1, xksi2, xkdoc, qnfelim, qdfelim, caco3r, oxymin
       INTEGER :: ios                 ! Local integer output status for namelist read
-      INTEGER  ::   ji, jj, jk
 
       REWIND( numnatp_ref )              ! Namelist nampislim in reference namelist : Pisces nutrient limitation parameters
@@ -286 +277 @@
       ENDIF
       !
-!$OMP PARALLEL DO schedule(static) private(jk,jj,ji)
-      DO jk = 1, jpkm1
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               nitrfac (ji,jj,jk) = 0._wp
-            END DO
-         END DO
-      END DO
+      nitrfac (:,:,:) = 0._wp
       !
    END SUBROUTINE p4z_lim_init