Changeset 7753 for trunk/NEMOGCM/NEMO/OPA_SRC/step.F90

Timestamp:

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

Author:

mocavero

Message:

Reverting trunk to remove OpenMP

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) (4 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -74 +74 @@
       !!              -8- Outputs and diagnostics
       !!----------------------------------------------------------------------
-      INTEGER ::   ji,jj,jk,jn ! dummy loop indice
+      INTEGER ::   ji,jj,jk ! dummy loop indice
       INTEGER ::   indic    ! error indicator if < 0
       INTEGER ::   kcall    ! optional integer argument (dom_vvl_sf_nxt)
@@ -135 +135 @@
       !
       IF( lk_zdfcst  ) THEN                                ! Constant Kz (reset avt, avm[uv] to the background value)
-!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
-         DO jk = 1, jpk
-            DO jj = 1, jpj
-               DO ji = 1, jpi
-                  avt (ji,jj,jk) = rn_avt0 * wmask (ji,jj,jk)
-                  avmu(ji,jj,jk) = rn_avm0 * wumask(ji,jj,jk)
-                  avmv(ji,jj,jk) = rn_avm0 * wvmask(ji,jj,jk)
-               END DO
-            END DO
-         END DO
+         avt (:,:,:) = rn_avt0 * wmask (:,:,:)
+         avmu(:,:,:) = rn_avm0 * wumask(:,:,:)
+         avmv(:,:,:) = rn_avm0 * wvmask(:,:,:)
       ENDIF
 
       IF( ln_rnf_mouth ) THEN                         ! increase diffusivity at rivers mouths
-!$OMP PARALLEL DO schedule(static) private(jk,jj,ji)
-         DO jk = 2, nkrnf
-            DO jj = 1, jpj
-               DO ji = 1, jpi
-                  avt(ji,jj,jk) = avt(ji,jj,jk) + 2._wp * rn_avt_rnf * rnfmsk(ji,jj) * tmask(ji,jj,jk)
-               END DO
-            END DO
-         END DO
+         DO jk = 2, nkrnf   ;   avt(:,:,jk) = avt(:,:,jk) + 2._wp * rn_avt_rnf * rnfmsk(:,:) * tmask(:,:,jk)   ;   END DO
       ENDIF
       IF( ln_zdfevd  )   CALL zdf_evd( kstp )         ! enhanced vertical eddy diffusivity
@@ -211 +197 @@
                &                                          rhd, gru , grv , grui, grvi   )  ! of t, s, rd at the first ocean level
 !!jc: fs simplification
-!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
-         DO jk = 1, jpk
-            DO jj = 1, jpj
-               DO ji = 1, jpi
-                  ua(ji,jj,jk) = 0._wp            ! set dynamics trends to zero
-                  va(ji,jj,jk) = 0._wp
-               END DO
-            END DO
-         END DO
+                            
+                         ua(:,:,:) = 0._wp            ! set dynamics trends to zero
+                         va(:,:,:) = 0._wp
 
       IF(  lk_asminc .AND. ln_asmiau .AND. ln_dyninc )   &
@@ -272 +252 @@
       ! Active tracers                              
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-      DO jn = 1, jpts
-!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
-         DO jk = 1, jpk
-            DO jj = 1, jpj
-               DO ji = 1, jpi
-                  tsa(ji,jj,jk,jn) = 0._wp         ! set tracer trends to zero
-               END DO
-            END DO
-         END DO
-      END DO
+                         tsa(:,:,:,:) = 0._wp         ! set tracer trends to zero
 
       IF(  lk_asminc .AND. ln_asmiau .AND. &