Changeset 7421 for branches/2016/dev_merge_2016/NEMOGCM/NEMO/LIM_SRC_3/limmsh.F90

Timestamp:

2016-12-01T18:10:41+01:00 (8 years ago)

Author:

flavoni

Message:

#1811 merge dev_CNRS_MERATOR_2016 with dev_merge_2016 branch

File:

• branches/2016/dev_merge_2016/NEMOGCM/NEMO/LIM_SRC_3/limmsh.F90 (modified) (2 diffs)

branches/2016/dev_merge_2016/NEMOGCM/NEMO/LIM_SRC_3/limmsh.F90

@@ -54 +54 @@
       ENDIF
 
-      IF( jphgr_msh == 2 .OR. jphgr_msh == 3 .OR. jphgr_msh == 5 )   &
-          &      CALL ctl_stop(' Coriolis parameter in LIM not set for f- or beta-plane')
-
-      !                           !==  coriolis factor & Equator position ==!
+      !                           !==  Equator position  ==!
       njeq   = INT( jpj / 2 ) 
       njeqm1 = njeq - 1 
       !
-      fcor(:,:) = 2. * omega * SIN( gphit(:,:) * rad )   ! coriolis factor
-      !
-      IF( fcor(1,1) * fcor(1,nlcj) < 0.e0 ) THEN   ! local domain include both hemisphere
+      IF( ff_t(1,1) * ff_t(1,nlcj) < 0._wp ) THEN   ! local domain include both hemisphere
          l_jeq = .TRUE.
          njeq  = 1
-         DO WHILE ( njeq <= jpj .AND. fcor(1,njeq) < 0.e0 )
+         DO WHILE ( njeq <= jpj .AND. ff_t(1,njeq) < 0._wp )
             njeq = njeq + 1
          END DO
          IF(lwp ) WRITE(numout,*) '          the equator is inside the domain at about njeq = ', njeq
-      ELSEIF( fcor(1,1) < 0.e0 ) THEN
+      ELSEIF( ff_t(1,1) < 0._wp ) THEN
          l_jeq = .FALSE.
          njeq = jpj
@@ -84 +79 @@
 
       !                           !==  metric coefficients for sea ice dynamic  ==!
-      wght(:,:,:,:) = 0.e0
+      wght(:,:,:,:) = 0._wp
 !!gm  Optimisation :  wght to be defined at F-point, not I-point  and change in limrhg
       DO jj = 2, jpj
          DO ji = 2, jpi
-            zusden = 1.e0 / (  ( e1t(ji,jj) + e1t(ji-1,jj  ) )   &
-               &             * ( e2t(ji,jj) + e2t(ji  ,jj-1) ) )
+            zusden = 1._wp / (  ( e1t(ji,jj) + e1t(ji-1,jj  ) )   &
+               &              * ( e2t(ji,jj) + e2t(ji  ,jj-1) ) )
             wght(ji,jj,1,1) = zusden * e1t(ji  ,jj) * e2t(ji,jj  )
             wght(ji,jj,1,2) = zusden * e1t(ji  ,jj) * e2t(ji,jj-1)