Changeset 2636 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.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/OPA_SRC/DYN/dynspg.F90 (modified) (6 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90

@@ -14 +14 @@
    USE oce            ! ocean dynamics and tracers variables
    USE dom_oce        ! ocean space and time domain variables
+   USE phycst         ! physical constants
    USE obc_oce        ! ocean open boundary conditions
    USE sbc_oce        ! surface boundary condition: ocean
@@ -26 +27 @@
    USE prtctl         ! Print control                     (prt_ctl routine)
    USE in_out_manager ! I/O manager
-   USE phycst         ! physical constants
+   USE lib_mpp        ! MPP library
 
    IMPLICIT NONE
@@ -42 +43 @@
    !! NEMO/OPA 3.2 , LODYC-IPSL  (2009)
    !! $Id$ 
-   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
-   !!----------------------------------------------------------------------
-
+   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
+   !!----------------------------------------------------------------------
 CONTAINS
 
@@ -83 +83 @@
       !!----------------------------------------------------------------------
 
-      IF(wrk_in_use(3, 4,5))THEN
-         CALL ctl_stop('dyn_spg: requested workspace arrays unavailable.')
-         RETURN
-      END IF
+      IF( wrk_in_use(3, 4,5) ) THEN
+         CALL ctl_stop('dyn_spg: requested workspace arrays unavailable')   ;   RETURN
+      ENDIF
 
 !!gm NOTA BENE : the dynspg_exp and dynspg_ts should be modified so that 
@@ -154 +153 @@
          &                       tab3d_2=va, clinfo2=       ' Va: ', mask2=vmask, clinfo3='dyn' )
       !
-      IF(wrk_not_released(3, 4,5))THEN
-         CALL ctl_stop('dyn_spg: failed to release workspace arrays.')
-      END IF
+      IF( wrk_not_released(3, 4,5) )   CALL ctl_stop('dyn_spg: failed to release workspace arrays')
       !
    END SUBROUTINE dyn_spg
@@ -181 +178 @@
 
       !                        ! allocate dyn_spg arrays
-      IF( lk_dynspg_ts  .AND. dyn_spg_ts_alloc () /= 0 )   CALL ctl_stop('STOP', 'dyn_spg_init: failed to allocate ts  arrays')
+      IF( lk_dynspg_ts .AND.dyn_spg_ts_alloc() /= 0 )   CALL ctl_stop('STOP', 'dyn_spg_init: failed to allocate ts  arrays')
 
       !                        ! Control of surface pressure gradient scheme options