Changeset 1334 for trunk/NEMO/TOP_SRC/TRP/trdmld_trc.F90

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)

File:

• trunk/NEMO/TOP_SRC/TRP/trdmld_trc.F90 (modified) (10 diffs)

trunk/NEMO/TOP_SRC/TRP/trdmld_trc.F90

@@ -406 +406 @@
       !!----------------------------------------------------------------------
       INTEGER, INTENT( in ) ::   kt                               ! ocean time-step index
-      INTEGER ::   ji, jj, jk, jl, ik, it, jn
+      INTEGER ::   ji, jj, jk, jl, ik, it, jn, itmod
       REAL(wp) ::   zavt, zfn, zfn2
       !!
@@ -575 +575 @@
       tmltrd_trc(:,:,:,:) = tmltrd_trc(:,:,:,:) * ucf_trc
 
-      it = kt - nit000 + 1
-
-      MODULO_NTRD : IF( MOD( it, ntrd_trc ) == 0 ) THEN           ! nitend MUST be multiple of ntrd_trc
+      ! define time axis
+      it = kt
+      itmod = kt - nit000 + 1
+
+      MODULO_NTRD : IF( MOD( itmod, ntrd_trc ) == 0 ) THEN           ! nitend MUST be multiple of ntrd_trc
          !
          ztmltot (:,:,:) = 0.e0                                   ! reset arrays to zero
@@ -819 +821 @@
       ! ----------------------------------
 
-      IF( lwp .AND. MOD( it , ntrd_trc ) == 0 ) THEN
+      IF( lwp .AND. MOD( itmod , ntrd_trc ) == 0 ) THEN
          WRITE(numout,*) ' '
          WRITE(numout,*) 'trd_mld_trc : write passive tracer trends in the NetCDF file :'
@@ -930 +932 @@
 # endif /* key_dimgout */
 
-      IF( MOD( it, ntrd_trc ) == 0 ) THEN
+      IF( MOD( itmod, ntrd_trc ) == 0 ) THEN
          !
          ! Reset cumulative arrays to zero
@@ -999 +1001 @@
       INTEGER, INTENT( in ) ::   kt                       ! ocean time-step index
 #if defined key_lobster
-      INTEGER  ::  jl, it
+      INTEGER  ::  jl, it, itmod
       LOGICAL  :: llwarn  = .TRUE., lldebug = .TRUE.
       REAL(wp), DIMENSION(jpi,jpj,jpdiabio) ::  ztmltrdbio2  ! only needed for mean diagnostics
@@ -1059 +1061 @@
       tmltrd_bio(:,:,:) = tmltrd_bio(:,:,:) * ucf_trc
 
-      MODULO_NTRD : IF( MOD( kt, ntrd_trc ) == 0 ) THEN      ! nitend MUST be multiple of ntrd
+      ! define time axis
+      it = kt
+      itmod = kt - nit000 + 1
+
+      MODULO_NTRD : IF( MOD( itmod, ntrd_trc ) == 0 ) THEN      ! nitend MUST be multiple of ntrd
          !
          zfn  = float(nmoymltrdbio)    ;    zfn2 = zfn * zfn
@@ -1132 +1138 @@
 
       ! define time axis
-      it = kt - nit000 + 1
-
-      IF( lwp .AND. MOD( it , ntrd_trc ) == 0 ) THEN
+      it = kt
+      itmod = kt - nit000 + 1
+
+      IF( lwp .AND. MOD( itmod , ntrd_trc ) == 0 ) THEN
          WRITE(numout,*) ' '
          WRITE(numout,*) 'trd_mld_bio : write ML bio trends in the NetCDF file :'
@@ -1174 +1181 @@
 # endif /* key_dimgout */
 
-      IF( MOD( it, ntrd_trc ) == 0 ) THEN
+      IF( MOD( itmod, ntrd_trc ) == 0 ) THEN
          !
          ! III.5 Reset cumulative arrays to zero
@@ -1455 +1462 @@
             CALL dia_nam( clhstnam, ntrd_trc, csuff )
             CALL histbeg( clhstnam, jpi, glamt, jpj, gphit,                                            &
-               &        1, jpi, 1, jpj, 0, zjulian, rdt, nh_t(jn), nidtrd(jn), domain_id=nidom )
+               &        1, jpi, 1, jpj, nit000-1, zjulian, rdt, nh_t(jn), nidtrd(jn), domain_id=nidom )
       
             !-- Define the ML depth variable
@@ -1468 +1475 @@
           CALL dia_nam( clhstnam, ntrd_trc, 'trdbio' )
           CALL histbeg( clhstnam, jpi, glamt, jpj, gphit,                                            &
-             &             1, jpi, 1, jpj, 0, zjulian, rdt, nh_tb, nidtrdbio, domain_id=nidom )
+             &             1, jpi, 1, jpj, nit000-1, zjulian, rdt, nh_tb, nidtrdbio, domain_id=nidom )
 #endif