Changeset 2715 for trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_cen2.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/dynadv_cen2.F90 (modified) (4 diffs)

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

@@ -18 +18 @@
    USE trdmod         ! ocean dynamics trends
    USE in_out_manager ! I/O manager
+   USE lib_mpp        ! MPP library
    USE prtctl         ! Print control
 
@@ -29 +30 @@
 #  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
-   !! NEMO/OPA 3.2 , LODYC-IPSL  (2009)
+   !! NEMO/OPA 4.0 , NEMO Consortium (2011)
    !! $Id$
-   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
-
 CONTAINS
 
@@ -47 +47 @@
       !! ** Action  :   (ua,va) updated with the now vorticity term trend
       !!----------------------------------------------------------------------
-      USE oce, ONLY:   zfu => ta   ! use ta as 3D workspace
-      USE oce, ONLY:   zfv => sa   ! use sa as 3D workspace
-      !!
+      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
+      USE oce     , ONLY:   zfu   => ta       , zfv   => sa       ! (ta,sa) used as 3D workspace
+      USE wrk_nemo, ONLY:   zfu_t => wrk_3d_1 , zfv_t => wrk_3d_4 , zfu_uw =>wrk_3d_6   ! 3D workspaces
+      USE wrk_nemo, ONLY:   zfu_f => wrk_3d_2 , zfv_f => wrk_3d_5 , zfv_vw =>wrk_3d_7
+      USE wrk_nemo, ONLY:   zfw   => wrk_3d_3 
+      !
       INTEGER, INTENT( in ) ::   kt   ! ocean time-step index
-      !!
+      !
       INTEGER  ::   ji, jj, jk   ! dummy loop indices
-      REAL(wp) ::   zbu, zbv     ! temporary scalars
-      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   zfu_t, zfu_f, zfu_uw   ! 3D workspace
-      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   zfv_t, zfv_f, zfv_vw   !  -      -
-      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   zfw                    !  -      -
+      REAL(wp) ::   zbu, zbv     ! local scalars
       !!----------------------------------------------------------------------
 
-      IF( kt == nit000 ) THEN
-         IF(lwp) WRITE(numout,*)
-         IF(lwp) WRITE(numout,*) 'dyn_adv_cen2 : 2nd order flux form momentum advection'
-         IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~'
+      IF( kt == nit000 .AND. lwp ) THEN
+         WRITE(numout,*)
+         WRITE(numout,*) 'dyn_adv_cen2 : 2nd order flux form momentum advection'
+         WRITE(numout,*) '~~~~~~~~~~~~'
+      ENDIF
+
+      ! Check that global workspace arrays aren't already in use
+      IF( wrk_in_use(3, 1,2,3,4,5,6,7) ) THEN
+         CALL ctl_stop('dyn_adv_cen2 : requested workspace array unavailable')   ;   RETURN
       ENDIF
 
@@ -157 +162 @@
          &                       tab3d_2=va, clinfo2=           ' Va: ', mask2=vmask, clinfo3='dyn' )
       !
+      IF( wrk_not_released(3, 1,2,3,4,5,6,7) )   CALL ctl_stop('dyn_adv_cen2: failed to release workspace array')
+      !
    END SUBROUTINE dyn_adv_cen2