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

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/NEMO/NST_SRC/agrif_ice.F90

    r3680 r7646  
    55   !!---------------------------------------------------------------------- 
    66   !! History :  3.4  ! 2012-08  (R. Benshila)  Original code 
     7   !!            3.6  ! 2016-05  (C. Rousset)   Add LIM3 compatibility 
    78   !!---------------------------------------------------------------------- 
    89#if defined key_agrif && defined key_lim2 
     
    5960   END FUNCTION agrif_ice_alloc 
    6061 
     62#elif defined key_agrif && defined key_lim3 
     63   !!---------------------------------------------------------------------- 
     64   !!   'key_agrif'                                              AGRIF zoom 
     65   !!----------------------------------------------------------------------    
     66   IMPLICIT NONE 
     67   PRIVATE  
     68 
     69   INTEGER, PUBLIC ::  u_ice_id, v_ice_id, tra_ice_id 
     70   INTEGER, PUBLIC ::  lim_nbstep = 0    ! child time position in sea-ice model 
     71 
     72   !!---------------------------------------------------------------------- 
     73   !! NEMO/NST 3.6 , NEMO Consortium (2016) 
     74   !! $Id$ 
     75   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     76   !!---------------------------------------------------------------------- 
     77 
    6178#endif 
    6279   !!====================================================================== 
Note: See TracChangeset for help on using the changeset viewer.