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

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

@@ -67 +67 @@
       !! Reference : Shchepetkin & McWilliams, 2005, Ocean Modelling. 
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY:   wrk_use, wrk_release
+      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
       USE oce     , ONLY:   zfu    => ta       ! ta used as 3D workspace
       USE oce     , ONLY:   zfv    => sa       ! sa used as 3D workspace
@@ -90 +90 @@
 
       ! Check that required workspace arrays are not already in use
-      IF( .not. wrk_use(3, 1,2,3,4,5,6,7) .AND. .not. wrk_use(4, 1,2,3,4) ) THEN
+      IF( wrk_in_use(3, 1,2,3,4,5,6,7) .OR. wrk_in_use(4, 1,2,3,4) ) THEN
          CALL ctl_stop('dyn_adv_ubs : requested workspace array unavailable')   ;   RETURN
       END IF
@@ -254 +254 @@
          &                       tab3d_2=va, clinfo2=           ' Va: ', mask2=vmask, clinfo3='dyn' )
       !
-      IF( .not. wrk_release(3, 1,2,3,4,5,6,7) .OR. &
-          .not. wrk_release(4, 1,2,3,4)        )   CALL ctl_stop('dyn_adv_ubs : failed to release workspace array')
+      IF( wrk_not_released(3, 1,2,3,4,5,6,7) .OR. &
+          wrk_not_released(4, 1,2,3,4)        )   CALL ctl_stop('dyn_adv_ubs : failed to release workspace array')
       !
    END SUBROUTINE dyn_adv_ubs