Changeset 7753 for trunk/NEMOGCM/NEMO/LIM_SRC_3/limthd_da.F90

Timestamp:

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

Author:

mocavero

Message:

Reverting trunk to remove OpenMP

File:

• trunk/NEMOGCM/NEMO/LIM_SRC_3/limthd_da.F90 (modified) (3 diffs)

trunk/NEMOGCM/NEMO/LIM_SRC_3/limthd_da.F90

@@ -113 +113 @@
       zastar = 1._wp / ( 1._wp - (rn_dmin / zdmax)**(1._wp/rn_beta) )
       
-!$OMP PARALLEL
-!$OMP DO schedule(static) private(jj,ji,zdfloe,zperi,zwlat)
       DO jj = 1, jpj
          DO ji = 1, jpi
@@ -137 +135 @@
       !---------------------------------------------------------------------------------------------!
       DO jl = jpl, 1, -1
-!$OMP DO schedule(static) private(jj,ji,rswitch,zda)
          DO jj = 1, jpj
             DO ji = 1, jpi
@@ -166 +163 @@
       
       ! total concentration
-!$OMP DO schedule(static) private(jj,ji)
-      DO jj = 1, jpj
-         DO ji = 1, jpi
-            at_i(ji,jj) = 0._wp
-         END DO
-      END DO
-      DO jl = 1, jpl
-!$OMP DO schedule(static) private(jj,ji)
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               at_i(ji,jj) = at_i(ji,jj) + a_i(ji,jj,jl)
-            END DO
-         END DO
-      END DO
+      at_i(:,:) = SUM( a_i(:,:,:), dim=3 )
+      
       ! --- ensure that ht_i = 0 where a_i = 0 ---
-      DO jl = 1, jpl
-!$OMP DO schedule(static) private(jj,ji)
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               IF(a_i(ji,jj,jl)  == 0._wp) ht_i(ji,jj,jl) = 0._wp
-            END DO
-         END DO
-      END DO
-!$OMP END PARALLEL
-
+      WHERE( a_i == 0._wp ) ht_i = 0._wp
       !
       CALL wrk_dealloc( jpi,jpj, zda_tot )