Changeset 7525 for branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/TOP_SRC/trcini.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/TOP_SRC/trcini.F90 (modified) (3 diffs)

branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/TOP_SRC/trcini.F90

@@ -119 +119 @@
 !$OMP PARALLEL DO schedule(static) private(jk)
       DO jk = 1, jpk
-         cvol(:,:,jk) = e1e2t(:,:) * e3t_n(:,:,jk) * tmask(:,:,jk)
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+               cvol(ji,jj,jk) = e1e2t(ji,jj) * e3t_n(ji,jj,jk) * tmask(ji,jj,jk)
+            END DO
+         END DO
       END DO
       IF( lk_degrad ) THEN  
 !$OMP PARALLEL DO schedule(static) private(jk,jj,ji)
-      DO jk = 1, jpk
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               cvol(ji,jj,jk) = cvol(ji,jj,jk) * facvol(ji,jj,jk)    ! degrad option: reduction by facvol
+         DO jk = 1, jpk
+            DO jj = 1, jpj
+               DO ji = 1, jpi
+                  cvol(ji,jj,jk) = cvol(ji,jj,jk) * facvol(ji,jj,jk)    ! degrad option: reduction by facvol
+               END DO
             END DO
          END DO
-      END DO
       END IF
       !                                                              ! total volume of the ocean 
@@ -255 +259 @@
         ENDIF
         !
+!$OMP PARALLEL DO schedule(static) private(jn,jk,jj,ji)
       DO jn = 1, jptra
-!$OMP PARALLEL DO schedule(static) private(jk,jj,ji)
          DO jk = 1, jpk
             DO jj = 1, jpj
@@ -268 +272 @@
       ENDIF
  
+!$OMP PARALLEL DO schedule(static) private(jn,jk,jj,ji)
       DO jn = 1, jptra
-!$OMP PARALLEL DO schedule(static) private(jk,jj,ji)
          DO jk = 1, jpk
             DO jj = 1, jpj