Changeset 7698 for trunk/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90

Timestamp:

2017-02-18T10:02:03+01:00 (7 years ago)

Author:

mocavero

Message:

update trunk with OpenMP parallelization

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90 (modified) (3 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90

@@ -133 +133 @@
       CALL dom_msk( ik_top, ik_bot )   ! Masks
       !
+!$OMP PARALLEL
+!$OMP DO schedule(static) private(jj,ji,ik)
       DO jj = 1, jpj                   ! depth of the iceshelves
          DO ji = 1, jpi
@@ -140 +142 @@
       END DO
       !
-      ht_0(:,:) = 0._wp  ! Reference ocean thickness
-      hu_0(:,:) = 0._wp
-      hv_0(:,:) = 0._wp
+!$OMP END DO NOWAIT
+!$OMP DO schedule(static) private(jj,ji)
+      DO jj = 1, jpj
+         DO ji = 1, jpi
+            ht_0(ji,jj) = 0._wp  ! Reference ocean thickness
+            hu_0(ji,jj) = 0._wp
+            hv_0(ji,jj) = 0._wp
+         END DO
+      END DO
       DO jk = 1, jpk
-         ht_0(:,:) = ht_0(:,:) + e3t_0(:,:,jk) * tmask(:,:,jk)
-         hu_0(:,:) = hu_0(:,:) + e3u_0(:,:,jk) * umask(:,:,jk)
-         hv_0(:,:) = hv_0(:,:) + e3v_0(:,:,jk) * vmask(:,:,jk)
+!$OMP DO schedule(static) private(jj,ji,ik)
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+               ht_0(ji,jj) = ht_0(ji,jj) + e3t_0(ji,jj,jk) * tmask(ji,jj,jk)
+               hu_0(ji,jj) = hu_0(ji,jj) + e3u_0(ji,jj,jk) * umask(ji,jj,jk)
+               hv_0(ji,jj) = hv_0(ji,jj) + e3v_0(ji,jj,jk) * vmask(ji,jj,jk)
+            END DO
+         END DO
       END DO
+!$OMP END PARALLEL
       !
       !           !==  time varying part of coordinate system  ==!
@@ -166 +180 @@
              e3vw_b =  e3vw_0  ;    e3vw_n =  e3vw_0   !        ---          !
          !
-         z1_hu_0(:,:) = ssumask(:,:) / ( hu_0(:,:) + 1._wp - ssumask(:,:) )     ! _i mask due to ISF
-         z1_hv_0(:,:) = ssvmask(:,:) / ( hv_0(:,:) + 1._wp - ssvmask(:,:) )
+!$OMP PARALLEL DO schedule(static) private(jj,ji)
+         DO jj =1, jpj
+            DO ji=1, jpi
+               z1_hu_0(ji,jj) = ssumask(ji,jj) / ( hu_0(ji,jj) + 1._wp - ssumask(ji,jj) )     ! _i mask due to ISF
+               z1_hv_0(ji,jj) = ssvmask(ji,jj) / ( hv_0(ji,jj) + 1._wp - ssvmask(ji,jj) )
+            END DO
+         END DO
          !
          !        before       !          now          !       after         !