Changeset 7525 for branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/step.F90

Timestamp:

2017-01-04T17:47:47+01:00 (7 years ago)

Author:

mocavero

Message:

changes after review

File:

• branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) (3 diffs)

branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -73 +73 @@
       !!              -8- Outputs and diagnostics
       !!----------------------------------------------------------------------
-      INTEGER ::   jk, jj, ji, jt       ! dummy loop indice
+      INTEGER ::   jn, jk, jj, ji       ! dummy loop indice
       INTEGER ::   indic    ! error indicator if < 0
       INTEGER ::   kcall    ! optional integer argument (dom_vvl_sf_nxt)
@@ -202 +202 @@
                &                                          rhd, gru , grv , grui, grvi   )  ! of t, s, rd at the first ocean level
 !!jc: fs simplification
-!$OMP PARALLEL
-!$OMP 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
+!$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
-!$OMP END DO NOWAIT
-!$OMP DO schedule(static) private(jt, jk, jj, ji)
-         DO jt = 1, jpts
-            DO jk = 1, jpk
-               DO jj = 1, jpj
-                  DO ji = 1, jpi
-                     tsa(ji,jj,jk,jt) = 0._wp         ! set tracer trends to zero
-                  END DO
-               END DO
-            END DO
-         END DO
-!$OMP END PARALLEL
+      END DO
       IF(  lk_asminc .AND. ln_asmiau .AND. ln_dyninc )   &
                &         CALL dyn_asm_inc   ( kstp )  ! apply dynamics assimilation increment
@@ -276 +263 @@
       ! 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
       IF(  lk_asminc .AND. ln_asmiau .AND. &
          & ln_trainc )   CALL tra_asm_inc   ( kstp )  ! apply tracer assimilation increment