Changeset 7753 for trunk/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_sbc.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/USR/usrdef_sbc.F90 (modified) (5 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_sbc.F90

@@ -109 +109 @@
       ztrp= - 40.e0        ! retroaction term on heat fluxes (W/m2/K)
       zconv = 3.16e-5      ! convertion factor: 1 m/yr => 3.16e-5 mm/s
-!$OMP PARALLEL DO schedule(static) private(jj, ji, t_star)
       DO jj = 1, jpj
          DO ji = 1, jpi
@@ -138 +137 @@
 
       ! freshwater (mass flux) and update of qns with heat content of emp
-!$OMP PARALLEL DO schedule(static) private(jj, ji)
-      DO jj = 1, jpj
-         DO ji = 1, jpi
-            emp (ji,jj) = emp(ji,jj) - zsumemp * tmask(ji,jj,1)          ! freshwater flux (=0 in domain average)
-            sfx (ji,jj) = 0.0_wp                                         ! no salt flux
-            qns (ji,jj) = qns(ji,jj) - emp(ji,jj) * sst_m(ji,jj) * rcp   ! evap and precip are at SST
-         END DO
-      END DO
+      emp (:,:) = emp(:,:) - zsumemp * tmask(:,:,1)        ! freshwater flux (=0 in domain average)
+      sfx (:,:) = 0.0_wp                                   ! no salt flux
+      qns (:,:) = qns(:,:) - emp(:,:) * sst_m(:,:) * rcp   ! evap and precip are at SST
 
 
@@ -172 +166 @@
       ztau_sais = 0.015
       ztaun = ztau - ztau_sais * COS( (ztime - ztimemax) / (ztimemin - ztimemax) * rpi )
-!$OMP PARALLEL
-!$OMP DO schedule(static) private(jj, ji)
       DO jj = 1, jpj
          DO ji = 1, jpi
@@ -185 +177 @@
       ! module of wind stress and wind speed at T-point
       zcoef = 1. / ( zrhoa * zcdrag ) 
-!$OMP DO schedule(static) private(jj, ji, ztx, zty, zmod)
       DO jj = 2, jpjm1
          DO ji = fs_2, fs_jpim1   ! vect. opt.
@@ -195 +186 @@
          END DO
       END DO
-!$OMP END PARALLEL
       CALL lbc_lnk( taum(:,:), 'T', 1. )   ;   CALL lbc_lnk( wndm(:,:), 'T', 1. )