source: trunk/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcice_my_trc.F90 @ 7953

Last change on this file since 7953 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.4 KB
RevLine 
[5367]1MODULE trcice_my_trc
2   !!======================================================================
3   !!                         ***  MODULE trcice_my_trc  ***
4   !!----------------------------------------------------------------------
[7646]5   !! trc_ice_my_trc       : MY_TRC model seaice coupling routine
[5367]6   !!----------------------------------------------------------------------
[7646]7   !! History :        !  2016  (C. Ethe, T. Lovato) Revised architecture
[5367]8   !!----------------------------------------------------------------------
9   USE par_trc         ! TOP parameters
10   USE oce_trc         ! Ocean variables
11   USE trc             ! TOP variables
12
13   IMPLICIT NONE
14   PRIVATE
15
[5434]16   PUBLIC   trc_ice_ini_my_trc       ! called by trcice.F90 module
[5367]17
18   !!----------------------------------------------------------------------
[7646]19   !! NEMO/TOP 4.0 , NEMO Consortium (2016)
20   !! $Id$
[5367]21   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
22   !!----------------------------------------------------------------------
23CONTAINS
24
[5434]25   SUBROUTINE trc_ice_ini_my_trc
[5367]26      !!----------------------------------------------------------------------
27      !!                     ***  trc_ice_my_trc  ***
28      !!
29      !!----------------------------------------------------------------------
30      !
31      !
[5434]32   END SUBROUTINE trc_ice_ini_my_trc
[5367]33
34   !!======================================================================
[5439]35END MODULE trcice_my_trc
Note: See TracBrowser for help on using the repository browser.