Changeset 7646 for trunk/NEMOGCM/NEMO/OPA_SRC/CRS/crsini.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/OPA_SRC/CRS/crsini.F90 (modified) (2 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/CRS/crsini.F90

@@ -11 +11 @@
    !!----------------------------------------------------------------------
    USE par_kind, ONLY: wp
-   USE par_oce                  ! For parameter jpi,jpj,jphgr_msh
+   USE par_oce                  ! For parameter jpi,jpj
    USE dom_oce                  ! For parameters in par_oce
    USE crs                      ! Coarse grid domain
@@ -170 +170 @@
      !      3.c.2 Coriolis factor  
 
-      SELECT CASE( jphgr_msh )   ! type of horizontal mesh
-
-      CASE ( 0, 1, 4 )           ! mesh on the sphere
-
-         ff_crs(:,:) = 2. * omega * SIN( rad * gphif_crs(:,:) )
-
-      CASE DEFAULT 
-
-       IF(lwp)    WRITE(numout,*) 'crsini.F90. crs_init. Only jphgr_msh = 0, 1 or 4 supported' 
+!!gm  Not sure CRS needs Coriolis parameter....
+!!gm  If needed, then update this to have Coriolis at both f- and t-points
+
+      ff_crs(:,:) = 2. * omega * SIN( rad * gphif_crs(:,:) )
+
+      CALL ctl_warn( 'crsini: CAUTION, CRS only designed for Coriolis defined on the sphere' ) 
  
-      END SELECT 
 
      !    3.d.1 mbathy ( vertical k-levels of bathymetry )