Changeset 7646 for trunk/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcwri_my_trc.F90

Timestamp:

2017-02-06T10:25:03+01:00 (7 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:

• trunk/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcwri_my_trc.F90 (modified) (4 diffs)

trunk/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcwri_my_trc.F90

@@ -2 +2 @@
    !!======================================================================
    !!                       *** MODULE trcwri ***
-   !!    my_trc :   Output of my_trc tracers
+   !!     trc_wri_my_trc   :  outputs of concentration fields
    !!======================================================================
-   !! History :   1.0  !  2009-05 (C. Ethe)  Original code
+#if defined key_top && defined key_iomput
    !!----------------------------------------------------------------------
-#if defined key_top && defined key_my_trc && defined key_iomput
+   !! History :      !  2007  (C. Ethe, G. Madec)  Original code
+   !!                !  2016  (C. Ethe, T. Lovato) Revised architecture
    !!----------------------------------------------------------------------
-   !!   'key_my_trc'                                           my_trc model
-   !!----------------------------------------------------------------------
-   !! trc_wri_my_trc   :  outputs of concentration fields
-   !!----------------------------------------------------------------------
+   USE par_trc         ! passive tracers common variables
    USE trc         ! passive tracers common variables 
    USE iom         ! I/O manager
@@ -20 +18 @@
    PUBLIC trc_wri_my_trc 
 
+   !!----------------------------------------------------------------------
+   !! NEMO/TOP 4.0 , NEMO Consortium (2016)
+   !! $Id$
+   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
+   !!----------------------------------------------------------------------
 CONTAINS
 
@@ -36 +39 @@
       DO jn = jp_myt0, jp_myt1
          cltra = TRIM( ctrcnm(jn) )                  ! short title for tracer
-         IF( ln_trc_wri(jn) ) CALL iom_put( cltra, trn(:,:,:,jn) )
+         CALL iom_put( cltra, trn(:,:,:,jn) )
       END DO
       !
@@ -42 +45 @@
 
 #else
-   !!----------------------------------------------------------------------
-   !!  Dummy module :                                     No passive tracer
-   !!----------------------------------------------------------------------
-   PUBLIC trc_wri_my_trc
+
 CONTAINS
-   SUBROUTINE trc_wri_my_trc                     ! Empty routine  
+
+   SUBROUTINE trc_wri_my_trc
+      !
    END SUBROUTINE trc_wri_my_trc
+
 #endif
 
-   !!----------------------------------------------------------------------
-   !! NEMO/TOP 3.3 , NEMO Consortium (2010)
-   !! $Id: trcwri_my_trc.F90 3160 2011-11-20 14:27:18Z cetlod $ 
-   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
-   !!======================================================================
 END MODULE trcwri_my_trc