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

    r6140 r7646  
    22   !!====================================================================== 
    33   !!                       *** MODULE trcwri *** 
    4    !!    my_trc :   Output of my_trc tracers 
     4   !!     trc_wri_my_trc   :  outputs of concentration fields 
    55   !!====================================================================== 
    6    !! History :   1.0  !  2009-05 (C. Ethe)  Original code 
     6#if defined key_top && defined key_iomput 
    77   !!---------------------------------------------------------------------- 
    8 #if defined key_top && defined key_my_trc && defined key_iomput 
     8   !! History :      !  2007  (C. Ethe, G. Madec)  Original code 
     9   !!                !  2016  (C. Ethe, T. Lovato) Revised architecture 
    910   !!---------------------------------------------------------------------- 
    10    !!   'key_my_trc'                                           my_trc model 
    11    !!---------------------------------------------------------------------- 
    12    !! trc_wri_my_trc   :  outputs of concentration fields 
    13    !!---------------------------------------------------------------------- 
     11   USE par_trc         ! passive tracers common variables 
    1412   USE trc         ! passive tracers common variables  
    1513   USE iom         ! I/O manager 
     
    2018   PUBLIC trc_wri_my_trc  
    2119 
     20   !!---------------------------------------------------------------------- 
     21   !! NEMO/TOP 4.0 , NEMO Consortium (2016) 
     22   !! $Id$ 
     23   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     24   !!---------------------------------------------------------------------- 
    2225CONTAINS 
    2326 
     
    3639      DO jn = jp_myt0, jp_myt1 
    3740         cltra = TRIM( ctrcnm(jn) )                  ! short title for tracer 
    38          IF( ln_trc_wri(jn) ) CALL iom_put( cltra, trn(:,:,:,jn) ) 
     41         CALL iom_put( cltra, trn(:,:,:,jn) ) 
    3942      END DO 
    4043      ! 
     
    4245 
    4346#else 
    44    !!---------------------------------------------------------------------- 
    45    !!  Dummy module :                                     No passive tracer 
    46    !!---------------------------------------------------------------------- 
    47    PUBLIC trc_wri_my_trc 
     47 
    4848CONTAINS 
    49    SUBROUTINE trc_wri_my_trc                     ! Empty routine   
     49 
     50   SUBROUTINE trc_wri_my_trc 
     51      ! 
    5052   END SUBROUTINE trc_wri_my_trc 
     53 
    5154#endif 
    5255 
    53    !!---------------------------------------------------------------------- 
    54    !! NEMO/TOP 3.3 , NEMO Consortium (2010) 
    55    !! $Id: trcwri_my_trc.F90 3160 2011-11-20 14:27:18Z cetlod $  
    56    !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 
    57    !!====================================================================== 
    5856END MODULE trcwri_my_trc 
Note: See TracChangeset for help on using the changeset viewer.