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

branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn.F90

@@ -160 +160 @@
             IF(lwp) WRITE(numout,*) '          momentum mixing coef. = constant '
 !$OMP PARALLEL DO schedule(static) private(jk,jj,ji)
-      DO jk = 1, jpk
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               ahmt(ji,jj,jk) = zah0 * tmask(ji,jj,jk)
-               ahmf(ji,jj,jk) = zah0 * fmask(ji,jj,jk)
-            END DO
-         END DO
-      END DO
-            !
+               DO jk = 1, jpk
+                  DO jj = 1, jpj
+                     DO ji = 1, jpi
+                        ahmt(ji,jj,jk) = zah0 * tmask(ji,jj,jk)
+                        ahmf(ji,jj,jk) = zah0 * fmask(ji,jj,jk)
+                     END DO
+                  END DO
+               END DO
+               !
          CASE(  10  )      !==  fixed profile  ==!
             IF(lwp) WRITE(numout,*) '          momentum mixing coef. = F( depth )'
@@ -189 +189 @@
 !!              do we introduce a scaling by the max value of the array, and then multiply by zah0 ????
 !!              better:  check that the max is <=1  i.e. it is a shape from 0 to 1, not a coef that has physical dimension
-!$OMP PARALLEL DO schedule(static) private(jk)
+!$OMP PARALLEL DO schedule(static) private(jk,jj,ji)
             DO jk = 2, jpkm1
-               ahmt(:,:,jk) = ahmt(:,:,1) * tmask(:,:,jk)
-               ahmf(:,:,jk) = ahmf(:,:,1) * fmask(:,:,jk)
+               DO jj = 1, jpj
+                  DO ji = 1, jpi
+                     ahmt(ji,jj,jk) = ahmt(ji,jj,1) * tmask(ji,jj,jk)
+                     ahmf(ji,jj,jk) = ahmf(ji,jj,1) * fmask(ji,jj,jk)
+                  END DO
+               END DO
             END DO
             !
@@ -208 +212 @@
 !!gm Question : info for LAP or BLP case  to take into account the SQRT in the bilaplacian case ????
 !!              do we introduce a scaling by the max value of the array, and then multiply by zah0 ????
-!$OMP PARALLEL DO schedule(static) private(jk)
+!$OMP PARALLEL DO schedule(static) private(jk,jj,ji)
             DO jk = 1, jpkm1
-               ahmt(:,:,jk) = ahmt(:,:,jk) * tmask(:,:,jk)
-               ahmf(:,:,jk) = ahmf(:,:,jk) * fmask(:,:,jk)
+               DO jj = 1, jpj
+                  DO ji = 1, jpi
+                     ahmt(ji,jj,jk) = ahmt(ji,jj,jk) * tmask(ji,jj,jk)
+                     ahmf(ji,jj,jk) = ahmf(ji,jj,jk) * fmask(ji,jj,jk)
+                  END DO
+               END DO
             END DO
             !