Changeset 1334 for trunk/NEMO/OPA_SRC/TRD

Timestamp:

2009-03-03T15:07:48+01:00 (15 years ago)

Author:

smasson

Message:

complete work on time origin in outputs (ticket:335) + downward vertical axis (ticket:357)

Location:

trunk/NEMO/OPA_SRC/TRD

Files:

• trdmld.F90 (modified) (6 diffs)
• trdvor.F90 (modified) (4 diffs)

trunk/NEMO/OPA_SRC/TRD/trdmld.F90

@@ -230 +230 @@
       INTEGER, INTENT( in ) ::   kt   ! ocean time-step index
       !!
-      INTEGER :: ji, jj, jk, jl, ik, it
+      INTEGER :: ji, jj, jk, jl, ik, it, itmod
       LOGICAL :: lldebug = .TRUE.
       REAL(wp) :: zavt, zfn, zfn2
@@ -389 +389 @@
       smltrd(:,:,:) = smltrd(:,:,:) * ucf   !  is no longer used, and is reset to 0. at next time step)
       
-      it = kt - nit000 + 1
-
-      MODULO_NTRD : IF( MOD( it, ntrd ) == 0 ) THEN        ! nitend MUST be multiple of ntrd
+      ! define time axis
+      it = kt
+      itmod = kt - nit000 + 1
+
+      MODULO_NTRD : IF( MOD( itmod, ntrd ) == 0 ) THEN        ! nitend MUST be multiple of ntrd
          !
          ztmltot (:,:) = 0.e0   ;   zsmltot (:,:) = 0.e0   ! reset arrays to zero
@@ -576 +578 @@
 #if defined key_dimgout
 
-      IF( MOD( it, ntrd ) == 0 ) THEN
+      IF( MOD( itmod, ntrd ) == 0 ) THEN
          iyear =  ndastp/10000
          imon  = (ndastp-iyear*10000)/100
@@ -593 +595 @@
       ! ----------------------------------
 
-      IF( lwp .AND. MOD( it , ntrd ) == 0 ) THEN
+      IF( lwp .AND. MOD( itmod , ntrd ) == 0 ) THEN
          WRITE(numout,*) ' '
          WRITE(numout,*) 'trd_mld : write trends in the NetCDF file :'
@@ -683 +685 @@
 #endif
 
-      IF( MOD( it, ntrd ) == 0 ) THEN
+      IF( MOD( itmod, ntrd ) == 0 ) THEN
          !
          ! III.5 Reset cumulative arrays to zero
@@ -876 +878 @@
       IF(lwp) WRITE(numout,*) ' Name of NETCDF file ', clhstnam
       CALL histbeg( clhstnam, jpi, glamt, jpj, gphit,                                            &
-      &             1, jpi, 1, jpj, 0, zjulian, rdt, nh_t, nidtrd, domain_id=nidom )
+      &             1, jpi, 1, jpj, nit000-1, zjulian, rdt, nh_t, nidtrd, domain_id=nidom )
 
       !-- Define the ML depth variable

trunk/NEMO/OPA_SRC/TRD/trdvor.F90

@@ -312 +312 @@
       INTEGER, INTENT( in ) ::   kt   ! ocean time-step index
       !!
-      INTEGER  ::   ji, jj, jk, jl, it
+      INTEGER  ::   ji, jj, jk, jl, it, itmod
       REAL(wp) ::   zmean
       REAL(wp), DIMENSION(jpi,jpj) ::   zun, zvn
@@ -406 +406 @@
 
       ! define time axis
-      it= kt - nit000 + 1
+      it = kt
+      itmod = kt - nit000 + 1
 
       IF( MOD( it, ntrd ) == 0 ) THEN
@@ -455 +456 @@
       IF( kt >=  nit000+1 ) THEN
 
-         IF( lwp .AND. MOD( it, ntrd ) == 0 ) THEN
+         IF( lwp .AND. MOD( itmod, ntrd ) == 0 ) THEN
             WRITE(numout,*) ''
             WRITE(numout,*) 'trd_vor : write trends in the NetCDF file at kt = ', kt
@@ -568 +569 @@
       IF(lwp) WRITE(numout,*) ' Name of NETCDF file ', clhstnam
       CALL histbeg( clhstnam, jpi, glamf, jpj, gphif,1, jpi,   &  ! Horizontal grid : glamt and gphit
-         &          1, jpj, 0, zjulian, rdt, nh_t, nidvor, domain_id=nidom )
+         &          1, jpj, nit000-1, zjulian, rdt, nh_t, nidvor, domain_id=nidom )
       CALL wheneq( jpi*jpj, fmask, 1, 1., ndexvor1, ndimvor1 )    ! surface