Changeset 2636 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/LIM_SRC_3/limitd_me.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_3/limitd_me.F90 (modified) (7 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/LIM_SRC_3/limitd_me.F90

@@ -24 +24 @@
    USE limcons          ! LIM
    USE in_out_manager   ! I/O manager
-   USE prtctl           ! Print control
    USE lbclnk           ! lateral boundary condition - MPP exchanges
    USE lib_mpp          ! MPP library
+   USE prtctl           ! Print control
    USE wrk_nemo         ! workspace manager
 
@@ -78 +78 @@
 CONTAINS
 
-   FUNCTION lim_itd_me_alloc()
+   INTEGER FUNCTION lim_itd_me_alloc()
       !!---------------------------------------------------------------------!
       !!                ***  ROUTINE lim_itd_me_alloc ***
       !!---------------------------------------------------------------------!
-      INTEGER :: lim_itd_me_alloc
-      !!---------------------------------------------------------------------!
-      !
       ALLOCATE(                                                                     &
          !* Variables shared among ridging subroutines
@@ -96 +93 @@
          &      dardg1dt(jpi,jpj)  , dardg2dt(jpi,jpj)                        ,     & 
          &      dvirdgdt(jpi,jpj)  , opening(jpi,jpj)                         , STAT=lim_itd_me_alloc )
-      !
-      IF( lim_itd_me_alloc /= 0 ) THEN
-         CALL ctl_warn( 'lim_itd_me_alloc: failed to allocate arrays.' )
-      END IF
+         !
+      IF( lim_itd_me_alloc /= 0 )   CALL ctl_warn( 'lim_itd_me_alloc: failed to allocate arrays' )
       !
    END FUNCTION lim_itd_me_alloc
@@ -149 +144 @@
 
       IF( wrk_in_use(2, 1,2,3,4,5,6,7,8) ) THEN
-         CALL ctl_stop(' : requested workspace arrays unavailable.')   ;   RETURN
-      END IF
+         CALL ctl_stop('lim_itd_me: requested workspace arrays unavailable')   ;   RETURN
+      ENDIF
 
       IF( numit == nstart  )   CALL lim_itd_me_init   ! Initialization (first time-step only)
@@ -494 +489 @@
       END DO
 
-      IF( wrk_not_released(2, 1,2,3,4,5,6,7,8) )   CALL ctl_stop( 'lim_itd_me : failed to release workspace arrays.' )
+      IF( wrk_not_released(2, 1,2,3,4,5,6,7,8) )   CALL ctl_stop('lim_itd_me: failed to release workspace arrays')
       !
    END SUBROUTINE lim_itd_me
@@ -525 +520 @@
 
       IF( wrk_in_use(2, 1) ) THEN
-         CALL ctl_stop('lim_itd_me_icestrength : requested workspace array unavailable.')   ;   RETURN
-      END IF
+         CALL ctl_stop('lim_itd_me_icestrength : requested workspace array unavailable')   ;   RETURN
+      ENDIF
 
       !------------------------------------------------------------------------------!
@@ -678 +673 @@
       ENDIF ! ksmooth
 
-      ! Boundary conditions
-      CALL lbc_lnk( strength, 'T', 1. )
-
-      IF(wrk_not_released(2, 1))THEN
-         CALL ctl_stop('lim_itd_me_icestrength : failed to release workspace array.')
-      END IF
-
+      CALL lbc_lnk( strength, 'T', 1. )      ! Boundary conditions
+
+      IF( wrk_not_released(2, 1) )   CALL ctl_stop('lim_itd_me_icestrength: failed to release workspace array')
+      !
    END SUBROUTINE lim_itd_me_icestrength