Changeset 7753 for trunk/NEMOGCM/NEMO/LIM_SRC_3/limwri.F90

Timestamp:

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

Author:

mocavero

Message:

Reverting trunk to remove OpenMP

File:

• trunk/NEMOGCM/NEMO/LIM_SRC_3/limwri.F90 (modified) (5 diffs)

trunk/NEMOGCM/NEMO/LIM_SRC_3/limwri.F90

@@ -74 +74 @@
 
       ! tresholds for outputs
-!$OMP PARALLEL
-!$OMP DO schedule(static) private(jj,ji)
       DO jj = 1, jpj
          DO ji = 1, jpi
@@ -82 +80 @@
       END DO
       DO jl = 1, jpl
-!$OMP DO schedule(static) private(jj,ji)
          DO jj = 1, jpj
             DO ji = 1, jpi
@@ -89 +86 @@
          END DO
       END DO
-!$OMP END PARALLEL
       !
       ! fluxes
@@ -108 +104 @@
       ! velocity
       IF ( iom_use( "uice_ipa" ) .OR. iom_use( "vice_ipa" ) .OR. iom_use( "icevel" ) ) THEN 
-!$OMP PARALLEL DO schedule(static) private(jj,ji,z2da,z2db)
          DO jj = 2 , jpjm1
             DO ji = 2 , jpim1
@@ -178 +173 @@
 
       IF ( iom_use( "vfxthin" ) ) THEN   ! ice production for open water + thin ice (<20cm) => comparable to observations  
-!$OMP PARALLEL DO schedule(static) private(jj,ji)
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               IF (htm_i(ji,jj) < 0.2 .AND. htm_i(ji,jj) > 0. ) THEN
-                  z2d(ji,jj) = wfx_bog(ji,jj)
-               ELSE
-                  z2d(ji,jj) = 0._wp
-               END IF
-            END DO
-         END DO
+         WHERE( htm_i(:,:) < 0.2 .AND. htm_i(:,:) > 0. ) ; z2d = wfx_bog
+         ELSEWHERE                                       ; z2d = 0._wp
+         END WHERE
          CALL iom_put( "vfxthin", ( wfx_opw + z2d ) * ztmp )
       ENDIF