Changeset 3159 for branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90

Timestamp:

2011-11-18T22:41:44+01:00 (13 years ago)

Author:

cetlod

Message:

New dynamical allocation + timing on TRA/ routines

File:

• branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 (modified) (6 diffs)

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90

@@ -46 +46 @@
    USE agrif_opa_interp
 #endif
+   USE wrk_nemo_2      ! Memory allocation
+   USE timing          ! Timing
 
    IMPLICIT NONE
@@ -92 +94 @@
       INTEGER  ::   jk, jn    ! dummy loop indices
       REAL(wp) ::   zfact     ! local scalars
-      REAL(wp), DIMENSION(:,:,:), ALLOCATABLE ::  ztrdt, ztrds
-      !!----------------------------------------------------------------------
-
+      REAL(wp), POINTER, DIMENSION(:,:,:) ::  ztrdt, ztrds
+      !!----------------------------------------------------------------------
+      !
+      IF( nn_timing == 1 )  CALL timing_start( 'tra_nxt')
+      !
       IF( kt == nit000 ) THEN
          IF(lwp) WRITE(numout,*)
@@ -125 +129 @@
       ! trends computation initialisation
       IF( l_trdtra )   THEN                    ! store now fields before applying the Asselin filter
-         ALLOCATE( ztrdt(jpi,jpj,jpk) )   ;    ztrdt(:,:,:) = tsn(:,:,:,jp_tem) 
-         ALLOCATE( ztrds(jpi,jpj,jpk) )   ;    ztrds(:,:,:) = tsn(:,:,:,jp_sal)
+         CALL wrk_alloc( jpi, jpj, jpk, ztrdt, ztrds )
+         ztrdt(:,:,:) = tsn(:,:,:,jp_tem) 
+         ztrds(:,:,:) = tsn(:,:,:,jp_sal)
       ENDIF
 
@@ -156 +161 @@
          CALL trd_tra( kt, 'TRA', jp_tem, jptra_trd_atf, ztrdt )
          CALL trd_tra( kt, 'TRA', jp_sal, jptra_trd_atf, ztrds )
-         DEALLOCATE( ztrdt )      ;     DEALLOCATE( ztrds ) 
+         CALL wrk_dealloc( jpi, jpj, jpk, ztrdt, ztrds )
       END IF
       !
@@ -162 +167 @@
       IF(ln_ctl)   CALL prt_ctl( tab3d_1=tsn(:,:,:,jp_tem), clinfo1=' nxt  - Tn: ', mask1=tmask,   &
          &                       tab3d_2=tsn(:,:,:,jp_sal), clinfo2=       ' Sn: ', mask2=tmask )
+      !
+      !
+      IF( nn_timing == 1 )  CALL timing_stop('tra_nxt')
       !
    END SUBROUTINE tra_nxt
@@ -270 +278 @@
       REAL(wp) ::   zfact2, ze3t_b, ze3t_n, ze3t_a, ze3t_f, ze3t_d   !   -      -
       !!----------------------------------------------------------------------
-
+      !
       IF( kt == kit000 )  THEN
          IF(lwp) WRITE(numout,*)