Changeset 7646 for trunk/NEMOGCM/NEMO/LIM_SRC_2/limmsh_2.F90

Timestamp:

2017-02-06T10:25:03+01:00 (7 years ago)

Author:

timgraham

Message:

Merge of dev_merge_2016 into trunk. UPDATE TO ARCHFILES NEEDED for XIOS2.
LIM_SRC_s/limrhg.F90 to follow in next commit due to change of kind (I'm unable to do it in this commit).
Merged using the following steps:

1) svn merge --reintegrate ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk .
2) Resolve minor conflicts in sette.sh and namelist_cfg for ORCA2LIM3 (due to a change in trunk after branch was created)
3) svn commit
4) svn switch ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
5) svn merge ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2016/dev_merge_2016 .
6) At this stage I checked out a clean copy of the branch to compare against what is about to be committed to the trunk.
6) svn commit #Commit code to the trunk

In this commit I have also reverted a change to Fcheck_archfile.sh which was causing problems on the Paris machine.

File:

• trunk/NEMOGCM/NEMO/LIM_SRC_2/limmsh_2.F90 (modified) (3 diffs)

trunk/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