Changeset 2636 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/TOP_SRC/LOBSTER/sms_lobster.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/LOBSTER/sms_lobster.F90 (modified) (4 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/TOP_SRC/LOBSTER/sms_lobster.F90

@@ -11 +11 @@
    !!             2.0  !  2007-04  (C. Deltel, G. Madec) Free form and modules
    !!----------------------------------------------------------------------
-
 #if defined key_lobster
    !!----------------------------------------------------------------------
@@ -21 +20 @@
    IMPLICIT NONE
    PUBLIC
-
-   !!----------------------------------------------------------------------
-   !! NEMO/TOP 3.3 , NEMO Consortium (2010)
-   !! $Id$ 
-   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
-   !!----------------------------------------------------------------------
 
    !!  biological parameters
@@ -108 +101 @@
    REAL(wp), ALLOCATABLE, SAVE,  DIMENSION(:,:) ::   cmask       !: ???
 
-   !!======================================================================
-
+   !!----------------------------------------------------------------------
+   !! NEMO/TOP 3.3 , NEMO Consortium (2010)
+   !! $Id$ 
+   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
+   !!----------------------------------------------------------------------
 CONTAINS
 
-   FUNCTION sms_lobster_alloc()
+   INTEGER FUNCTION sms_lobster_alloc()
       !!----------------------------------------------------------------------
       !!        *** ROUTINE sms_lobster_alloc ***
       !!----------------------------------------------------------------------
-      USE in_out_manager, ONLY: ctl_warn
-      INTEGER :: sms_lobster_alloc
+      USE lib_mpp, ONLY: ctl_warn
       !!----------------------------------------------------------------------
-
-      ALLOCATE(remdmp(jpk,jp_lobster),                                &
-               neln(jpi,jpj),    xze(jpi,jpj),     xpar(jpi,jpj,jpk), &
-               dminl(jpi,jpj),   dmin3(jpi,jpj,jpk),                  &
-               sedpocb(jpi,jpj), sedpocn(jpi,jpj), sedpoca(jpi,jpj),  &
-               fbod(jpi,jpj),    cmask(jpi,jpj)  ,                    &
-               Stat=sms_lobster_alloc)
-
-      IF(sms_lobster_alloc /= 0)THEN
-         CALL ctl_warn('sms_lobster_alloc : failed to allocate arrays.')
-      END IF
-
+      !
+      ALLOCATE( remdmp(jpk,jp_lobster),                                   &
+         &      neln(jpi,jpj),    xze(jpi,jpj),     xpar(jpi,jpj,jpk),    &
+         &      dminl(jpi,jpj),   dmin3(jpi,jpj,jpk),                     &
+         &      sedpocb(jpi,jpj), sedpocn(jpi,jpj), sedpoca(jpi,jpj),     &
+         &      fbod(jpi,jpj),    cmask(jpi,jpj)                    , STAT=sms_lobster_alloc )
+         !
+      IF( sms_lobster_alloc /= 0 )   CALL ctl_warn('sms_lobster_alloc : failed to allocate arrays')
+      !
    END FUNCTION sms_lobster_alloc
 
@@ -140 +132 @@
 
    !!======================================================================
-
 END MODULE sms_lobster