source: NEMO/trunk/NEMOGCM/NEMO/TOP_SRC/CFC/trcice_cfc.F90 @ 9594

Last change on this file since 9594 was 7646, checked in by timgraham, 4 years ago

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 size: 1.6 KB
Line 
1MODULE trcice_cfc
2   !!======================================================================
3   !!                         ***  MODULE trcice_cfc  ***
4   !! TOP :   Main module of the MY_TRC tracers
5   !!======================================================================
6   !! History :   2.0  !  2007-12  (C. Ethe, G. Madec) Original code
7   !!----------------------------------------------------------------------
8   !! trc_ice_cfc       : MY_TRC model main routine
9   !!----------------------------------------------------------------------
10   USE par_trc         ! TOP parameters
11   USE oce_trc         ! Ocean variables
12   USE trc             ! TOP variables
13
14   IMPLICIT NONE
15   PRIVATE
16
17   PUBLIC   trc_ice_ini_cfc       ! called by trcice.F90 module
18
19   !!----------------------------------------------------------------------
20   !! NEMO/TOP 3.3 , NEMO Consortium (2010)
21   !! $Id: trcice_cfc.F90 4990 2014-12-15 16:42:49Z timgraham $
22   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
23   !!----------------------------------------------------------------------
24CONTAINS
25
26   SUBROUTINE trc_ice_ini_cfc
27      !!----------------------------------------------------------------------
28      !!                     ***  trc_ice_cfc  ***
29      !!
30      !! ** Purpose :   main routine of MY_TRC model
31      !!
32      !! ** Method  : -
33      !!----------------------------------------------------------------------
34      !
35      !
36   END SUBROUTINE trc_ice_ini_cfc
37
38   !!======================================================================
39END MODULE trcice_cfc
Note: See TracBrowser for help on using the repository browser.