Changeset 3294 for trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_eiv.F90

Timestamp:

2012-01-28T17:44:18+01:00 (12 years ago)

Author:

rblod

Message:

Merge of 3.4beta into the trunk

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_eiv.F90 (modified) (6 diffs)

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

@@ -27 +27 @@
    USE diaar5, ONLY:   lk_diaar5
 # endif  
+   USE wrk_nemo        ! Memory Allocation
+   USE timing          ! Timing
 
    IMPLICIT NONE
@@ -45 +47 @@
 CONTAINS
 
-   SUBROUTINE tra_adv_eiv( kt, pun, pvn, pwn, cdtype )
+   SUBROUTINE tra_adv_eiv( kt, kit000, pun, pvn, pwn, cdtype )
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE tra_adv_eiv  ***
@@ -63 +65 @@
       !! ** Action  : - add to p.n the eiv component
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY:   zu_eiv => wrk_2d_1 , zv_eiv => wrk_2d_2 , zw_eiv => wrk_2d_3   ! 2D workspace
-# if defined key_diaeiv 
-      USE wrk_nemo, ONLY:   z2d => wrk_2d_4   ! 2D workspace
-#endif
       INTEGER                         , INTENT(in   ) ::   kt       ! ocean time-step index
+      INTEGER                         , INTENT(in   ) ::   kit000   ! first time step index
       CHARACTER(len=3)                , INTENT(in   ) ::   cdtype   ! =TRA or TRC (tracer indicator)
       REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(inout) ::   pun      ! in : 3 ocean velocity components 
@@ -80 +78 @@
       REAL(wp) ::   zztmp                      ! local scalar
 # endif  
+      REAL(wp), POINTER, DIMENSION(:,:) :: zu_eiv, zv_eiv, zw_eiv, z2d
       !!----------------------------------------------------------------------
-
-# if defined key_diaeiv 
-      IF( wrk_in_use(2, 1,2,3,4) ) THEN
+      !
+      IF( nn_timing == 1 )  CALL timing_start( 'tra_adv_eiv')
+      !
+# if defined key_diaeiv 
+      CALL wrk_alloc( jpi, jpj, zu_eiv, zv_eiv, zw_eiv, z2d )
 # else
-      IF( wrk_in_use(2, 1,2,3)   ) THEN
-# endif
-         CALL ctl_stop('tra_adv_eiv: requested workspace arrays are unavailable')   ;   RETURN
-      ENDIF
-
-      IF( kt == nit000 )  THEN
+      CALL wrk_alloc( jpi, jpj, zu_eiv, zv_eiv, zw_eiv )
+# endif
+
+      IF( kt == kit000 )  THEN
          IF(lwp) WRITE(numout,*)
          IF(lwp) WRITE(numout,*) 'tra_adv_eiv : eddy induced advection on ', cdtype,' :'
@@ -191 +190 @@
       ! 
 # if defined key_diaeiv 
-      IF( wrk_not_released(2, 1,2,3,4) )   CALL ctl_stop('tra_adv_eiv: failed to release workspace arrays')
+      CALL wrk_dealloc( jpi, jpj, zu_eiv, zv_eiv, zw_eiv, z2d )
 # else
-      IF( wrk_not_released(2, 1,2,3)   )   CALL ctl_stop('tra_adv_eiv: failed to release workspace arrays')
-# endif
+      CALL wrk_dealloc( jpi, jpj, zu_eiv, zv_eiv, zw_eiv )
+# endif
+      !
+      IF( nn_timing == 1 )  CALL timing_stop( 'tra_adv_eiv')
       !
     END SUBROUTINE tra_adv_eiv
@@ -203 +204 @@
    !!----------------------------------------------------------------------
 CONTAINS
-   SUBROUTINE tra_adv_eiv( kt, pun, pvn, pwn, cdtype )              ! Empty routine
+   SUBROUTINE tra_adv_eiv( kt, kit000, pun, pvn, pwn, cdtype )              ! Empty routine
       INTEGER  ::   kt    
+      INTEGER  ::   kit000    
       CHARACTER(len=3) ::   cdtype
       REAL, DIMENSION(:,:,:) ::   pun, pvn, pwn