Changeset 7545 for branches/UKMO/MEDUSA_optim_MG_MS_RH/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90

Timestamp:

2017-01-11T12:27:34+01:00 (7 years ago)

Author:

frrh

Message:

Apply Maff's changes with the exception of
NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcbio_medusa.F90
which will clash with changes made to the source code since
the optimisation work started.

File:

• branches/UKMO/MEDUSA_optim_MG_MS_RH/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90 (modified) (3 diffs)

branches/UKMO/MEDUSA_optim_MG_MS_RH/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90

@@ -78 +78 @@
       !
       INTEGER ::   jk   ! dummy loop index
-      REAL(wp), POINTER, DIMENSION(:,:,:) :: zun, zvn, zwn
+      REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) :: zun, zvn, zwn
+
       !!----------------------------------------------------------------------
       !
       IF( nn_timing == 1 )  CALL timing_start('tra_adv')
       !
-      CALL wrk_alloc( jpi, jpj, jpk, zun, zvn, zwn )
+
+      ALLOCATE( zun(1:jpi, 1:jpj, 1:jpk) )
+      ALLOCATE( zvn(1:jpi, 1:jpj, 1:jpk) )
+      ALLOCATE( zwn(1:jpi, 1:jpj, 1:jpk) )
+
       !                                          ! set time step
       IF( neuler == 0 .AND. kt == nit000 ) THEN     ! at nit000
@@ -108 +113 @@
       zvn(:,:,jpk) = 0._wp                                                     ! no transport trough the bottom
       zwn(:,:,jpk) = 0._wp                                                     ! no transport trough the bottom
+
       !
       IF( lk_traldf_eiv .AND. .NOT. ln_traldf_grif )   &
@@ -155 +161 @@
          &                       tab3d_2=tsa(:,:,:,jp_sal), clinfo2=       ' Sa: ', mask2=tmask, clinfo3='tra' )
       !
+      DEALLOCATE ( zun, zvn, zwn )
       IF( nn_timing == 1 )  CALL timing_stop( 'tra_adv' )
       !
-      CALL wrk_dealloc( jpi, jpj, jpk, zun, zvn, zwn )
       !                                          
    END SUBROUTINE tra_adv