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

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

@@ -28 +28 @@
 
    !! * Routine accessibility
-   PUBLIC dyn_ldf_bilapg ! called by step.F90
+   PUBLIC dyn_ldf_bilapg       ! called by step.F90
+   PUBLIC dyn_ldf_bilapg_alloc ! called by nemogcm.F90
+
+   ! These are just workspace arrays but since they're (jpi,jpk) it's not
+   ! worth putting them in the wrk_nemo module.
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) ::  zfuw, zfvw, zdiu, zdiv
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) ::  zdju, zdj1u, zdjv, zdj1v 
 
    !! * Substitutions
@@ -40 +46 @@
 
 CONTAINS
+
+   FUNCTION dyn_ldf_bilapg_alloc()
+      !!----------------------------------------------------------------------
+      !!               ***  ROUTINE dyn_ldf_bilapg_alloc  ***
+      !!----------------------------------------------------------------------
+      INTEGER :: dyn_ldf_bilapg_alloc
+
+      ALLOCATE(zfuw(jpi,jpk), zfvw(jpi,jpk),  zdiu(jpi,jpk), zdiv(jpi,jpk), &
+               zdju(jpi,jpk), zdj1u(jpi,jpk), zdjv(jpi,jpk), zdj1v(jpi,jpk),&
+               Stat = dyn_ldf_bilapg_alloc)
+
+      IF(dyn_ldf_bilapg_alloc /= 0)THEN
+         CALL ctl_warn('dyn_ldf_bilapg_alloc: failed to allocate arrays')
+      END IF
+
+   END FUNCTION dyn_ldf_bilapg_alloc
+
 
    SUBROUTINE dyn_ldf_bilapg( kt )
@@ -76 +99 @@
       USE oce, ONLY :    zwk3 => ta,   & ! use ta as 3D workspace   
                          zwk4 => sa      ! use sa as 3D workspace   
-
+      USE wrk_nemo, ONLY: wrk_use, wrk_release
+      ! work array used for rotated biharmonic operator on 
+      ! tracers and/or momentum
+      USE wrk_nemo, ONLY: zwk1 => wrk_3d_1, & 
+                          zwk2 => wrk_3d_2
       !! * Arguments
       INTEGER, INTENT( in ) ::   kt           ! ocean time-step index
@@ -82 +109 @@
       !! * Local declarations
       INTEGER ::   ji, jj, jk                 ! dummy loop indices
-      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   &
-         zwk1, zwk2                ! work array used for rotated biharmonic
-         !                         ! operator on tracers and/or momentum
-      !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
+
+      IF(.NOT. wrk_use(3, 1,2))THEN
+         CALL ctl_stop('dyn_ldf_bilapg: requested workspace arrays unavailable.')
+         RETURN
+      END IF
 
       IF( kt == nit000 ) THEN
@@ -130 +159 @@
       END DO                                           !   End of slab
       !                                                ! ===============
-
+      IF(.NOT. wrk_release(3, 1,2))THEN
+         CALL ctl_stop('dyn_ldf_bilapg: failed to release workspace arrays.')
+      END IF
+      !
    END SUBROUTINE dyn_ldf_bilapg
 
@@ -179 +211 @@
       !!   8.5  !  02-08  (G. Madec)  F90: Free form and module
       !!----------------------------------------------------------------------
+      USE wrk_nemo, ONLY: wrk_use, wrk_release
+      USE wrk_nemo, ONLY: ziut => wrk_2d_1, zjuf => wrk_2d_2, zjvt => wrk_2d_3
+      USE wrk_nemo, ONLY: zivf => wrk_2d_4, zdku => wrk_2d_5, zdk1u => wrk_2d_6
+      USE wrk_nemo, ONLY: zdkv => wrk_2d_7, zdk1v => wrk_2d_8
+      !!
       !! * Arguments
       REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT( in ) ::   &
@@ -199 +236 @@
          zbur, zbvr, zmkt, zmkf, zuav, zvav,    &
          zuwslpi, zuwslpj, zvwslpi, zvwslpj
-      REAL(wp), DIMENSION(jpi,jpj) ::   &
-         ziut, zjuf , zjvt, zivf,       &  ! workspace
-         zdku, zdk1u, zdkv, zdk1v
-      REAL(wp), DIMENSION(jpi,jpk) ::   &
-         zfuw, zfvw, zdiu, zdiv,        &  ! workspace
-         zdju, zdj1u, zdjv, zdj1v 
-      !!----------------------------------------------------------------------
-
+      !!----------------------------------------------------------------------
+
+      IF(.NOT. wrk_use(2, 1,2,3,4,5,6,7,8))THEN
+         CALL ctl_stop('dyn:ldfguv : requested workspace arrays unavailable.')
+         RETURN
+      END IF
       !                               ! ********** !   ! ===============
       DO jk = 1, jpkm1                ! First step !   ! Horizontal slab
@@ -461 +496 @@
       END DO                                           !   End of slab
       !                                                ! ===============
+
+      IF(.NOT. wrk_release(2, 1,2,3,4,5,6,7,8))THEN
+         CALL ctl_stop('dyn:ldfguv : failed to release workspace arrays.')
+      END IF
+      !
    END SUBROUTINE ldfguv
 
@@ -469 +509 @@
 CONTAINS
    SUBROUTINE dyn_ldf_bilapg( kt )               ! Dummy routine
+      INTEGER, INTENT(in) :: kt
       WRITE(*,*) 'dyn_ldf_bilapg: You should not have seen this print! error?', kt
    END SUBROUTINE dyn_ldf_bilapg