Changeset 2715 for trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.F90

Timestamp:

2011-03-30T17:58:35+02:00 (13 years ago)

Author:

rblod

Message:

First attempt to put dynamic allocation on the trunk

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.F90 (modified) (5 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.F90

@@ -4 +4 @@
    !! Ocean dynamics : vertical advection trend
    !!======================================================================
-   !! History :  6.0  !  91-01  (G. Madec) Original code
-   !!            7.0  !  91-11  (G. Madec)
-   !!            7.5  !  96-01  (G. Madec) statement function for e3
-   !!            8.5  !  02-07  (G. Madec) j-k-i case: Original code
-   !!            8.5  !  02-07  (G. Madec) Free form, F90
+   !! History :  OPA  ! 1991-01  (G. Madec) Original code
+   !!            7.0  ! 1991-11  (G. Madec)
+   !!            7.5  ! 1996-01  (G. Madec) statement function for e3
+   !!   NEMO     0.5  ! 2002-07  (G. Madec) Free form, F90
    !!----------------------------------------------------------------------
    
@@ -20 +19 @@
    USE trdmod         ! ocean dynamics trends 
    USE in_out_manager ! I/O manager
+   USE lib_mpp         ! MPP library
    USE prtctl         ! Print control
 
@@ -33 +33 @@
    !! NEMO/OPA 3.3 , NEMO Consortium (2010)
    !! $Id$
-   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
-
 CONTAINS
 
@@ -54 +53 @@
       !!              - Save the trends in (ztrdu,ztrdv) ('key_trddyn')
      !!----------------------------------------------------------------------
-      USE oce, ONLY:   zwuw => ta   ! use ta as 3D workspace
-      USE oce, ONLY:   zwvw => sa   ! use sa as 3D workspace
-      !!
+      USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released
+      USE wrk_nemo, ONLY:   zww   => wrk_2d_1                        ! 2D workspace
+      USE oce     , ONLY:   zwuw  => ta       , zwvw  => sa          ! (ta,sa) used as 3D workspace
+      USE wrk_nemo, ONLY:   ztrdu => wrk_3d_1 , ztrdv => wrk_3d_2    ! 3D workspace
+      !
       INTEGER, INTENT(in) ::   kt   ! ocean time-step inedx
-      !!
+      !
       INTEGER  ::   ji, jj, jk      ! dummy loop indices
       REAL(wp) ::   zua, zva        ! temporary scalars
-      REAL(wp), DIMENSION(jpi,jpj)     ::   zww            ! 2D  workspace
-      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   ztrdu, ztrdv   ! 3D workspace
       !!----------------------------------------------------------------------
       
+      IF( wrk_in_use(2, 1) .OR. wrk_in_use(3, 1,2) ) THEN
+         CALL ctl_stop('dyn_zad: requested workspace arrays unavailable')   ;   RETURN
+      ENDIF
+
       IF( kt == nit000 ) THEN
          IF(lwp)WRITE(numout,*)
@@ -119 +122 @@
          &                       tab3d_2=va, clinfo2=       ' Va: ', mask2=vmask, clinfo3='dyn' )
       !
+      IF( wrk_not_released(2, 1)   .OR.   &
+          wrk_not_released(3, 1,2) )   CALL ctl_stop('dyn_zad: failed to release workspace arrays')
+      !
    END SUBROUTINE dyn_zad