Changeset 2642 for branches

Timestamp:

2011-03-02T19:32:23+01:00 (13 years ago)

Author:

cetlod

Message:

Modify the routine zpshde.F90 to be able to run a biogeo model with no. of tracers > jpk

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

@@ -84 +84 @@
       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
@@ -95 +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), POINTER, DIMENSION(:,:,:) ::   zti, ztj    ! interpolated value of tracer
+      REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) ::   zti, ztj    ! interpolated value of tracer
       REAL(wp) ::  ze3wu, ze3wv, zmaxu, zmaxv  ! temporary scalars
       !!----------------------------------------------------------------------
 
-      IF( wrk_in_use(2, 1,2,3,4) .OR. wrk_in_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
+      IF( wrk_in_use(2, 1,2,3,4) ) THEN
+         CALL ctl_stop('zps_hde: requested workspace arrays unavailable.')  ;  RETURN
       END IF
-      ! Set-up pointers to sub-arrays of workspaces
-      zti => wrk_3d_1(:,:,1:kjpt)
-      ztj => wrk_3d_2(:,:,1:kjpt)
+
+      ! Allocate workspaces whose dimension is > jpk
+      ALLOCATE( zti(jpi,jpj,kjpt) )
+      ALLOCATE( ztj(jpi,jpj,kjpt) )
 
       DO jn = 1, kjpt      !==   Interpolation of tracers at the last ocean level   ==!
@@ -215 +211 @@
       END IF
       !
-      IF( wrk_not_released(2, 1,2,3,4) .OR. wrk_not_released(3, 1,2) )THEN
-         CALL ctl_stop('zps_hde: failed to release workspace arrays.')
-      END IF
+      IF( wrk_not_released(2, 1,2,3,4) ) CALL ctl_stop('zps_hde: failed to release workspace arrays.')
+
+      DEALLOCATE( zti )
+      DEALLOCATE( ztj )
       !
    END SUBROUTINE zps_hde