Changeset 7277 for branches/2016/dev_CNRS_2016/NEMOGCM/NEMO/LIM_SRC_2/limmsh_2.F90

Timestamp:

2016-11-21T09:55:07+01:00 (8 years ago)

Author:

flavoni

Message:

update 2016 branch with simplif-2

File:

• branches/2016/dev_CNRS_2016/NEMOGCM/NEMO/LIM_SRC_2/limmsh_2.F90 (modified) (3 diffs)

branches/2016/dev_CNRS_2016/NEMOGCM/NEMO/LIM_SRC_2/limmsh_2.F90

@@ -70 +70 @@
       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' )
-
       !----------------------------------------------------------                          
       !    Initialization of local and some global (common) variables 
@@ -79 +76 @@
       njeq   = INT( jpj / 2 )   !i bug mpp potentiel
       njeqm1 = njeq - 1 
-
-      fcor(:,:) = 2. * omega * SIN( gphit(:,:) * rad )   !  coriolis factor at T-point
  
 !i    DO jj = 1, jpj
@@ -87 +82 @@
 !i    END DO
 
-      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.e0 ) 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.e0 )
             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.e0 ) THEN
          l_jeq = .FALSE.
          njeq = jpj