Changeset 7698 for trunk/NEMOGCM/NEMO/OPA_SRC/TRA/tradmp.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/TRA/tradmp.F90 (modified) (5 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/TRA/tradmp.F90

@@ -102 +102 @@
       IF( l_trdtra )   THEN                    !* Save ta and sa trends
          CALL wrk_alloc( jpi,jpj,jpk,jpts,   ztrdts ) 
-         ztrdts(:,:,:,:) = tsa(:,:,:,:) 
+         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
+                     ztrdts(ji,jj,jk,jn) = tsa(ji,jj,jk,jn) 
+                  END DO
+               END DO
+            END DO
+         END DO
       ENDIF
       !                           !==  input T-S data at kt  ==!
@@ -111 +120 @@
       CASE( 0 )                        !*  newtonian damping throughout the water column  *!
          DO jn = 1, jpts
+!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
             DO jk = 1, jpkm1
                DO jj = 2, jpjm1
@@ -121 +131 @@
          !
       CASE ( 1 )                       !*  no damping in the turbocline (avt > 5 cm2/s)  *!
+!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
          DO jk = 1, jpkm1
             DO jj = 2, jpjm1
@@ -135 +146 @@
          !
       CASE ( 2 )                       !*  no damping in the mixed layer   *!
+!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
          DO jk = 1, jpkm1
             DO jj = 2, jpjm1
@@ -151 +163 @@
       !
       IF( l_trdtra )   THEN       ! trend diagnostic
-         ztrdts(:,:,:,:) = tsa(:,:,:,:) - ztrdts(:,:,:,:)
+         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
+                     ztrdts(ji,jj,jk,jn) = tsa(ji,jj,jk,jn) - ztrdts(ji,jj,jk,jn)
+                  END DO
+               END DO
+            END DO
+         END DO
          CALL trd_tra( kt, 'TRA', jp_tem, jptra_dmp, ztrdts(:,:,:,jp_tem) )
          CALL trd_tra( kt, 'TRA', jp_sal, jptra_dmp, ztrdts(:,:,:,jp_sal) )