Changeset 7403 for branches/2016/dev_merge_2016/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcsms_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/trcsms_my_trc.F90 (modified) (6 diffs)

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

@@ -4 +4 @@
    !! TOP :   Main module of the MY_TRC tracers
    !!======================================================================
-   !! History :   2.0  !  2007-12  (C. Ethe, G. Madec) Original code
-   !!----------------------------------------------------------------------
-#if defined key_my_trc
-   !!----------------------------------------------------------------------
-   !!   'key_my_trc'                                               CFC tracers
+   !! History :      !  2007  (C. Ethe, G. Madec)  Original code
+   !!                !  2016  (C. Ethe, T. Lovato) Revised architecture
    !!----------------------------------------------------------------------
    !! trc_sms_my_trc       : MY_TRC model main routine
@@ -18 +15 @@
    USE trd_oce
    USE trdtrc
-   USE trcbc, only : trc_bc_read
+   USE trcbc, only : trc_bc
 
    IMPLICIT NONE
@@ -29 +26 @@
 
    !!----------------------------------------------------------------------
-   !! 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)
@@ -57 +54 @@
       IF( l_trdtrc )  CALL wrk_alloc( jpi, jpj, jpk, ztrmyt )
 
-      CALL trc_bc_read  ( kt )       ! tracers: surface and lateral Boundary Conditions
+      CALL trc_bc ( kt )       ! tracers: surface and lateral Boundary Conditions
 
       ! add here the call to BGC model
@@ -74 +71 @@
    END SUBROUTINE trc_sms_my_trc
 
-
    INTEGER FUNCTION trc_sms_my_trc_alloc()
       !!----------------------------------------------------------------------
@@ -88 +84 @@
    END FUNCTION trc_sms_my_trc_alloc
 
-
-#else
-   !!----------------------------------------------------------------------
-   !!   Dummy module                                        No MY_TRC model
-   !!----------------------------------------------------------------------
-CONTAINS
-   SUBROUTINE trc_sms_my_trc( kt )             ! Empty routine
-      INTEGER, INTENT( in ) ::   kt
-      WRITE(*,*) 'trc_sms_my_trc: You should not have seen this print! error?', kt
-   END SUBROUTINE trc_sms_my_trc
-#endif
-
    !!======================================================================
 END MODULE trcsms_my_trc