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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcice_my_trc.F90

    r5439 r7646  
    33   !!                         ***  MODULE trcice_my_trc  *** 
    44   !!---------------------------------------------------------------------- 
    5 #if defined key_my_trc 
     5   !! trc_ice_my_trc       : MY_TRC model seaice coupling routine 
    66   !!---------------------------------------------------------------------- 
    7    !!   'key_my_trc'                                               CFC tracers 
    8    !!---------------------------------------------------------------------- 
    9    !! trc_ice_my_trc       : MY_TRC model main routine 
     7   !! History :        !  2016  (C. Ethe, T. Lovato) Revised architecture 
    108   !!---------------------------------------------------------------------- 
    119   USE par_trc         ! TOP parameters 
     
    1917 
    2018   !!---------------------------------------------------------------------- 
    21    !! NEMO/TOP 3.3 , NEMO Consortium (2010) 
    22    !! $Id: trcice_my_trc.F90 4990 2014-12-15 16:42:49Z timgraham $ 
     19   !! NEMO/TOP 4.0 , NEMO Consortium (2016) 
     20   !! $Id$ 
    2321   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    2422   !!---------------------------------------------------------------------- 
     
    3432   END SUBROUTINE trc_ice_ini_my_trc 
    3533 
    36 #else 
    37    !!---------------------------------------------------------------------- 
    38    !!   Dummy module                                        No MY_TRC model 
    39    !!---------------------------------------------------------------------- 
    40 CONTAINS 
    41    SUBROUTINE trc_ice_ini_my_trc             ! Empty routine 
    42    END SUBROUTINE trc_ice_ini_my_trc 
    43 #endif 
    44  
    4534   !!====================================================================== 
    4635END MODULE trcice_my_trc 
Note: See TracChangeset for help on using the changeset viewer.