Changeset 9125 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90

Timestamp:

2017-12-19T09:47:17+01:00 (6 years ago)

Author:

timgraham

Message:

Removed wrk_arrays from whole code. No change in SETTE results from this.

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90 (modified) (5 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90

@@ -40 +40 @@
    USE prtctl          ! print control
    USE fldread         ! read input fields 
-   USE wrk_nemo        ! Memory allocation 
    USE timing          ! Timing
    USE trc, ONLY : ln_rsttr, numrtr, numrtw, lrst_trc
@@ -108 +107 @@
       INTEGER, INTENT(in) ::   kt   ! ocean time-step index
       INTEGER             ::   ji, jj, jk
-      REAL(wp), POINTER, DIMENSION(:,:)   :: zemp
+      REAL(wp), ALLOCATABLE, DIMENSION(:,:)   :: zemp
       !!----------------------------------------------------------------------
       !
@@ -139 +138 @@
       !
       IF( .NOT.ln_linssh ) THEN
-         CALL wrk_alloc(jpi, jpj, zemp )
+         ALLOCATE( zemp(jpi,jpj) )
          zhdivtr(:,:,:) = sf_dyn(jf_div)%fnow(:,:,:) * tmask(:,:,:)    ! effective u-transport
          emp_b (:,:)    = sf_dyn(jf_empb)%fnow(:,:,1) * tmask(:,:,1)    ! E-P
          zemp   (:,:)   = 0.5_wp * ( emp(:,:) + emp_b(:,:) ) + rnf(:,:) + fwbcorr * tmask(:,:,1)
          CALL dta_dyn_ssh( kt, zhdivtr, sshb, zemp, ssha, e3t_a(:,:,:) )  !=  ssh, vertical scale factor & vertical transport
-         CALL wrk_dealloc(jpi, jpj, zemp )
+         DEALLOCATE( zemp )
          !                                           Write in the tracer restart file
          !                                          *******************************
@@ -587 +586 @@
       REAL(wp) ::   ztintb     ! ratio applied to before records when doing time interpolation
       INTEGER  ::   iswap 
-      REAL(wp), POINTER, DIMENSION(:,:,:) :: zuslp, zvslp, zwslpi, zwslpj
+      REAL(wp), DIMENSION(jpi,jpj,jpk) :: zuslp, zvslp, zwslpi, zwslpj
       !!---------------------------------------------------------------------
-      !
-      CALL wrk_alloc(jpi, jpj, jpk, zuslp, zvslp, zwslpi, zwslpj )
       !
       IF( sf_dyn(jf_tem)%ln_tint ) THEN    ! Computes slopes (here avt is used as workspace)                       
@@ -660 +657 @@
       ENDIF
       !
-      CALL wrk_dealloc(jpi, jpj, jpk, zuslp, zvslp, zwslpi, zwslpj )
-      !
    END SUBROUTINE dta_dyn_slp