Changeset 2636 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/LIM_SRC_2/dom_ice_2.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/LIM_SRC_2/dom_ice_2.F90 (modified) (3 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/LIM_SRC_2/dom_ice_2.F90

@@ -15 +15 @@
    !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
-   USE par_ice_2
+   USE par_ice_2   ! LIM parameters
 
    IMPLICIT NONE
    PRIVATE
 
-   ! Routine accessibility
    PUBLIC    dom_ice_alloc_2    ! Called from nemogcm.F90
 
@@ -42 +41 @@
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)         ::   tmi               !: ice mask: =1 if ice thick > 0
 # endif
+   !!----------------------------------------------------------------------
+   CONTAINS
+
+   INTEGER FUNCTION dom_ice_alloc_2()
+      !!----------------------------------------------------------------------
+      USE lib_mpp, ONLY:   ctl_warn   ! MPP library
+      INTEGER :: ierr(2)
+      !!----------------------------------------------------------------------
+      ierr(:) = 0
+      !
+      ALLOCATE( fs2cor(jpi,jpj),  fcor(jpi,jpj),                             &
+         &      covrai(jpi,jpj),  area(jpi,jpj), tms(jpi,jpj), tmu(jpi,jpj), &
+         &      wght(jpi,jpj,2,2),  Stat=ierr(1) )
+         !
+      ALLOCATE(                                                              &
+#if defined key_lim2_vp 
+         &        akappa(jpi,jpj,2,2), bkappa(jpi,jpj,2,2),                  &
+         &        alambd(jpi,jpj,2,2,2,2),                                   &
+#else
+         &        tmv(jpi,jpj), tmf(jpi,jpj), tmi(jpi,jpj),                  &
+#endif
+         &        Stat=ierr(2) )
+         !
+      dom_ice_alloc_2 = MAXVAL(ierr)
+      IF( dom_ice_alloc_2 /= 0 )   CALL ctl_warn('dom_ice_alloc_2: failed to allocate arrays')
+      !
+   END FUNCTION dom_ice_alloc_2
 
 #else
@@ -49 +75 @@
 #endif
    !!======================================================================
-#if defined key_lim2
-   CONTAINS
-
-     FUNCTION dom_ice_alloc_2()
-        USE in_out_manager, ONLY: ctl_warn
-        IMPLICIT none
-        INTEGER :: dom_ice_alloc_2
-        INTEGER :: ierr(2)
-
-        ierr(:) = 0
-
-        ALLOCATE(fs2cor(jpi,jpj),  fcor(jpi,jpj),                             &
-                 covrai(jpi,jpj),  area(jpi,jpj), tms(jpi,jpj), tmu(jpi,jpj), &
-                 wght(jpi,jpj,2,2),  Stat=ierr(1) )
-
-        ALLOCATE(                                                             &
-#if defined key_lim2_vp 
-                 akappa(jpi,jpj,2,2), bkappa(jpi,jpj,2,2),                    &
-                 alambd(jpi,jpj,2,2,2,2),                                     &
-#else
-                 tmv(jpi,jpj), tmf(jpi,jpj), tmi(jpi,jpj),                    &
-#endif
-                 Stat=ierr(2))
-
-        dom_ice_alloc_2 = MAXVAL(ierr)
-
-        IF(dom_ice_alloc_2 /= 0)THEN
-           CALL ctl_warn('dom_ice_alloc_2: failed to allocate arrays.')
-        END IF
-
-     END FUNCTION dom_ice_alloc_2
-#endif
-
 END MODULE dom_ice_2