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

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

@@ -7 +7 @@
    !! User defined :   mesh and Coriolis parameter of a user configuration
    !!======================================================================
-   !! History  :  4.0  ! 2016-03  (S. Flavoni) 
+   !! History :  4.0 ! 2016-03  (S. Flavoni) 
    !!----------------------------------------------------------------------
 
@@ -103 +103 @@
       ENDIF
       !   
-!$OMP PARALLEL
-!$OMP DO schedule(static) private(jj, ji, zim1, zjm1)
       DO jj = 1, jpj 
          DO ji = 1, jpi 
@@ -131 +129 @@
          END DO
       END DO
-!$OMP END DO NOWAIT
       !
       !                       !== Horizontal scale factors ==! (in meters)
       !                     
       !                                         ! constant grid spacing
-!$OMP DO schedule(static) private(jj, ji)
-      DO jj = 1, jpj
-         DO ji = 1, jpi
-            pe1t(ji,jj) =  ze1     ;      pe2t(ji,jj) = ze1
-            pe1u(ji,jj) =  ze1     ;      pe2u(ji,jj) = ze1
-            pe1v(ji,jj) =  ze1     ;      pe2v(ji,jj) = ze1
-            pe1f(ji,jj) =  ze1     ;      pe2f(ji,jj) = ze1
-            !
-            !                                         ! NO reduction of grid size in some straits 
-            pe1e2u(ji,jj) = 0._wp                       !    CAUTION: set to zero to avoid error with some compilers that
-            pe1e2v(ji,jj) = 0._wp                       !             require an initialization of INTENT(out) arguments
-         END DO
-      END DO
-!$OMP END PARALLEL
+      pe1t(:,:) =  ze1     ;      pe2t(:,:) = ze1
+      pe1u(:,:) =  ze1     ;      pe2u(:,:) = ze1
+      pe1v(:,:) =  ze1     ;      pe2v(:,:) = ze1
+      pe1f(:,:) =  ze1     ;      pe2f(:,:) = ze1
+      !
+      !                                         ! NO reduction of grid size in some straits 
       ke1e2u_v = 0                              !    ==>> u_ & v_surfaces will be computed in dom_ghr routine
+      pe1e2u(:,:) = 0._wp                       !    CAUTION: set to zero to avoid error with some compilers that
+      pe1e2v(:,:) = 0._wp                       !             require an initialization of INTENT(out) arguments
       !
       !
@@ -162 +153 @@
       zf0   = 2. * omega * SIN( rad * zphi0 )            !  compute f0 1st point south
       !
-!$OMP PARALLEL DO schedule(static) private(jj, ji)
-      DO jj = 1, jpj
-         DO ji = 1, jpi
-            pff_f(ji,jj) = ( zf0 + zbeta * ABS( pphif(ji,jj) - zphi0 ) * rad * ra ) ! f = f0 +beta* y ( y=0 at south)
-            pff_t(ji,jj) = ( zf0 + zbeta * ABS( pphit(ji,jj) - zphi0 ) * rad * ra ) ! f = f0 +beta* y ( y=0 at south)
-         END DO
-      END DO
+      pff_f(:,:) = ( zf0 + zbeta * ABS( pphif(:,:) - zphi0 ) * rad * ra ) ! f = f0 +beta* y ( y=0 at south)
+      pff_t(:,:) = ( zf0 + zbeta * ABS( pphit(:,:) - zphi0 ) * rad * ra ) ! f = f0 +beta* y ( y=0 at south)
       !
       IF(lwp) WRITE(numout,*) '                           beta-plane used. beta = ', zbeta, ' 1/(s.m)'