Changeset 7753 for trunk/NEMOGCM/NEMO/LIM_SRC_3/limupdate1.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/limupdate1.F90 (modified) (4 diffs)

trunk/NEMOGCM/NEMO/LIM_SRC_3/limupdate1.F90

@@ -70 +70 @@
       ! ice concentration should not exceed amax 
       !-----------------------------------------------------
-!$OMP PARALLEL
-!$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
+      at_i(:,:) = 0._wp
       DO jl = 1, jpl
-!$OMP DO schedule(static) private(jj, ji)
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               at_i(ji,jj) = a_i(ji,jj,jl) + at_i(ji,jj)
-            END DO
-         END DO
+         at_i(:,:) = a_i(:,:,jl) + at_i(:,:)
       END DO
 
       DO jl  = 1, jpl
-!$OMP DO schedule(static) private(jj, ji)
          DO jj = 1, jpj
             DO ji = 1, jpi
@@ -97 +85 @@
          END DO
       END DO
-!$OMP END PARALLEL
     
       !---------------------
@@ -104 +91 @@
       IF (  nn_icesal == 2  ) THEN 
          DO jl = 1, jpl
-!$OMP PARALLEL DO schedule(static) private(jj,ji,zsal,rswitch)
             DO jj = 1, jpj 
                DO ji = 1, jpi
@@ -132 +118 @@
       ! -------------------------------------------------
       DO jl  = 1, jpl
-!$OMP PARALLEL DO schedule(static) private(jj, ji)
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               afx_dyn(ji,jj) = afx_dyn(ji,jj) + ( a_i(ji,jj,jl) - a_i_b(ji,jj,jl) ) * r1_rdtice
-            END DO
-         END DO
+         afx_dyn(:,:) = afx_dyn(:,:) + ( a_i(:,:,jl) - a_i_b(:,:,jl) ) * r1_rdtice
       END DO
 
-!$OMP PARALLEL DO schedule(static) private(jj, ji)
       DO jj = 1, jpj
          DO ji = 1, jpi