Changeset 2633 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90

Timestamp:

2011-02-28T18:23:23+01:00 (13 years ago)

Author:

trackstand2

Message:

Renamed wrk_use => wrk_in_use and wrk_release => wrk_not_released

File:

• branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90 (modified) (12 diffs)

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

@@ -204 +204 @@
       !! References : Sadourny, r., 1975, j. atmos. sciences, 32, 680-689.
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY: wrk_use, wrk_release
+      USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released
       USE wrk_nemo, ONLY: zwx => wrk_2d_1, zwy => wrk_2d_2, zwz => wrk_2d_3
       !!
@@ -218 +218 @@
       !!----------------------------------------------------------------------
 
-      IF(.NOT. wrk_use(2, 1,2,3))THEN
+      IF(wrk_in_use(2, 1,2,3))THEN
          CALL ctl_stop('dyn:vor_ene: requested workspace arrays unavailable.')
          RETURN
@@ -286 +286 @@
       END DO                                           !   End of slab
       !                                                ! ===============
-      IF(.NOT. wrk_release(2, 1,2,3))THEN
+      IF(wrk_not_released(2, 1,2,3))THEN
          CALL ctl_stop('dyn:vor_ene: failed to release workspace arrays.')
       END IF
@@ -324 +324 @@
       !! References : Sadourny, r., 1975, j. atmos. sciences, 32, 680-689.
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY: wrk_use, wrk_release
+      USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released
       USE wrk_nemo, ONLY: zwx => wrk_2d_4, zwy => wrk_2d_5, &
                           zwz => wrk_2d_6, zww => wrk_2d_7
@@ -335 +335 @@
       !!----------------------------------------------------------------------
 
-      IF(.NOT. wrk_use(2, 4,5,6,7))THEN
+      IF(wrk_in_use(2, 4,5,6,7))THEN
          CALL ctl_stop('dyn:vor_mix: requested workspace arrays unavailable.')
          RETURN
@@ -410 +410 @@
       END DO                                           !   End of slab
       !                                                ! ===============
-      IF(.NOT. wrk_release(2, 4,5,6,7))THEN
+      IF(wrk_not_released(2, 4,5,6,7))THEN
          CALL ctl_stop('dyn:vor_mix: failed to release workspace arrays.')
       END IF
@@ -443 +443 @@
       !! References : Sadourny, r., 1975, j. atmos. sciences, 32, 680-689.
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY: wrk_use, wrk_release
+      USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released
       USE wrk_nemo, ONLY: zwx => wrk_2d_4, zwy => wrk_2d_5, zwz => wrk_2d_6
       !!
@@ -456 +456 @@
       !!----------------------------------------------------------------------
       
-      IF(.NOT. wrk_use(2, 4,5,6))THEN
+      IF(wrk_in_use(2, 4,5,6))THEN
          CALL ctl_stop('dyn:vor_ens : requested workspace arrays unavailable.')
          RETURN
@@ -532 +532 @@
       END DO                                           !   End of slab
       !                                                ! ===============
-      IF(.NOT. wrk_release(2, 4,5,6))THEN
+      IF(wrk_not_released(2, 4,5,6))THEN
          CALL ctl_stop('dyn:vor_ens : failed to release workspace arrays.')
       END IF
@@ -558 +558 @@
       !! References : Arakawa and Lamb 1980, Mon. Wea. Rev., 109, 18-36
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY:   wrk_use, wrk_release
+      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
       USE wrk_nemo, ONLY:   zwx  => wrk_2d_1 , zwy  => wrk_2d_2 ,  zwz => wrk_2d_3 
       USE wrk_nemo, ONLY:   ztnw => wrk_2d_4 , ztne => wrk_2d_5 
@@ -580 +580 @@
       !!----------------------------------------------------------------------
 
-      IF(.NOT. wrk_use(2, 1,2,3,4,5,6,7) .AND. .NOT. wrk_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
@@ -681 +681 @@
       END DO                                           !   End of slab
       !                                                ! ===============
-      IF(.NOT. wrk_release(2, 1,2,3,4,5,6,7) .AND.   &
-         .NOT. wrk_release(3, 1)  )   CALL ctl_stop('dyn:vor_een : failed to release workspace arrays')
+      IF(wrk_not_released(2, 1,2,3,4,5,6,7) .OR.   &
+         wrk_not_released(3, 1)  )   CALL ctl_stop('dyn:vor_een : failed to release workspace arrays')
       !
    END SUBROUTINE vor_een