Changeset 7601

Timestamp:

2017-01-24T13:39:27+01:00 (8 years ago)

Author:

frrh

Message:

#1821 more changes to replace pointers with ALLOCATE in traldf_iso

File:

• branches/UKMO/dev_r5518_optim_GO6_alloc/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90 (modified) (4 diffs)

branches/UKMO/dev_r5518_optim_GO6_alloc/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90

@@ -32 +32 @@
    USE phycst          ! physical constants
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
-   USE wrk_nemo        ! Memory Allocation
    USE timing          ! Timing
 
@@ -110 +109 @@
       REAL(wp) ::  zmskv, zabe2, zcof2, zcoef4       !   -      -
       REAL(wp) ::  zcoef0, zbtr                      !   -      -
-      REAL(wp), POINTER, DIMENSION(:,:  ) ::  z2d
-      REAL(wp), POINTER, DIMENSION(:,:,:) ::  zdkt, zdk1t, zdit, zdjt, ztfw 
+      REAL(wp), ALLOCATABLE, DIMENSION(:,:  ) ::  z2d
+      REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) ::  zdkt, zdk1t, zdit, zdjt, ztfw 
       REAL(wp), ALLOCATABLE, DIMENSION(:,:,:), TARGET ::  ztrax, ztray, ztraz 
       REAL(wp), ALLOCATABLE, DIMENSION(:,:,:), TARGET ::  ztrax_T, ztray_T, ztraz_T
@@ -118 +117 @@
       IF( nn_timing == 1 )  CALL timing_start('tra_ldf_iso')
       !
-      CALL wrk_alloc( jpi, jpj,      z2d ) 
-      CALL wrk_alloc( jpi, jpj, jpk, zdit, zdjt, ztfw, zdkt, zdk1t) 
+      ALLOCATE( z2d(jpi, jpj)) 
+      ALLOCATE( zdit(jpi, jpj, jpk))
+      ALLOCATE( zdjt(jpi, jpj, jpk)) 
+      ALLOCATE( ztfw(jpi, jpj, jpk)) 
+      ALLOCTAE( zdkt(jpi, jpj, jpk)) 
+      ALLOCATE( zdk1t(jpi, jpj, jpk)) 
       ALLOCATE( ztrax(jpi,jpj,jpk), ztray(jpi,jpj,jpk), ztraz(jpi,jpj,jpk) ) 
       IF( l_trdtra .and. cdtype == 'TRA' ) ALLOCATE( ztrax_T(jpi,jpj,jpk), ztray_T(jpi,jpj,jpk), ztraz_T(jpi,jpj,jpk) ) 
@@ -347 +350 @@
       ENDIF
       !
-      CALL wrk_dealloc( jpi, jpj, z2d ) 
-      CALL wrk_dealloc( jpi, jpj, jpk, zdit, zdjt, ztfw, zdkt, zdk1t ) 
+      DEALLOCATE( z2d ) 
+      DEALLOCATE( zdit) 
+      DEALLOCATE( zdjt)
+      DEALLOCATE( ztfw) 
+      DEALLOCATE( zdkt )
+      DEALLOCATE( zdk1t ) 
       DEALLOCATE( ztrax, ztray, ztraz ) 
       IF( l_trdtra  .and. cdtype == 'TRA' ) DEALLOCATE( ztrax_T, ztray_T, ztraz_T )