Ignore:
Timestamp:
2017-02-06T10:25:03+01:00 (4 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.

Location:
trunk/NEMOGCM/NEMO/OPA_SRC/CRS
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/NEMO/OPA_SRC/CRS/crsdom.F90

    r6140 r7646  
    20232023         nimpp_crs = nimppt_crs(nproc + 1) 
    20242024 
    2025          ! No coarsening with zoom 
    2026          IF( jpizoom /= 1 .OR. jpjzoom /= 1)    STOP  
    2027  
    20282025         DO ji = 1, jpi_crs 
    20292026            mig_crs(ji) = ji + nimpp_crs - 1 
  • trunk/NEMOGCM/NEMO/OPA_SRC/CRS/crsini.F90

    r6140 r7646  
    1111   !!---------------------------------------------------------------------- 
    1212   USE par_kind, ONLY: wp 
    13    USE par_oce                  ! For parameter jpi,jpj,jphgr_msh 
     13   USE par_oce                  ! For parameter jpi,jpj 
    1414   USE dom_oce                  ! For parameters in par_oce 
    1515   USE crs                      ! Coarse grid domain 
     
    170170     !      3.c.2 Coriolis factor   
    171171 
    172       SELECT CASE( jphgr_msh )   ! type of horizontal mesh 
    173  
    174       CASE ( 0, 1, 4 )           ! mesh on the sphere 
    175  
    176          ff_crs(:,:) = 2. * omega * SIN( rad * gphif_crs(:,:) ) 
    177  
    178       CASE DEFAULT  
    179  
    180        IF(lwp)    WRITE(numout,*) 'crsini.F90. crs_init. Only jphgr_msh = 0, 1 or 4 supported'  
     172!!gm  Not sure CRS needs Coriolis parameter.... 
     173!!gm  If needed, then update this to have Coriolis at both f- and t-points 
     174 
     175      ff_crs(:,:) = 2. * omega * SIN( rad * gphif_crs(:,:) ) 
     176 
     177      CALL ctl_warn( 'crsini: CAUTION, CRS only designed for Coriolis defined on the sphere' )  
    181178  
    182       END SELECT  
    183179 
    184180     !    3.d.1 mbathy ( vertical k-levels of bathymetry )      
Note: See TracChangeset for help on using the changeset viewer.