Changeset 7274

Timestamp:

2016-11-19T18:13:47+01:00 (8 years ago)

Author:

cetlod

Message:

Offline_vvl in 3.6 stable : minor bug correction

File:

• branches/2015/dev_r6946_Offline_vvl/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90 (modified) (6 diffs)

branches/2015/dev_r6946_Offline_vvl/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90

@@ -85 +85 @@
    REAL(wp) , ALLOCATABLE, SAVE, DIMENSION(:,:,:,:) :: wslpjdta   ! meridional diapycnal slopes
 
+   INTEGER, SAVE  :: nprevrec, nsecdyn
 
    !! * Substitutions
@@ -118 +119 @@
       IF( nn_timing == 1 )  CALL timing_start( 'dta_dyn')
       !
+      !
+      nsecdyn = nsec_year + nsec1jan000   ! number of seconds between Jan. 1st 00h of nit000 year and the middle of time step
+      !
+      IF( kt == nit000 ) THEN    ;    nprevrec = 0
+      ELSE                       ;    nprevrec = sf_dyn(jf_tem)%nrec_a(2)
+      ENDIF
+      !
       CALL fld_read( kt, 1, sf_dyn )      !=  read data at kt time step   ==!
+      !
+      IF( lk_ldfslp .AND. .NOT.lk_c1d )   CALL  dta_dyn_slp( kt )    ! Computation of slopes
       !
       tsn(:,:,:,jp_tem) = sf_dyn(jf_tem)%fnow(:,:,:)  * tmask(:,:,:)    ! temperature
@@ -161 +171 @@
       rn2b(:,:,:) = rn2(:,:,:)         ! need for zdfmxl
       CALL zdf_mxl( kt )                                                   ! In any case, we need mxl
-      !
-      IF( lk_ldfslp .AND. .NOT.lk_c1d )   CALL  dta_dyn_slp( kt )    ! Computation of slopes
       !
       hmld(:,:)         = sf_dyn(jf_mld)%fnow(:,:,1) * tmask(:,:,1)    ! mixed layer depht
@@ -585 +593 @@
       REAL(wp) ::   ztinta     ! ratio applied to after  records when doing time interpolation
       REAL(wp) ::   ztintb     ! ratio applied to before records when doing time interpolation
-      INTEGER  ::   iswap, isecdyn, iprevrec 
+      INTEGER  ::   iswap
       REAL(wp), POINTER, DIMENSION(:,:,:) :: zuslp, zvslp, zwslpi, zwslpj
       !!---------------------------------------------------------------------
       !
       CALL wrk_alloc(jpi, jpj, jpk, zuslp, zvslp, zwslpi, zwslpj )
-      !
-      isecdyn = nsec_year + nsec1jan000   ! number of seconds between Jan. 1st 00h of nit000 year and the middle of time step
-      !
-      IF( kt == nit000 ) THEN    ;    iprevrec = 0
-      ELSE                       ;    iprevrec = sf_dyn(jf_tem)%nrec_a(2)
-      ENDIF
       !
       IF( sf_dyn(jf_tem)%ln_tint ) THEN    ! Computes slopes (here avt is used as workspace)                       
@@ -619 +621 @@
            ! 
            iswap = 0
-           IF( sf_dyn(jf_tem)%nrec_a(2) - iprevrec /= 0 )  iswap = 1
-           IF( isecdyn > sf_dyn(jf_tem)%nrec_b(2) .AND. iswap == 1 )  THEN    ! read/update the after data
+           IF( sf_dyn(jf_tem)%nrec_a(2) - nprevrec /= 0 )  iswap = 1
+           IF( nsecdyn > sf_dyn(jf_tem)%nrec_b(2) .AND. iswap == 1 )  THEN    ! read/update the after data
               IF(lwp) WRITE(numout,*) ' Compute new slopes at kt = ', kt
               uslpdta (:,:,:,1) =  uslpdta (:,:,:,2)         ! swap the data
@@ -641 +643 @@
       !
       IF( sf_dyn(jf_tem)%ln_tint )  THEN
-         ztinta =  REAL( isecdyn - sf_dyn(jf_tem)%nrec_b(2), wp )  &
+         ztinta =  REAL( nsecdyn - sf_dyn(jf_tem)%nrec_b(2), wp )  &
             &    / REAL( sf_dyn(jf_tem)%nrec_a(2) - sf_dyn(jf_tem)%nrec_b(2), wp )
          ztintb =  1. - ztinta