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

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

@@ -33 +33 @@
    USE prtctl         ! Print control
    USE in_out_manager ! I/O manager
+   USE lib_mpp
 
    IMPLICIT NONE
@@ -218 +219 @@
       !!----------------------------------------------------------------------
 
-      IF(wrk_in_use(2, 1,2,3))THEN
-         CALL ctl_stop('dyn:vor_ene: requested workspace arrays unavailable.')
-         RETURN
-      END IF
+      IF( wrk_in_use(2, 1,2,3) ) THEN
+         CALL ctl_stop('dyn:vor_ene: requested workspace arrays unavailable')   ;   RETURN
+      ENDIF
 
       IF( kt == nit000 ) THEN
@@ -286 +286 @@
       END DO                                           !   End of slab
       !                                                ! ===============
-      IF(wrk_not_released(2, 1,2,3))THEN
-         CALL ctl_stop('dyn:vor_ene: failed to release workspace arrays.')
-      END IF
+      IF( wrk_not_released(2, 1,2,3) )   CALL ctl_stop('dyn:vor_ene: failed to release workspace arrays.')
       !
    END SUBROUTINE vor_ene
@@ -335 +333 @@
       !!----------------------------------------------------------------------
 
-      IF(wrk_in_use(2, 4,5,6,7))THEN
-         CALL ctl_stop('dyn:vor_mix: requested workspace arrays unavailable.')
-         RETURN
-      END IF
+      IF( wrk_in_use(2, 4,5,6,7) ) THEN
+         CALL ctl_stop('dyn:vor_mix: requested workspace arrays unavailable')   ;   RETURN
+      ENDIF
 
       IF( kt == nit000 ) THEN
@@ -410 +407 @@
       END DO                                           !   End of slab
       !                                                ! ===============
-      IF(wrk_not_released(2, 4,5,6,7))THEN
-         CALL ctl_stop('dyn:vor_mix: failed to release workspace arrays.')
-      END IF
+      IF( wrk_not_released(2, 4,5,6,7) )   CALL ctl_stop('dyn:vor_mix: failed to release workspace arrays')
       !
    END SUBROUTINE vor_mix
@@ -456 +451 @@
       !!----------------------------------------------------------------------
       
-      IF(wrk_in_use(2, 4,5,6))THEN
-         CALL ctl_stop('dyn:vor_ens : requested workspace arrays unavailable.')
-         RETURN
+      IF( wrk_in_use(2, 4,5,6) ) THEN
+         CALL ctl_stop('dyn:vor_ens : requested workspace arrays unavailable')   ;   RETURN
       END IF
 
@@ -532 +526 @@
       END DO                                           !   End of slab
       !                                                ! ===============
-      IF(wrk_not_released(2, 4,5,6))THEN
-         CALL ctl_stop('dyn:vor_ens : failed to release workspace arrays.')
-      END IF
+      IF( wrk_not_released(2, 4,5,6) )   CALL ctl_stop('dyn:vor_ens : failed to release workspace arrays')
       !
    END SUBROUTINE vor_ens
@@ -580 +572 @@
       !!----------------------------------------------------------------------
 
-      IF(wrk_in_use(2, 1,2,3,4,5,6,7) .OR. wrk_in_use(3, 1) ) THEN
+      IF( wrk_in_use(2, 1,2,3,4,5,6,7) .OR. wrk_in_use(3, 1) ) THEN
          CALL ctl_stop('dyn:vor_een : requested workspace arrays unavailable.')   ;   RETURN
-      END IF
+      ENDIF
 
       IF( kt == nit000 ) THEN