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

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

@@ -116 +116 @@
             CALL fld_read( kt, 1, sf_dust )
             IF( nn_ice_tr == -1 .AND. .NOT. ln_ironice ) THEN
-!$OMP PARALLEL DO schedule(static) private(jj, ji)
-               DO jj = 1, jpj
-                  DO ji = 1, jpi
-                     dust(ji,jj) = sf_dust(1)%fnow(ji,jj,1)
-                  END DO
-               END DO
+               dust(:,:) = sf_dust(1)%fnow(:,:,1)
             ELSE
-!$OMP PARALLEL DO schedule(static) private(jj, ji)
-               DO jj = 1, jpj
-                  DO ji = 1, jpi
-                     dust(ji,jj) = sf_dust(1)%fnow(ji,jj,1) * ( 1.0 - fr_i(ji,jj) )
-                  END DO
-               END DO
+               dust(:,:) = sf_dust(1)%fnow(:,:,1) * ( 1.0 - fr_i(:,:) )
             ENDIF
          ENDIF
@@ -136 +126 @@
          IF( kt == nit000 .OR. ( kt /= nit000 .AND. ntimes_solub > 1 ) ) THEN
             CALL fld_read( kt, 1, sf_solub )
-!$OMP PARALLEL DO schedule(static) private(jj, ji)
-            DO jj = 1, jpj
-               DO ji = 1, jpi
-                  solub(ji,jj) = sf_solub(1)%fnow(ji,jj,1)
-               END DO
-            END DO
+            solub(:,:) = sf_solub(1)%fnow(:,:,1)
          ENDIF
       ENDIF
@@ -152 +137 @@
             CALL fld_read( kt, 1, sf_river )
             IF( ln_p4z ) THEN
-!$OMP PARALLEL DO schedule(static) private(jj, ji, zcoef)
                DO jj = 1, jpj
                   DO ji = 1, jpi
@@ -169 +153 @@
                END DO
             ELSE    !  ln_p5z
-!$OMP PARALLEL DO schedule(static) private(jj, ji, zcoef)
                DO jj = 1, jpj
                   DO ji = 1, jpi
@@ -196 +179 @@
       IF( ln_ndepo ) THEN
          IF( kt == nit000 .OR. ( kt /= nit000 .AND. ntimes_ndep > 1 ) ) THEN
-            zcoef = rno3 * 14E6 * ryyss
-            CALL fld_read( kt, 1, sf_ndepo )
-!$OMP PARALLEL DO schedule(static) private(jj, ji)
-            DO jj = 1, jpj
-               DO ji = 1, jpi
-                  nitdep(ji,jj) = sf_ndepo(1)%fnow(ji,jj,1) / zcoef / e3t_n(ji,jj,1)
-               END DO
-            END DO
+             zcoef = rno3 * 14E6 * ryyss
+             CALL fld_read( kt, 1, sf_ndepo )
+             nitdep(:,:) = sf_ndepo(1)%fnow(:,:,1) / zcoef / e3t_n(:,:,1) 
          ENDIF
          IF( .NOT.ln_linssh ) THEN
-            zcoef = rno3 * 14E6 * ryyss
-!$OMP PARALLEL DO schedule(static) private(jj, ji)
-            DO jj = 1, jpj
-               DO ji = 1, jpi
-                  nitdep(ji,jj) = sf_ndepo(1)%fnow(ji,jj,1) / zcoef / e3t_n(ji,jj,1)
-               END DO
-            END DO
+           zcoef = rno3 * 14E6 * ryyss
+           nitdep(:,:) = sf_ndepo(1)%fnow(:,:,1) / zcoef / e3t_n(:,:,1) 
          ENDIF
       ENDIF
@@ -319 +292 @@
       ! online configuration : computed in sbcrnf
       IF( l_offline ) THEN
-!$OMP PARALLEL DO schedule(static) private(jj, ji)
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               nk_rnf(ji,jj) = 1
-               h_rnf (ji,jj) = gdept_n(ji,jj,1)
-            END DO
-         END DO
+        nk_rnf(:,:) = 1
+        h_rnf (:,:) = gdept_n(:,:,1)
       ENDIF
 
@@ -498 +466 @@
          IF (lwp) WRITE(numout,*) ' Level corresponding to 50m depth ',  ik50,' ', gdept_1d(ik50+1)
          IF (lwp) WRITE(numout,*)
-!$OMP PARALLEL DO schedule(static) private(jk, jj, ji, zmaskt)
          DO jk = 1, ik50
             DO jj = 2, jpjm1
@@ -513 +480 @@
          CALL lbc_lnk( zcmask , 'T', 1. )      ! lateral boundary conditions on cmask   (sign unchanged)
          !
-!$OMP PARALLEL
-!$OMP DO schedule(static) private(jk, jj, ji, zexpide, zdenitide)
          DO jk = 1, jpk
             DO jj = 1, jpj
@@ -524 +489 @@
             END DO
          END DO
-!$OMP END DO NOWAIT
          ! Coastal supply of iron
          ! -------------------------
-!$OMP DO schedule(static) private(jj,ji)
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               ironsed(ji,jj,jpk) = 0._wp
-            END DO
+         ironsed(:,:,jpk) = 0._wp
+         DO jk = 1, jpkm1
+            ironsed(:,:,jk) = sedfeinput * zcmask(:,:,jk) / ( e3t_0(:,:,jk) * rday )
          END DO
-!$OMP DO schedule(static) private(jk,jj,ji)
-         DO jk = 1, jpkm1
-            DO jj = 1, jpj
-               DO ji = 1, jpi
-                  ironsed(ji,jj,jk) = sedfeinput * zcmask(ji,jj,jk) / ( e3t_0(ji,jj,jk) * rday )
-               END DO
-            END DO
-         END DO
-!$OMP END PARALLEL
          DEALLOCATE( zcmask)
       ENDIF