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/trcnam_my_trc.F90

    r3680 r7646  
    44   !! TOP :   initialisation of some run parameters for MY_TRC bio-model 
    55   !!====================================================================== 
    6    !! History :   2.0  !  2007-12  (C. Ethe, G. Madec) Original code 
    7    !!---------------------------------------------------------------------- 
    8 #if defined key_my_trc 
    9    !!---------------------------------------------------------------------- 
    10    !!   'key_my_trc'   :                                       MY_TRC model 
     6   !! History :      !  2007  (C. Ethe, G. Madec) Original code 
     7   !!                !  2016  (C. Ethe, T. Lovato) Revised architecture 
    118   !!---------------------------------------------------------------------- 
    129   !! trc_nam_my_trc      : MY_TRC model initialisation 
     
    2219 
    2320   !!---------------------------------------------------------------------- 
    24    !! NEMO/TOP 3.3 , NEMO Consortium (2010) 
     21   !! NEMO/TOP 4.0 , NEMO Consortium (2016) 
    2522   !! $Id$  
    2623   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 
     
    4340   END SUBROUTINE trc_nam_my_trc 
    4441    
    45 #else 
    46    !!---------------------------------------------------------------------- 
    47    !!  Dummy module :                                             No MY_TRC 
    48    !!---------------------------------------------------------------------- 
    49 CONTAINS 
    50    SUBROUTINE trc_nam_my_trc                      ! Empty routine 
    51    END  SUBROUTINE  trc_nam_my_trc 
    52 #endif   
    53  
    5442   !!====================================================================== 
    5543END MODULE trcnam_my_trc 
Note: See TracChangeset for help on using the changeset viewer.