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

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

@@ -36 +36 @@
    USE prtctl          ! Print control
    USE lbclnk          ! lateral boundary condition 
+   USE lib_mpp         ! MPP library
 
    IMPLICIT NONE
@@ -80 +81 @@
       !!
       INTEGER, INTENT(in) ::   kt   ! ocean time-step index
-      !!
-      !!----------------------------------------------------------------------
-      !
-      IF(wrk_in_use(3, 1,2) ) THEN
+      !!----------------------------------------------------------------------
+      !
+      IF( wrk_in_use(3, 1,2) ) THEN
          CALL ctl_stop('dyn_hpg: requested workspace arrays are unavailable')   ;   RETURN
-      END IF
+      ENDIF
       !
       IF( l_trddyn ) THEN                    ! Temporary saving of ua and va trends (l_trddyn)
@@ -111 +111 @@
          &                       tab3d_2=va, clinfo2=       ' Va: ', mask2=vmask, clinfo3='dyn' )
       !
-      IF(wrk_not_released(3, 1,2) )   CALL ctl_stop('dyn_hpg: failed to release workspace arrays')
+      IF( wrk_not_released(3, 1,2) )   CALL ctl_stop('dyn_hpg: failed to release workspace arrays')
       !
    END SUBROUTINE dyn_hpg
@@ -152 +152 @@
       !
       IF( lk_vvl .AND. .NOT. ln_hpg_sco )   &
-         &   CALL ctl_stop( 'dyn_hpg_init : variable volume key_vvl require the standard jacobian formulation hpg_sco')
+         &   CALL ctl_stop('dyn_hpg_init : variable volume key_vvl require the standard jacobian formulation hpg_sco')
       !
       !                               ! Set nhpg from ln_hpg_... flags
@@ -172 +172 @@
       IF( ln_hpg_djc )   ioptio = ioptio + 1
       IF( ln_hpg_rot )   ioptio = ioptio + 1
-      IF ( ioptio /= 1 )   CALL ctl_stop( ' NO or several hydrostatic pressure gradient options used' )
+      IF( ioptio /= 1 )   CALL ctl_stop( 'NO or several hydrostatic pressure gradient options used' )
       !
    END SUBROUTINE dyn_hpg_init
@@ -619 +619 @@
       !!----------------------------------------------------------------------
 
-      IF(wrk_in_use(3, 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15) ) THEN
+      IF( wrk_in_use(3, 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15) ) THEN
          CALL ctl_stop('dyn:hpg_djc : requested workspace arrays unavailable')   ;   RETURN
-      END IF
+      ENDIF
 
       IF( kt == nit000 ) THEN
@@ -819 +819 @@
       END DO
       !
-      IF(wrk_not_released(3, 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15) )   &
-         CALL ctl_stop('dyn:hpg_djc : failed to release workspace arrays.')
+      IF( wrk_not_released(3, 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15) )   &
+         CALL ctl_stop('dyn:hpg_djc : failed to release workspace arrays')
       !
    END SUBROUTINE hpg_djc