Changeset 1353 for trunk/NEMO/TOP_SRC/trcdia.F90

Timestamp:

2009-03-31T10:15:02+02:00 (15 years ago)

Author:

cetlod

Message:

correction of calendar in TOP outputs, see ticket:368

File:

• trunk/NEMO/TOP_SRC/trcdia.F90 (modified) (13 diffs)

trunk/NEMO/TOP_SRC/trcdia.F90

@@ -141 +141 @@
 
       ! define time axis
-      it = kt
       itmod = kt - nittrc000 + 1
+      it    = kt
 
       ! Define NETCDF files and fields at beginning of first time step
@@ -157 +157 @@
          IF(lwp)WRITE(numout,*)' Date 0 used :', nittrc000                         &
             &                 ,' YEAR ', nyear, ' MONTH ', nmonth, ' DAY ', nday   &
-            &                 ,'Julian day : ', xjulian    
+            &                 ,'Julian day : ', xjulian  
+  
          IF(lwp) WRITE(numout,*) ' indexes of zoom = ', iimi, iima, ijmi, ijma,  &
             &                    ' limit storage in depth = ', ipk
 
 
-! Define the NETCDF files for passive tracer concentration
-
+         ! Define the NETCDF files for passive tracer concentration
          CALL dia_nam( clhstnam, nwritetrc, 'ptrc_T' )
          IF(lwp)WRITE(numout,*)" Name of NETCDF file ", clhstnam
-! Horizontal grid : glamt and gphit
+
+         ! Horizontal grid : glamt and gphit
          CALL histbeg( clhstnam, jpi, glamt, jpj, gphit,     &
             &          iimi, iima-iimi+1, ijmi, ijma-ijmi+1,         & 
-            &          nittrc000-1, xjulian, zdt, nhorit5, nit5 , domain_id=nidom)
-! Vertical grid for tracer : gdept
-         CALL histvert( nit5, 'deptht', 'Vertical T levels', &
-            &            'm', ipk, gdept_0, ndepit5, 'down')
-
-! Index of ocean points in 3D and 2D (surface)
-         CALL wheneq( jpi*jpj*ipk,tmask,1,1.,ndext50,ndimt50 )
-         CALL wheneq( jpi*jpj,tmask,1,1.,ndext51,ndimt51 )
-
-! Declare all the output fields as NETCDF variables
-
-! tracer concentrations
+            &          nittrc000-ndttrc, xjulian, zdt, nhorit5, nit5 , domain_id=nidom)
+
+         ! Vertical grid for tracer : gdept
+         CALL histvert( nit5, 'deptht', 'Vertical T levels', 'm', ipk, gdept_0, ndepit5)
+
+         ! Index of ocean points in 3D and 2D (surface)
+         CALL wheneq( jpi*jpj*ipk, tmask, 1, 1., ndext50, ndimt50 )
+         CALL wheneq( jpi*jpj    , tmask, 1, 1., ndext51, ndimt51 )
+
+         ! Declare all the output fields as NETCDF variables
          DO jn = 1, jptra
             IF( lutsav(jn) ) THEN
@@ -187 +186 @@
                cltrau = ctrcun(jn)   ! UNIT for tracer
                CALL histdef( nit5, cltra, cltral, cltrau, jpi, jpj, nhorit5,  &
-                  &               ipk, 1, ipk,  ndepit5, 32, clop, zsto, zout) 
+                  &          ipk, 1, ipk,  ndepit5, 32, clop, zsto, zout ) 
             ENDIF
          END DO
@@ -278 +277 @@
 
       ! define time axis
-      it = kt
       itmod = kt - nittrc000 + 1
+      it    = kt
 
       ! Define the NETCDF files (one per tracer)
@@ -300 +299 @@
                CALL histbeg( clhstnam, jpi, glamt, jpj, gphit,       &
                   &          iimi, iima-iimi+1, ijmi, ijma-ijmi+1,   &
-                  &          nittrc000-1, xjulian, rdt, nhorit6(jn),           &
+                  &          nittrc000-ndttrc, xjulian, zdt, nhorit6(jn),  &
                   &          nit6(jn) , domain_id=nidom )
 
                ! Vertical grid for tracer trend - one per each tracer IF needed
-               CALL histvert( nit6(jn), 'deptht', 'Vertical T levels',   &
-                  &           'm', ipk, gdept_0, ndepit6(jn), 'down' ) 
+               CALL histvert( nit6(jn), 'deptht', 'Vertical T levels', 'm', ipk, gdept_0, ndepit6(jn) ) 
              END IF
           END DO
@@ -504 +502 @@
       ENDIF
 #  if defined key_diainstant
-      zsto=nwritedia*zdt
+      zsto = nwritedia * zdt
       clop = "inst("//TRIM(clop)//")"
 #  else
-      zsto=zdt
+      zsto = zdt
       clop = "ave("//TRIM(clop)//")"
 #  endif
-      zout=nwritedia*zdt
+      zout = nwritedia * zdt
 
       ! Define indices of the horizontal output zoom and vertical limit storage
@@ -518 +516 @@
 
       ! define time axis
-      it = kt
       itmod = kt - nittrc000 + 1
+      it    = kt
 
       ! 1. Define NETCDF files and fields at beginning of first time step
@@ -539 +537 @@
          CALL histbeg( clhstnam, jpi, glamt, jpj, gphit,             &
             &          iimi, iima-iimi+1, ijmi, ijma-ijmi+1,         &
-            &          nittrc000-1, xjulian, zdt, nhoritd, nitd , domain_id=nidom )
+            &          nittrc000-ndttrc, xjulian, zdt, nhoritd, nitd , domain_id=nidom )
 
          ! Vertical grid for 2d and 3d arrays
 
-         CALL histvert( nitd, 'deptht', 'Vertical T levels',   &
-            &           'm', ipk, gdept_0, ndepitd, 'down')
+         CALL histvert( nitd, 'deptht', 'Vertical T levels','m', ipk, gdept_0, ndepitd)
 
          ! Declare all the output fields as NETCDF variables
@@ -655 +652 @@
       ENDIF
 #        if defined key_diainstant
-      zsto=nwritebio*zdt
+      zsto = nwritebio * zdt
       clop = "inst("//TRIM(clop)//")"
 #        else
-      zsto=zdt
+      zsto = zdt
       clop = "ave("//TRIM(clop)//")"
 #        endif
-      zout=nwritebio*zdt
-
-      ! Define indices of the horizontal output zoom and vertical limit storage      iimi = 1      ;      iima = jpi
+      zout = nwritebio * zdt
+
+      ! Define indices of the horizontal output zoom and vertical limit storage
       iimi = 1      ;      iima = jpi
       ijmi = 1      ;      ijma = jpj
@@ -669 +666 @@
 
       ! define time axis
-      it = kt
       itmod = kt - nittrc000 + 1
+      it    = kt
 
       ! Define NETCDF files and fields at beginning of first time step
@@ -684 +681 @@
          IF(lwp)WRITE(numout,*) " Name of NETCDF file for biological trends ", clhstnam
          ! Horizontal grid : glamt and gphit
-    CALL histbeg(clhstnam, jpi, glamt, jpj, gphit,      &
+         CALL histbeg( clhstnam, jpi, glamt, jpj, gphit,      &
             &    iimi, iima-iimi+1, ijmi, ijma-ijmi+1,          &
-            &    nittrc000-1, xjulian, rdt, nhoritb, nitb , domain_id=nidom)
+            &    nittrc000-ndttrc, xjulian, zdt, nhoritb, nitb , domain_id=nidom )
          ! Vertical grid for biological trends
-         CALL histvert(nitb, 'deptht', 'Vertical T levels',  &
-            &    'm', ipk, gdept_0, ndepitb, 'down')
+         CALL histvert(nitb, 'deptht', 'Vertical T levels', 'm', ipk, gdept_0, ndepitb)
 
          ! Declare all the output fields as NETCDF variables
@@ -697 +693 @@
             cltral = ctrbil(jn)   ! long title for biological diagnostic
             cltrau = ctrbiu(jn)   ! UNIT for biological diagnostic
-            CALL histdef(nitb, cltra, cltral, cltrau, jpi, jpj, nhoritb,  &
+            CALL histdef( nitb, cltra, cltral, cltrau, jpi, jpj, nhoritb,  &
                &         ipk, 1, ipk,  ndepitb, 32, clop, zsto, zout)
          END DO
 
          ! CLOSE netcdf Files
-          CALL histend(nitb)
+          CALL histend( nitb )
 
          IF(lwp) WRITE(numout,*)
@@ -720 +716 @@
 
       DO jn = 1, jpdiabio
-         cltra=ctrbio(jn)  ! short title for biological diagnostic
+         cltra = ctrbio(jn)  ! short title for biological diagnostic
          CALL histwrite(nitb, cltra, it, trbio(:,:,:,jn), ndimt50,ndext50)
       END DO