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

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

@@ -12 +12 @@
    !!   'key_lim2' :                                  LIM 2.0 sea-ice model
    !!----------------------------------------------------------------------
-   USE par_ice_2          ! LIM sea-ice parameters
+   USE par_ice_2      ! LIM sea-ice parameters
 
    IMPLICIT NONE
@@ -127 +127 @@
    CONTAINS
 
-   FUNCTION ice_alloc_2()
+   INTEGER FUNCTION ice_alloc_2()
       !!-----------------------------------------------------------------
       !!               *** FUNCTION ice_alloc_2 ***
       !!-----------------------------------------------------------------
-      USE in_out_manager, ONLY: ctl_warn
-      INTEGER :: ice_alloc_2     ! return value
-      INTEGER :: ierr(9)        ! Local variables
+      USE lib_mpp, ONLY:   ctl_warn   ! MPP library
+      INTEGER :: ierr(9)              ! Local variables
       !!-----------------------------------------------------------------
-
       ierr(:) = 0
-
+      !
       ALLOCATE( ahiu(jpi,jpj) , pahu(jpi,jpj) ,                      &
          &      ahiv(jpi,jpj) , pahv(jpi,jpj) , ust2s(jpi,jpj) , STAT=ierr(1) )
-
+         !
       !* Ice Rheology
 #if defined key_lim2_vp
@@ -149 +147 @@
                 stress12_i(jpi,jpj) , shear_i(jpi,jpj) , hicm(jpi,jpj) , STAT=ierr(2) )
 #endif
-
       ALLOCATE( rdvosif(jpi,jpj) , rdvobif(jpi,jpj) ,                      &
          &      fdvolif(jpi,jpj) , rdvonif(jpi,jpj) ,                      &
@@ -181 +178 @@
       ALLOCATE(sxst  (jpi,jpj) , syst  (jpi,jpj) , sxxst (jpi,jpj) ,     &
          &     syyst (jpi,jpj) , sxyst (jpi,jpj)                   , STAT=ierr(9))
-
+         !
       ice_alloc_2 = MAXVAL( ierr )
-
+      !
       IF( ice_alloc_2 /= 0 )   CALL ctl_warn('ice_alloc_2: failed to allocate arrays.')
       !