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

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

@@ -26 +26 @@
    USE ice_2
 
+   USE dianam          ! build name of file (routine)
    USE lbclnk
-   USE dianam          ! build name of file (routine)
    USE in_out_manager
+   USE lib_mpp         ! MPP library
    USE iom
    USE ioipsl
@@ -69 +70 @@
 CONTAINS
 
-   FUNCTION lim_wri_alloc_2()
+   INTEGER FUNCTION lim_wri_alloc_2()
       !!-------------------------------------------------------------------
       !!                  ***   ROUTINE lim_wri_alloc_2  ***
       !!-------------------------------------------------------------------
-      IMPLICIT none
-      INTEGER :: lim_wri_alloc_2
-      !!-------------------------------------------------------------------
-      !
       ALLOCATE( ndex51(jpij), zcmo(jpi,jpj,jpnoumax), STAT=lim_wri_alloc_2)
       !
@@ -115 +112 @@
       !!-------------------------------------------------------------------
 
-      IF(wrk_in_use(2, 1))THEN
-         CALL ctl_stop('lim_wri_2 : requested workspace array unavailable.')
-         RETURN
-      END IF
+      IF( wrk_in_use(2, 1) ) THEN
+         CALL ctl_stop('lim_wri_2 : requested workspace array unavailable')   ;   RETURN
+      ENDIF
                                                  !--------------------!
       IF( kt == nit000 ) THEN                    !   Initialisation   !
@@ -211 +207 @@
       IF( ( nn_fsbc * niter ) >= nitend )   CALL histclo( nice ) 
 
-      IF(wrk_not_released(2, 1))THEN
-         CALL ctl_stop('lim_wri_2 : failed to release workspace array.')
-      END IF
-
+      IF( wrk_not_released(2, 1) )   CALL ctl_stop('lim_wri_2 : failed to release workspace array.')
+      !
    END SUBROUTINE lim_wri_2