Changeset 2636 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/TOP_SRC/trc.F90

Timestamp:

2011-03-01T20:04:06+01:00 (13 years ago)

Author:

gm

Message:

dynamic mem: #785 ; move ctl_stop & warn in lib_mpp to avoid a circular dependency + ctl_stop improvment

File:

• branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/TOP_SRC/trc.F90 (modified) (4 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/TOP_SRC/trc.F90

@@ -78 +78 @@
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION (:,:,  :) ::   trc2d    !:  additional 2d outputs  
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION (:,:,:,:) ::   trc3d    !:  additional 3d outputs  
-   
 # endif
 
-#if defined key_diabio || defined key_trdmld_trc
+# if defined key_diabio || defined key_trdmld_trc
    !                                                              !!*  namtop_XXX namelist *
    INTEGER , PUBLIC                               ::   nn_writebio   !: time step frequency for biological outputs 
@@ -87 +86 @@
    CHARACTER(len=20), PUBLIC, DIMENSION(jpdiabio) ::   ctrbiu      !: biological trends unit   
    CHARACTER(len=80), PUBLIC, DIMENSION(jpdiabio) ::   ctrbil      !: biological trends long name
-#endif
+# endif
 # if defined key_diabio
    !! Biological trends
@@ -101 +100 @@
 # endif
 
-#else
-   !!----------------------------------------------------------------------
-   !!  Empty module :                                     No passive tracer
-   !!----------------------------------------------------------------------
-#endif
-
    !!----------------------------------------------------------------------
    !! NEMO/TOP 3.3 , NEMO Consortium (2010)
    !! $Id$ 
    !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
-   !!======================================================================
-#if defined key_top
+   !!----------------------------------------------------------------------
 CONTAINS
 
-   FUNCTION trc_alloc()
+   INTEGER FUNCTION trc_alloc()
       !!-------------------------------------------------------------------
       !!                    *** ROUTINE trc_alloc ***
       !!-------------------------------------------------------------------
-      USE in_out_manager, ONLY: ctl_warn
+      USE lib_mpp, ONLY: ctl_warn
+      !!-------------------------------------------------------------------
       !
-      INTEGER :: trc_alloc
-      !!-------------------------------------------------------------------
-
       ALLOCATE(cvol(jpi,jpj,jpk),                                  &
                trn(jpi,jpj,jpk,jptra),                             &
@@ -132 +122 @@
 # if defined key_diatrc && ! defined key_iomput
                trc2d(jpi,jpj,jpdia2d), trc3d(jpi,jpj,jpk,jpdia3d), &
-#endif
+# endif
 # if defined key_diabio
                trbio(jpi,jpj,jpk,jpdiabio),                        &
-#endif
-               Stat=trc_alloc)
+# endif
+               STAT=trc_alloc)
 
-      IF(trc_alloc /= 0)THEN
-         CALL ctl_warn('trc_alloc: failed to allocate arrays.')
-      END IF
-
+      IF( trc_alloc /= 0 )   CALL ctl_warn('trc_alloc: failed to allocate arrays')
+      !
    END FUNCTION trc_alloc
+   
+#else
+   !!----------------------------------------------------------------------
+   !!  Empty module :                                     No passive tracer
+   !!----------------------------------------------------------------------
 #endif
 
+   !!======================================================================
 END MODULE trc