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

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

@@ -30 +30 @@
    USE albedo           ! albedo parameters
    USE lbclnk           ! ocean lateral boundary condition - MPP exchanges
+   USE lib_mpp          ! MPP library
    USE in_out_manager   ! I/O manager
    USE diaar5, ONLY :   lk_diaar5
@@ -62 +63 @@
 CONTAINS
 
-   FUNCTION lim_sbc_alloc_2()
+   INTEGER FUNCTION lim_sbc_alloc_2()
       !!-------------------------------------------------------------------
       !!             ***  ROUTINE lim_sbc_alloc_2 ***
       !!-------------------------------------------------------------------
-      INTEGER :: lim_sbc_alloc_2
-      !!-------------------------------------------------------------------
-      !
       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_2)
@@ -117 +115 @@
      
       IF( wrk_in_use(2, 1) .OR. wrk_in_use(3, 4,5) )THEN
-         CALL ctl_stop('lim_sbc_flx_2 : requested workspace arrays unavailable.')
-         RETURN
-      END IF
+         CALL ctl_stop('lim_sbc_flx_2 : requested workspace arrays unavailable')   ;   RETURN
+      ENDIF
       zalb  => wrk_3d_4(:,:,1:1)      ! Set-up pointers to sub-arrays of 3d workspaces
       zalbp => wrk_3d_5(:,:,1:1)
@@ -253 +250 @@
       ENDIF 
       !
-      IF( wrk_not_released(2, 1) .OR. wrk_not_released(3, 4,5) )THEN
-         CALL ctl_stop('lim_sbc_flx_2 : failed to release workspace arrays.')
-      END IF
+      IF( wrk_not_released(2, 1)     .OR.    &
+          wrk_not_released(3, 4,5) )   CALL ctl_stop('lim_sbc_flx_2 : failed to release workspace arrays')
       !
    END SUBROUTINE lim_sbc_flx_2
@@ -297 +293 @@
       !!---------------------------------------------------------------------
       !
-      IF(wrk_in_use(2, 1,2))THEN
+      IF( wrk_in_use(2, 1,2) ) THEN
          CALL ctl_stop('lim_sbc_tau_2 : requested workspace arrays unavailable.')   ;   RETURN
-      END IF
+      ENDIF
       !
       SELECT CASE( cp_ice_msh )     
@@ -413 +409 @@
          &                       tab2d_2=vtau, clinfo2=' vtau    : '        , mask2=vmask )
       !  
-      IF(wrk_not_released(2, 1,2) )   CALL ctl_stop('lim_sbc_tau_2 : failed to release workspace arrays.')
+      IF( wrk_not_released(2, 1,2) )   CALL ctl_stop('lim_sbc_tau_2 : failed to release workspace arrays')
       !
    END SUBROUTINE lim_sbc_tau_2