Changeset 2590 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/TRA/zpshde.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/TRA/zpshde.F90 (modified) (3 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/TRA/zpshde.F90

@@ -80 +80 @@
       !!              - pgru, pgrv: horizontal gradient of rho (if present) at u- & v-points 
       !!----------------------------------------------------------------------
+      USE wrk_nemo, ONLY: wrk_use, wrk_release
+      USE wrk_nemo, ONLY: zri => wrk_2d_1, zrj => wrk_2d_2   ! interpolated value of rd
+      USE wrk_nemo, ONLY: zhi => wrk_2d_3, zhj => wrk_2d_4   ! depth of interpolation for eos2d
+      USE wrk_nemo, ONLY: wrk_3d_1, wrk_3d_2
+      !!
       INTEGER                              , INTENT(in   )           ::  kt          ! ocean time-step index
       INTEGER                              , INTENT(in   )           ::  kjpt        ! number of tracers
@@ -89 +94 @@
       INTEGER  ::   ji, jj, jn      ! Dummy loop indices
       INTEGER  ::   iku, ikv, ikum1, ikvm1   ! partial step level (ocean bottom level) at u- and v-points
-      REAL(wp), DIMENSION(jpi,jpj,kjpt) ::   zti, ztj     ! interpolated value of tracer
-      REAL(wp), DIMENSION(jpi,jpj)      ::   zri, zrj     ! interpolated value of rd
-      REAL(wp), DIMENSION(jpi,jpj)      ::   zhi, zhj     ! depth of interpolation for eos2d
+      REAL(wp), POINTER, DIMENSION(:,:,:) ::   zti, ztj    ! interpolated value of tracer
       REAL(wp) ::  ze3wu, ze3wv, zmaxu, zmaxv  ! temporary scalars
       !!----------------------------------------------------------------------
+
+      IF( (.NOT. wrk_use(2, 1,2,3,4)) .OR. (.NOT. wrk_use(3, 1,2)) )THEN
+         CALL ctl_stop('zps_hde: requested workspace arrays unavailable.')
+         RETURN
+      ELSE IF(kjpt > jpk)THEN
+         CALL ctl_stop('zps_hde: no. of tracers > jpk so cannot use 3D workspace arrays from wrk_nemo module.')
+         RETURN
+      END IF
+      ! Set-up pointers to sub-arrays of workspaces
+      zti => wrk_3d_1(:,:,1:kjpt)
+      ztj => wrk_3d_2(:,:,1:kjpt)
 
       DO jn = 1, kjpt      !==   Interpolation of tracers at the last ocean level   ==!
@@ -200 +214 @@
       END IF
       !
+      IF( (.NOT. wrk_release(2, 1,2,3,4)) .OR. (.NOT. wrk_release(3, 1,2)) )THEN
+         CALL ctl_stop('zps_hde: failed to release workspace arrays.')
+      END IF
+      !
    END SUBROUTINE zps_hde