Changeset 3231 for branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90

Timestamp:

2011-12-21T10:11:11+01:00 (12 years ago)

Author:

smasson

Message:

dev_NEMO_MERGE_2011: supress TARGET attribute for tsa and use work arrays

File:

• branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) (18 diffs)

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90

@@ -76 +76 @@
       !!             - Save the trend (l_trddyn=T)
       !!----------------------------------------------------------------------
-      USE oce, ONLY:   tsa                         ! (tsa) used as 2 3D workspace
-      !!
       INTEGER, INTENT(in) ::   kt   ! ocean time-step index
       REAL(wp), POINTER, DIMENSION(:,:,:) ::  ztrdu, ztrdv
@@ -85 +83 @@
       !
       IF( l_trddyn ) THEN                    ! Temporary saving of ua and va trends (l_trddyn)
-         ztrdu => tsa(:,:,:,1) 
-         ztrdv => tsa(:,:,:,2) 
-         !
+         CALL wrk_alloc( jpi,jpj,jpk, ztrdu, ztrdv )
          ztrdu(:,:,:) = ua(:,:,:)  
          ztrdv(:,:,:) = va(:,:,:) 
@@ -104 +100 @@
          ztrdv(:,:,:) = va(:,:,:) - ztrdv(:,:,:)
          CALL trd_mod( ztrdu, ztrdv, jpdyn_trd_hpg, 'DYN', kt )
+         CALL wrk_dealloc( jpi,jpj,jpk, ztrdu, ztrdv )
       ENDIF          
       !
@@ -191 +188 @@
       !! ** Action : - Update (ua,va) with the now hydrastatic pressure trend
       !!----------------------------------------------------------------------
-      USE oce, ONLY:   tsa                         ! (tsa) used as 2 3D workspace
-      !!
       INTEGER, INTENT(in) ::   kt    ! ocean time-step index
       !!
@@ -199 +194 @@
       REAL(wp), POINTER, DIMENSION(:,:,:) ::  zhpi, zhpj 
       !!----------------------------------------------------------------------
-      
-      zhpi => tsa(:,:,:,1) 
-      zhpj => tsa(:,:,:,2) 
+      !  
+      CALL wrk_alloc( jpi,jpj,jpk, zhpi, zhpj )
       !
       IF( kt == nit000 ) THEN
@@ -245 +239 @@
       END DO
       !
+      CALL wrk_dealloc( jpi,jpj,jpk, zhpi, zhpj )
+      !
    END SUBROUTINE hpg_zco
 
@@ -256 +252 @@
       !! ** Action  : - Update (ua,va) with the now hydrastatic pressure trend
       !!---------------------------------------------------------------------- 
-      USE oce, ONLY:   tsa                         ! (tsa) used as 2 3D workspace
-      !!
       INTEGER, INTENT(in) ::   kt    ! ocean time-step index
       !!
@@ -265 +259 @@
       REAL(wp), POINTER, DIMENSION(:,:,:) ::  zhpi, zhpj 
       !!----------------------------------------------------------------------
-       
-      zhpi => tsa(:,:,:,1) 
-      zhpj => tsa(:,:,:,2) 
+      !
+      CALL wrk_alloc( jpi,jpj,jpk, zhpi, zhpj )
       !
       IF( kt == nit000 ) THEN
@@ -343 +336 @@
       END DO
       !
-
+      CALL wrk_dealloc( jpi,jpj,jpk, zhpi, zhpj )
+      !
    END SUBROUTINE hpg_zps
 
@@ -365 +359 @@
       !! ** Action : - Update (ua,va) with the now hydrastatic pressure trend
       !!----------------------------------------------------------------------
-      USE oce, ONLY:   tsa                         ! (tsa) used as 2 3D workspace
-      !!
       INTEGER, INTENT(in) ::   kt    ! ocean time-step index
       !!
@@ -373 +365 @@
       REAL(wp), POINTER, DIMENSION(:,:,:) ::  zhpi, zhpj 
       !!----------------------------------------------------------------------
-
-      zhpi => tsa(:,:,:,1) 
-      zhpj => tsa(:,:,:,2) 
+      !
+      CALL wrk_alloc( jpi,jpj,jpk, zhpi, zhpj )
       !
       IF( kt == nit000 ) THEN
@@ -432 +423 @@
       END DO
       !
+      CALL wrk_dealloc( jpi,jpj,jpk, zhpi, zhpj )
+      !
    END SUBROUTINE hpg_sco
 
@@ -442 +435 @@
       !! Reference: Shchepetkin and McWilliams, J. Geophys. Res., 108(C3), 3090, 2003
       !!----------------------------------------------------------------------
-      USE oce     , ONLY:   tsa                         ! (tsa) used as 2 3D workspace
-      !!
       INTEGER, INTENT(in) ::   kt    ! ocean time-step index
       !!
@@ -458 +449 @@
       CALL wrk_alloc( jpi, jpj, jpk, dzx  , dzy  , dzz  , dzu  , dzv  , dzw   ) 
       CALL wrk_alloc( jpi, jpj, jpk, drhox, drhoy, drhoz, drhou, drhov, drhow ) 
-      CALL wrk_alloc( jpi, jpj, jpk, rho_i, rho_j, rho_k                      ) 
-      zhpi => tsa(:,:,:,1) 
-      zhpj => tsa(:,:,:,2) 
+      CALL wrk_alloc( jpi, jpj, jpk, rho_i, rho_j, rho_k,  zhpi,  zhpj        ) 
       !
 
@@ -660 +649 @@
       CALL wrk_dealloc( jpi, jpj, jpk, dzx  , dzy  , dzz  , dzu  , dzv  , dzw   ) 
       CALL wrk_dealloc( jpi, jpj, jpk, drhox, drhoy, drhoz, drhou, drhov, drhow ) 
-      CALL wrk_dealloc( jpi, jpj, jpk, rho_i, rho_j, rho_k                      ) 
+      CALL wrk_dealloc( jpi, jpj, jpk, rho_i, rho_j, rho_k,  zhpi,  zhpj        ) 
       !
    END SUBROUTINE hpg_djc
@@ -678 +667 @@
       !!
       !!----------------------------------------------------------------------
-      USE oce     , ONLY:   tsa                          ! (tsa) used as 2 3D workspace
-      !!----------------------------------------------------------------------
-      !!
       INTEGER, PARAMETER  :: polynomial_type = 1    ! 1: cubic spline, 2: linear
       INTEGER, INTENT(in) ::   kt                   ! ocean time-step index
@@ -697 +683 @@
       !!----------------------------------------------------------------------
       !
-      CALL wrk_alloc( jpi, jpj, jpk, zhpi, zu, zv, fsp, xsp, asp, bsp, csp, dsp ) 
-      zdeptht => tsa(:,:,:,1) 
-      zrhh    => tsa(:,:,:,2) 
+      CALL wrk_alloc( jpi,jpj,jpk, zhpi, zu, zv, fsp, xsp, asp, bsp, csp, dsp ) 
+      CALL wrk_alloc( jpi,jpj,jpk, zdeptht, zrhh ) 
       !
       IF( kt == nit000 ) THEN
@@ -955 +940 @@
       END DO
       !
-      CALL wrk_dealloc( jpi, jpj, jpk, zhpi, zu, zv, fsp, xsp, asp, bsp, csp, dsp ) 
+      CALL wrk_dealloc( jpi,jpj,jpk, zhpi, zu, zv, fsp, xsp, asp, bsp, csp, dsp ) 
+      CALL wrk_dealloc( jpi,jpj,jpk, zdeptht, zrhh ) 
       !
    END SUBROUTINE hpg_prj