Changeset 9019 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/dtatsd.F90

Timestamp:

2017-12-13T15:58:53+01:00 (6 years ago)

Author:

timgraham

Message:

Merge of dev_CNRS_2017 into branch

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/dtatsd.F90 (modified) (7 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/dtatsd.F90

@@ -16 +16 @@
    !!----------------------------------------------------------------------
    USE oce             ! ocean dynamics and tracers
+   USE phycst          ! physical constants
    USE dom_oce         ! ocean space and time domain
    USE fldread         ! read input fields
+   !
    USE in_out_manager  ! I/O manager
-   USE phycst          ! physical constants
    USE lib_mpp         ! MPP library
-   USE wrk_nemo        ! Memory allocation
    USE timing          ! Timing
 
@@ -62 +62 @@
       !!----------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )  CALL timing_start('dta_tsd_init')
+      IF( ln_timing )   CALL timing_start('dta_tsd_init')
       !
       !  Initialisation
@@ -120 +120 @@
       ENDIF
       !
-      IF( nn_timing == 1 )  CALL timing_stop('dta_tsd_init')
+      IF( ln_timing )   CALL timing_stop('dta_tsd_init')
       !
    END SUBROUTINE dta_tsd_init
@@ -145 +145 @@
       INTEGER ::   ji, jj, jk, jl, jkk   ! dummy loop indicies
       INTEGER ::   ik, il0, il1, ii0, ii1, ij0, ij1   ! local integers
-      REAL(wp)::   zl, zi
-      REAL(wp), POINTER, DIMENSION(:) ::  ztp, zsp   ! 1D workspace
-      !!----------------------------------------------------------------------
-      !
-      IF( nn_timing == 1 )  CALL timing_start('dta_tsd')
+      REAL(wp)::   zl, zi                             ! local scalars
+      REAL(wp), DIMENSION(jpk) ::  ztp, zsp   ! 1D workspace
+      !!----------------------------------------------------------------------
+      !
+      IF( ln_timing )   CALL timing_start('dta_tsd')
       !
       CALL fld_read( kt, 1, sf_tsd )      !==   read T & S data at kt time step   ==!
@@ -185 +185 @@
       !
       IF( ln_sco ) THEN                   !==   s- or mixed s-zps-coordinate   ==!
-         !
-         CALL wrk_alloc( jpk, ztp, zsp )
          !
          IF( kt == nit000 .AND. lwp )THEN
@@ -222 +220 @@
          END DO
          ! 
-         CALL wrk_dealloc( jpk, ztp, zsp )
-         ! 
       ELSE                                !==   z- or zps- coordinate   ==!
          !                             
@@ -260 +256 @@
       ENDIF
       !
-      IF( nn_timing == 1 )  CALL timing_stop('dta_tsd')
+      IF( ln_timing )   CALL timing_stop('dta_tsd')
       !
    END SUBROUTINE dta_tsd