Changeset 7403 for branches/2016/dev_merge_2016/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcnam_my_trc.F90

Timestamp:

2016-11-30T17:56:53+01:00 (8 years ago)

Author:

timgraham

Message:

Merge dev_INGV_METO_merge_2016 into branch

File:

• branches/2016/dev_merge_2016/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcnam_my_trc.F90 (modified) (3 diffs)

branches/2016/dev_merge_2016/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcnam_my_trc.F90

@@ -4 +4 @@
    !! TOP :   initialisation of some run parameters for MY_TRC bio-model
    !!======================================================================
-   !! History :   2.0  !  2007-12  (C. Ethe, G. Madec) Original code
-   !!----------------------------------------------------------------------
-#if defined key_my_trc
-   !!----------------------------------------------------------------------
-   !!   'key_my_trc'   :                                       MY_TRC model
+   !! History :      !  2007  (C. Ethe, G. Madec) Original code
+   !!                !  2016  (C. Ethe, T. Lovato) Revised architecture
    !!----------------------------------------------------------------------
    !! trc_nam_my_trc      : MY_TRC model initialisation
@@ -22 +19 @@
 
    !!----------------------------------------------------------------------
-   !! NEMO/TOP 3.3 , NEMO Consortium (2010)
+   !! NEMO/TOP 4.0 , NEMO Consortium (2016)
    !! $Id$ 
    !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
@@ -43 +40 @@
    END SUBROUTINE trc_nam_my_trc
    
-#else
-   !!----------------------------------------------------------------------
-   !!  Dummy module :                                             No MY_TRC
-   !!----------------------------------------------------------------------
-CONTAINS
-   SUBROUTINE trc_nam_my_trc                      ! Empty routine
-   END  SUBROUTINE  trc_nam_my_trc
-#endif  
-
    !!======================================================================
 END MODULE trcnam_my_trc