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

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

@@ -30 +30 @@
    USE lbclnk           ! ocean lateral boundary condition
    USE in_out_manager   ! I/O manager
+   USE lib_mpp          ! MPP library
    USE prtctl           ! Print control
    USE cpl_oasis3, ONLY : lk_cpl
@@ -58 +59 @@
 CONTAINS
 
-   FUNCTION lim_sbc_alloc()
+   INTEGER FUNCTION lim_sbc_alloc()
       !!-------------------------------------------------------------------
       !!             ***  ROUTINE lim_sbc_alloc ***
       !!-------------------------------------------------------------------
-      INTEGER :: lim_sbc_alloc   ! return value
-      !!-------------------------------------------------------------------
-      !
       ALLOCATE( soce_0(jpi,jpj) , utau_oce(jpi,jpj) ,                       &
          &      sice_0(jpi,jpj) , vtau_oce(jpi,jpj) , tmod_io(jpi,jpj), STAT=lim_sbc_alloc)
          !
       IF( lk_mpp             )   CALL mpp_sum( lim_sbc_alloc )
-      IF( lim_sbc_alloc /= 0 )   CALL ctl_warn('lim_sbc_alloc: failed to allocate arrays.')
-      !
+      IF( lim_sbc_alloc /= 0 )   CALL ctl_warn('lim_sbc_alloc: failed to allocate arrays')
    END FUNCTION lim_sbc_alloc
 
@@ -112 +109 @@
 
       IF( wrk_in_use(2, 1,2) .OR. wrk_in_use(3, 4,5) ) THEN
-         CALL ctl_stop( 'lim_sbc_flx : requested workspace arrays unavailable.' )   ;   RETURN
+         CALL ctl_stop( 'lim_sbc_flx : requested workspace arrays unavailable' )   ;   RETURN
       ENDIF
       ! Set-up pointers to sub-arrays of 3d workspaces
@@ -300 +297 @@
       ENDIF
       !
-      IF(  wrk_not_released(2, 1,2)  .OR.  wrk_not_released(3, 4,5)  ) THEN
-         CALL ctl_stop( 'lim_sbc_flx : failed to release workspace arrays.' )
-      END IF
+      IF( wrk_not_released(2, 1,2)    .OR.   &
+          wrk_not_released(3, 4,5)  )        &
+          CALL ctl_stop( 'lim_sbc_flx: failed to release workspace arrays' )
       ! 
    END SUBROUTINE lim_sbc_flx