Changeset 2590 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn_c3d.h90

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/LDF/ldfdyn_c3d.h90 (modified) (6 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn_c3d.h90

@@ -27 +27 @@
       !!----------------------------------------------------------------------
       USE ldftra_oce, ONLY : aht0
+      USE wrk_nemo, ONLY: wrk_use, wrk_release
+      USE wrk_nemo, ONLY: zcoef => wrk_1d_2
       !!
       LOGICAL, INTENT (in) :: ld_print   ! If true, output arrays on numout
@@ -40 +42 @@
          zetmax, zefmax, &
          zeumax, zevmax   
-      REAL(wp), DIMENSION(jpk) ::   zcoef   ! temporary workspace
-      !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
+
+      IF(.not. wrk_use(1,2))THEN
+         CALL ctl_stop('ldf_dyn_c3d: ERROR: requested workspace array unavailable.')
+         RETURN
+      END IF
 
       IF(lwp) WRITE(numout,*)
@@ -182 +188 @@
       ENDIF
 
+      IF(.not. wrk_release(1,2))THEN
+         CALL ctl_stop('ldf_dyn_c3d: ERROR: failed to release workspace array.')
+      END IF
+
    END SUBROUTINE ldf_dyn_c3d
 
@@ -194 +204 @@
       !!----------------------------------------------------------------------
       USE ldftra_oce, ONLY : aht0
+      USE wrk_nemo, ONLY: wrk_use, wrk_release, iwrk_use, iwrk_release
+      USE wrk_nemo, ONLY:  icof => iwrk_2d_1
+      USE wrk_nemo, ONLY: zahm0 =>  wrk_2d_1
+      USE wrk_nemo, ONLY: zcoef =>  wrk_1d_1
       !!
       LOGICAL, INTENT (in) :: ld_print   ! If true, output arrays on numout
@@ -203 +217 @@
       INTEGER ::   ifreq, il1, il2, ij, ii
       INTEGER, DIMENSION(jpidta, jpjdta) ::   idata
-      INTEGER, DIMENSION(jpi   , jpj   ) ::   icof
 
       REAL(wp) ::   &
          zahmeq, zcoff, zcoft, zmsk,   & ! ???
          zemax, zemin, zeref, zahmm
-      REAL(wp), DIMENSION(jpi,jpj) ::   zahm0
-      REAL(wp), DIMENSION(jpk) ::   zcoef
 
       CHARACTER (len=15) ::   clexp
       !!----------------------------------------------------------------------
+
+      IF( (.not. iwrk_use(2,1)) .OR. (.not. wrk_use(2,1)) .OR. &
+          (.not. wrk_use(1,1)))THEN
+         CALL ctl_stop('ldf_dyn_c3d_orca: ERROR: requested workspace arrays are unavailable.')
+         RETURN
+      END IF
 
       IF(lwp) WRITE(numout,*)
@@ -457 +474 @@
       ENDIF
 
+      IF( (.not. iwrk_release(2,1)) .OR. (.not. wrk_release(2,1)) .OR. &
+          (.not. wrk_release(1,1)))THEN
+         CALL ctl_stop('ldf_dyn_c3d_orca: ERROR: failed to release workspace arrays.')
+      END IF
+
    END SUBROUTINE ldf_dyn_c3d_orca