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

branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/DIA/diafwb.F90

@@ -55 +55 @@
       REAL(wp) :: zarea, zvol, zwei
       REAL(wp) :: ztemi(4), ztemo(4), zsali(4), zsalo(4), zflxi(4), zflxo(4)
-      REAL(wp) :: zt, zs, zu  
+      REAL(wp) :: zt, zs, zu
       REAL(wp) :: zsm0, zfwfnew
+      REAL(wp), DIMENSION(:,:)     ::   ztmp      ! 2D workspace
       IF( cp_cfg == "orca" .AND. jp_cfg == 1 .OR. jp_cfg == 2 .OR. jp_cfg == 4 ) THEN
       !!----------------------------------------------------------------------
@@ -63 +64 @@
       ! Mean global salinity
       zsm0 = 34.72654
-
       ! To compute fwf mean value mean fwf
 
@@ -72 +72 @@
          a_salb   = 0.e0 ! valeur de sal au debut de la simulation
          ! sshb used because diafwb called after tranxt (i.e. after the swap)
-         a_sshb = SUM( e1e2t(:,:) * sshb(:,:) * tmask_i(:,:) )
+!$OMP PARALLEL DO schedule(static) private(jj,ji) REDUCTION(+:a_sshb)
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+               ztmp(ji,jj) = e1e2t(ji,jj) * sshb(ji,jj) * tmask_i(ji,jj)
+               a_sshb = a_sshb + ztmp(ji,jj)
+            END DO
+         END DO
          IF( lk_mpp )   CALL mpp_sum( a_sshb )      ! sum over the global domain
 
@@ -86 +92 @@
          IF( lk_mpp )   CALL mpp_sum( a_salb )      ! sum over the global domain
       ENDIF
-      
-      a_fwf    = SUM( e1e2t(:,:) * ( emp(:,:)-rnf(:,:) ) * tmask_i(:,:) ) 
+        
+!$OMP PARALLEL DO schedule(static) private(jj,ji) REDUCTION(+:a_fwf)
+      DO jj = 1, jpj
+         DO ji = 1, jpi
+            ztmp(ji,jj) = e1e2t(ji,jj) * ( emp(ji,jj)-rnf(ji,jj) ) * tmask_i(ji,jj)
+            a_fwf = a_fwf + ztmp(ji,jj)
+         END DO
+      END DO
+
       IF( lk_mpp )   CALL mpp_sum( a_fwf    )       ! sum over the global domain
 
@@ -97 +110 @@
          zfwfnew = 0.e0
          ! Mean sea level at nitend
-         a_sshn = SUM( e1e2t(:,:) * sshn(:,:) * tmask_i(:,:) )
+!$OMP PARALLEL DO schedule(static) private(jj,ji) REDUCTION(+:a_sshn)
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+               ztmp(ji,jj) = e1e2t(ji,jj) * sshn(ji,jj) * tmask_i(ji,jj)
+               a_sshn = a_sshn + ztmp(ji,jj)
+            END DO
+         END DO
          IF( lk_mpp )   CALL mpp_sum( a_sshn )      ! sum over the global domain
-         zarea  = SUM( e1e2t(:,:) *             tmask_i(:,:) )
+!$OMP PARALLEL DO schedule(static) private(jj,ji) REDUCTION(+:zarea)
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+               ztmp(ji,jj) = e1e2t(ji,jj) *            tmask_i(ji,jj)
+               zarea = zarea + ztmp(ji,jj)
+            END DO
+         END DO
          IF( lk_mpp )   CALL mpp_sum( zarea  )      ! sum over the global domain