Changeset 2715 for trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl2.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/TRA/traadv_muscl2.F90 (modified) (5 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl2.F90

@@ -1 +1 @@
 MODULE traadv_muscl2
-   !!==============================================================================
+   !!======================================================================
    !!                       ***  MODULE  traadv_muscl2  ***
    !! Ocean  tracers:  horizontal & vertical advective trend
-   !!==============================================================================
+   !!======================================================================
    !! History :  1.0  !  2002-06  (G. Madec) from traadv_muscl
    !!            3.2  !  2010-05  (C. Ethe, G. Madec)  merge TRC-TRA + switch from velocity to transport
@@ -59 +59 @@
       !!              IPSL, Sept. 2000 (http://www.lodyc.jussieu.fr/opa)
       !!----------------------------------------------------------------------
-      USE oce         , zwx => ua   ! use ua as workspace
-      USE oce         , zwy => va   ! use va as workspace
+      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
+      USE oce     , ONLY:   zwx   => ua       , zwy   => va         ! (ua,va) used as 3D workspace
+      USE wrk_nemo, ONLY:   zslpx => wrk_3d_1 , zslpy => wrk_3d_2   ! 3D workspace
       !!
       INTEGER                              , INTENT(in   ) ::   kt              ! ocean time-step index
@@ -71 +72 @@
       !!
       INTEGER  ::   ji, jj, jk, jn   ! dummy loop indices
-      REAL(wp) ::   zu, z0u, zzwx    ! local scalar
-      REAL(wp) ::   zv, z0v, zzwy    !   -      -
-      REAL(wp) ::   zw, z0w          !   -      -
-      REAL(wp) ::   ztra, zbtr, zdt, zalpha
-      REAL(wp), DIMENSION (jpi,jpj,jpk) ::  zslpx, zslpy   ! 3D workspace
+      REAL(wp) ::   zu, z0u, zzwx, zw         ! local scalars
+      REAL(wp) ::   zv, z0v, zzwy, z0w        !   -      -
+      REAL(wp) ::   ztra, zbtr, zdt, zalpha   !   -      -
       !!----------------------------------------------------------------------
+
+      IF( wrk_in_use(3, 1,2) ) THEN
+         CALL ctl_stop('tra_adv_muscl2: requested workspace arrays are unavailable')   ;   RETURN
+      ENDIF
 
       IF( kt == nit000 )  THEN
@@ -84 +87 @@
          !
          l_trd = .FALSE.
-         IF( ( cdtype == 'TRA' .AND. l_trdtra ) .OR. ( cdtype == 'TRC' .AND. l_trdtrc ) ) l_trd = .TRUE.
+         IF( ( cdtype == 'TRA' .AND. l_trdtra ) .OR. ( cdtype == 'TRC' .AND. l_trdtrc ) )   l_trd = .TRUE.
       ENDIF
 
@@ -282 +285 @@
       END DO
       !
+      IF( wrk_not_released(3, 1,2) )   CALL ctl_stop('tra_adv_muscl2: failed to release workspace arrays')
+      !
    END SUBROUTINE tra_adv_muscl2