Changeset 7753 for trunk/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90

Timestamp:

2017-03-03T12:46:59+01:00 (7 years ago)

Author:

mocavero

Message:

Reverting trunk to remove OpenMP

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) (6 diffs)

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

@@ -88 +88 @@
       IF( l_trdtra ) THEN                    !* Save ta and sa trends
          CALL wrk_alloc( jpi, jpj, jpk, ztrdt, ztrds ) 
-!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
-         DO jk = 1, jpk
-            DO jj = 1, jpj
-               DO ji = 1, jpi
-                  ztrdt(ji,jj,jk) = tsa(ji,jj,jk,jp_tem)
-                  ztrds(ji,jj,jk) = tsa(ji,jj,jk,jp_sal)
-               END DO
-            END DO
-         END DO
+         ztrdt(:,:,:) = tsa(:,:,:,jp_tem)
+         ztrds(:,:,:) = tsa(:,:,:,jp_sal)
       ENDIF
       !
 !!gm  This should be moved into sbcmod.F90 module ? (especially now that ln_traqsr is read in namsbc namelist)
       IF( .NOT.ln_traqsr ) THEN     ! no solar radiation penetration
-!$OMP PARALLEL DO schedule(static) private(jj, ji)
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               qns(ji,jj) = qns(ji,jj) + qsr(ji,jj)      ! total heat flux in qns
-               qsr(ji,jj) = 0._wp                     ! qsr set to zero
-            END DO
-         END DO
+         qns(:,:) = qns(:,:) + qsr(:,:)      ! total heat flux in qns
+         qsr(:,:) = 0._wp                     ! qsr set to zero
       ENDIF
 
@@ -119 +107 @@
             IF(lwp) WRITE(numout,*) '          nit000-1 sbc tracer content field read in the restart file'
             zfact = 0.5_wp
-            DO jn = 1, jpts
-!$OMP PARALLEL DO schedule(static) private(jj, ji)
-               DO jj = 1, jpj
-                  DO ji = 1, jpi
-                     sbc_tsc(ji,jj,jn) = 0._wp  ! needed just to ensure haloes are consistent across restarts
-                  END DO
-               END DO
-            END DO
+            sbc_tsc(:,:,:) = 0._wp
             CALL iom_get( numror, jpdom_autoglo, 'sbc_hc_b', sbc_tsc_b(:,:,jp_tem) )   ! before heat content sbc trend
             CALL iom_get( numror, jpdom_autoglo, 'sbc_sc_b', sbc_tsc_b(:,:,jp_sal) )   ! before salt content sbc trend
          ELSE                                   ! No restart or restart not found: Euler forward time stepping
             zfact = 1._wp
-            DO jn = 1, jpts
-!$OMP PARALLEL DO schedule(static) private(jj, ji)
-               DO jj = 1, jpj
-                  DO ji = 1, jpi
-                     sbc_tsc(ji,jj,jn) = 0._wp
-                     sbc_tsc_b(ji,jj,jn) = 0._wp
-                  END DO
-               END DO
-            END DO
+            sbc_tsc(:,:,:) = 0._wp
+            sbc_tsc_b(:,:,:) = 0._wp
          ENDIF
       ELSE                                !* other time-steps: swap of forcing fields
          zfact = 0.5_wp
-         DO jn = 1, jpts
-!$OMP PARALLEL DO schedule(static) private(jj, ji)
-            DO jj = 1, jpj
-               DO ji = 1, jpi
-                  sbc_tsc_b(ji,jj,jn) = sbc_tsc(ji,jj,jn)
-               END DO
-            END DO
-         END DO
+         sbc_tsc_b(:,:,:) = sbc_tsc(:,:,:)
       ENDIF
       !                             !==  Now sbc tracer content fields  ==!
-!$OMP PARALLEL DO schedule(static) private(jj, ji)
       DO jj = 2, jpj
          DO ji = fs_2, fs_jpim1   ! vector opt.
@@ -161 +127 @@
       END DO
       IF( ln_linssh ) THEN                !* linear free surface  
-!$OMP PARALLEL DO schedule(static) private(jj, ji)
          DO jj = 2, jpj                         !==>> add concentration/dilution effect due to constant volume cell
             DO ji = fs_2, fs_jpim1   ! vector opt.
@@ -173 +138 @@
       !
       DO jn = 1, jpts               !==  update tracer trend  ==!
-!$OMP PARALLEL DO schedule(static) private(jj, ji)
          DO jj = 2, jpj
             DO ji = fs_2, fs_jpim1   ! vector opt.  
@@ -255 +219 @@
       !
       IF( ln_iscpl .AND. ln_hsb) THEN         ! input of heat and salt due to river runoff 
-!$OMP PARALLEL DO schedule(static) private(jk, jj, ji, zdep)
          DO jk = 1,jpk
             DO jj = 2, jpj 
@@ -270 +233 @@
 
       IF( l_trdtra )   THEN                      ! save the horizontal diffusive trends for further diagnostics
-!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
-         DO jk = 1, jpk
-            DO jj = 1, jpj
-               DO ji = 1, jpi
-                  ztrdt(ji,jj,jk) = tsa(ji,jj,jk,jp_tem) - ztrdt(ji,jj,jk)
-                  ztrds(ji,jj,jk) = tsa(ji,jj,jk,jp_sal) - ztrds(ji,jj,jk)
-               END DO  
-            END DO  
-         END DO
+         ztrdt(:,:,:) = tsa(:,:,:,jp_tem) - ztrdt(:,:,:)
+         ztrds(:,:,:) = tsa(:,:,:,jp_sal) - ztrds(:,:,:)
          CALL trd_tra( kt, 'TRA', jp_tem, jptra_nsr, ztrdt )
          CALL trd_tra( kt, 'TRA', jp_sal, jptra_nsr, ztrds )