Changeset 2590 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.F90

Timestamp:

2011-02-18T13:49:27+01:00 (13 years ago)

Author:

trackstand2

Message:

Merge branch 'dynamic_memory' into master-svn-dyn

File:

• branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.F90 (modified) (3 diffs)

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

@@ -56 +56 @@
       USE oce, ONLY:   zwuw => ta   ! use ta as 3D workspace
       USE oce, ONLY:   zwvw => sa   ! use sa as 3D workspace
+      USE wrk_nemo, ONLY: wrk_use, wrk_release
+      USE wrk_nemo, ONLY: zww => wrk_2d_1
+      USE wrk_nemo, ONLY: ztrdu => wrk_3d_1, ztrdv => wrk_3d_2
       !!
       INTEGER, INTENT(in) ::   kt   ! ocean time-step inedx
@@ -61 +64 @@
       INTEGER  ::   ji, jj, jk      ! dummy loop indices
       REAL(wp) ::   zua, zva        ! temporary scalars
-      REAL(wp), DIMENSION(jpi,jpj)     ::   zww            ! 2D  workspace
-      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   ztrdu, ztrdv   ! 3D workspace
       !!----------------------------------------------------------------------
       
+      IF( (.NOT. wrk_use(2, 1))  .OR.    &
+          (.NOT. wrk_use(3, 1,2)) )THEN
+         CALL ctl_stop('dyn_zad: requested workspace arrays unavailable.')
+         RETURN
+      END IF
+
       IF( kt == nit000 ) THEN
          IF(lwp)WRITE(numout,*)
@@ -119 +126 @@
          &                       tab3d_2=va, clinfo2=       ' Va: ', mask2=vmask, clinfo3='dyn' )
       !
+      IF( (.NOT. wrk_release(2, 1))  .OR.    &
+          (.NOT. wrk_release(3, 1,2)) )THEN
+         CALL ctl_stop('dyn_zad: failed to release workspace arrays.')
+      END IF
+
    END SUBROUTINE dyn_zad