Changeset 2590 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_iso.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/dynldf_iso.F90 (modified) (6 diffs)

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

@@ -30 +30 @@
    !! * Routine accessibility
    PUBLIC dyn_ldf_iso           ! called by step.F90
+   PUBLIC dyn_ldf_iso_alloc     ! called by nemogcm.F90
+
+   ! These are just workspace arrays but because they are (jpi,jpk) in extent
+   ! we can't use the arrays in wrk_nemo for them
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) :: zfuw, zdiu, zdju, zdj1u
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) :: zfvw, zdiv, zdjv, zdj1v
 
    !! * Substitutions
@@ -42 +48 @@
 
 CONTAINS
+
+   FUNCTION dyn_ldf_iso_alloc()
+      !!----------------------------------------------------------------------
+      !!                  ***  ROUTINE dyn_ldf_iso_alloc  ***
+      !!----------------------------------------------------------------------
+      INTEGER :: dyn_ldf_iso_alloc
+      !!----------------------------------------------------------------------
+
+      ALLOCATE(zfuw(jpi,jpk), zdiu(jpi,jpk), zdju(jpi,jpk), zdj1u(jpi,jpk), & 
+               zfvw(jpi,jpk), zdiv(jpi,jpk), zdjv(jpi,jpk), zdj1v(jpi,jpk), &
+               Stat=dyn_ldf_iso_alloc)
+
+      IF(dyn_ldf_iso_alloc /= 0)THEN
+         CALL ctl_warn('dyn_ldf_iso_alloc: array allocate failed.')
+      END IF
+
+   END FUNCTION dyn_ldf_iso_alloc
+
 
    SUBROUTINE dyn_ldf_iso( kt )
@@ -93 +117 @@
       !!        !  05-11  (G. Madec)  s-coordinate: horizontal diffusion
       !!----------------------------------------------------------------------
+      USE wrk_nemo, ONLY: wrk_use, wrk_release
+      USE wrk_nemo, ONLY: ziut => wrk_2d_1, zjuf  => wrk_2d_2, & ! temporary workspace
+                          zjvt => wrk_2d_3, zivf  => wrk_2d_4, & 
+                          zdku => wrk_2d_5, zdk1u => wrk_2d_6, &
+                          zdkv => wrk_2d_7, zdk1v => wrk_2d_8
+      !!
       !! * Arguments
       INTEGER, INTENT( in ) ::   kt       ! ocean time-step index
@@ -102 +132 @@
          zmskt, zmskf, zbu, zbv,       &
          zuah, zvah
-      REAL(wp), DIMENSION(jpi,jpj) ::   &
-         ziut, zjuf, zjvt, zivf,        & ! temporary workspace
-         zdku, zdk1u, zdkv, zdk1v
 
       REAL(wp) ::   &
          zcoef0, zcoef3, zcoef4, zmkt, zmkf,   &
          zuav, zvav, zuwslpi, zuwslpj, zvwslpi, zvwslpj
-      REAL(wp), DIMENSION(jpi,jpk) ::        &
-         zfuw, zdiu, zdju, zdj1u,            & !    "        "
-         zfvw, zdiv, zdjv, zdj1v
-
-      !!----------------------------------------------------------------------
+
+      !!----------------------------------------------------------------------
+
+      IF( .NOT. wrk_use(2, 1,2,3,4,5,6,7,8))THEN
+         CALL ctl_stop('dyn_ldf_iso: requested workspace arrays unavailable.')
+         RETURN
+      END IF
 
       IF( kt == nit000 ) THEN
@@ -420 +449 @@
       !                                                ! ===============
 
+      IF( .NOT. wrk_release(2, 1,2,3,4,5,6,7,8))THEN
+         CALL ctl_stop('dyn_ldf_iso: failed to release workspace arrays.')
+      END IF
+
    END SUBROUTINE dyn_ldf_iso
 
@@ -428 +461 @@
 CONTAINS
    SUBROUTINE dyn_ldf_iso( kt )               ! Empty routine
+      INTEGER, INTENT(in) :: kt
       WRITE(*,*) 'dyn_ldf_iso: You should not have seen this print! error?', kt
    END SUBROUTINE dyn_ldf_iso