Changeset 1353 for trunk/NEMO/TOP_SRC/TRP

Timestamp:

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

Author:

cetlod

Message:

correction of calendar in TOP outputs, see ticket:368

Location:

trunk/NEMO/TOP_SRC/TRP

Files:

• trcldf_iso_zps.F90 (modified) (3 diffs)
• trdmld_trc.F90 (modified) (6 diffs)

trunk/NEMO/TOP_SRC/TRP/trcldf_iso_zps.F90

@@ -81 +81 @@
       REAL(wp) ::   &
          zabe1, zabe2, zcof1, zcof2,   &  ! temporary scalars
-         zmsku, zmskv, zbtr, ztra,     &
-         ztagu, ztagv
+         zmsku, zmskv, zbtr, ztra
 
       REAL(wp), DIMENSION(jpi,jpj) ::   &
@@ -93 +92 @@
       REAL(wp), DIMENSION(jpi,jpj) ::   &
          zftug, zftvg                     ! temporary workspace
-      REAL(wp) ::   z_hdivn_x, z_hdivn_y
       REAL(wp) ::   &
-         zuwk, zvwk,                   &
-         zuwk1, zvwk1,                 &
-         zcg1,zcg2
+         z_hdivn_x, z_hdivn_y, zcg1, zcg2,  &
+         zuwk, zvwk, zuwk1, zvwk1
 #endif
       CHARACTER (len=22) :: charout
@@ -222 +219 @@
             DO jj = 2 , jpjm1
                DO ji = fs_2, fs_jpim1   ! vector opt.
-                  zbtr= 1. / ( e1t(ji,jj)*e2t(ji,jj)*fse3t(ji,jj,jk) )
+                  zbtr = 1. / ( e1t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,jk) )
                   ztra = zbtr * ( zftu(ji,jj,jk) - zftu(ji-1,jj,jk) + zftv(ji,jj,jk) - zftv(ji,jj-1,jk)  )
-                  tra (ji,jj,jk,jn) = tra (ji,jj,jk,jn) + ztra
+                  tra(ji,jj,jk,jn) = tra (ji,jj,jk,jn) + ztra
+               END DO
+            END DO
+
 #if defined key_trc_diatrd
-                  IF (luttrd(jn)) trtrd (ji,jj,jk,ikeep(jn),4) = zbtr * ( zftu(ji,jj,jk) - zftu(ji-1,  jj,jk) )
-                  IF (luttrd(jn)) trtrd (ji,jj,jk,ikeep(jn),5) = zbtr * ( zftv(ji,jj,jk) - zftv(ji  ,jj-1,jk) )
-#endif
-               END DO
-            END DO
-#if defined key_trc_diatrd
-#   if defined key_trcldf_eiv
             DO jj = 2 , jpjm1
                DO ji = fs_2, fs_jpim1   ! vector opt.
-                  zbtr= 1. / ( e1t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,jk) )
-                  ztagu = ( zftug(ji,jj) - zftug(ji-1,jj  ) ) * zbtr
-                  ztagv = ( zftvg(ji,jj) - zftvg(ji  ,jj-1) ) * zbtr
-                  IF (luttrd(jn)) trtrd (ji,jj,jk,ikeep(jn),4) = trtrd(ji,jj,jk,ikeep(jn),4) - ztagu
-                  IF (luttrd(jn)) trtrd (ji,jj,jk,ikeep(jn),5) = trtrd(ji,jj,jk,ikeep(jn),5) - ztagv
-               END DO
-            END DO
-#   endif
+                  zbtr = 1. / ( e1t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,jk) )
+                  IF( luttrd(jn) ) THEN 
+                     trtrd (ji,jj,jk,ikeep(jn),4) = zbtr * ( zftu(ji,jj,jk) - zftu(ji-1,  jj,jk) )
+                     trtrd (ji,jj,jk,ikeep(jn),5) = zbtr * ( zftv(ji,jj,jk) - zftv(ji  ,jj-1,jk) )
+                  ENDIF
+#   if defined key_trcldf_eiv
+                  IF( luttrd(jn) ) THEN 
+                     trtrd (ji,jj,jk,ikeep(jn),4) = trtrd(ji,jj,jk,ikeep(jn),4)    &
+                     &                            - zbtr * ( zftug(ji,jj) - zftug(ji-1,jj  ) ) 
+                     trtrd (ji,jj,jk,ikeep(jn),5) = trtrd(ji,jj,jk,ikeep(jn),5)    &
+                     &                            - zbtr * ( zftvg(ji,jj) - zftvg(ji  ,jj-1) )
+                  ENDIF
+#   endif
+               END DO
+            END DO
 #endif
 

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, itmod
+      INTEGER ::   ji, jj, jk, jl, ik, it, itmod, jn
       REAL(wp) ::   zavt, zfn, zfn2
       !!
@@ -575 +575 @@
       tmltrd_trc(:,:,:,:) = tmltrd_trc(:,:,:,:) * ucf_trc
 
-      ! define time axis
-      it = kt
-      itmod = kt - nit000 + 1
+      itmod = kt - nittrc000 + 1
+      it    = kt
 
       MODULO_NTRD : IF( MOD( itmod, ntrd_trc ) == 0 ) THEN           ! nitend MUST be multiple of ntrd_trc
@@ -1061 +1060 @@
       tmltrd_bio(:,:,:) = tmltrd_bio(:,:,:) * ucf_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
+      MODULO_NTRD : IF( MOD( kt, ntrd_trc ) == 0 ) THEN      ! nitend MUST be multiple of ntrd
          !
          zfn  = float(nmoymltrdbio)    ;    zfn2 = zfn * zfn
@@ -1138 +1133 @@
 
       ! define time axis
-      it = kt
-      itmod = kt - nit000 + 1
+      itmod = kt - nittrc000 + 1
+      it    = kt
 
       IF( lwp .AND. MOD( itmod , ntrd_trc ) == 0 ) THEN
@@ -1462 +1457 @@
             CALL dia_nam( clhstnam, ntrd_trc, csuff )
             CALL histbeg( clhstnam, jpi, glamt, jpj, gphit,                                            &
-               &        1, jpi, 1, jpj, nit000-1, zjulian, rdt, nh_t(jn), nidtrd(jn), domain_id=nidom )
+               &        1, jpi, 1, jpj, nittrc000-ndttrc, zjulian, rdt, nh_t(jn), nidtrd(jn), domain_id=nidom )
       
             !-- Define the ML depth variable
@@ -1475 +1470 @@
           CALL dia_nam( clhstnam, ntrd_trc, 'trdbio' )
           CALL histbeg( clhstnam, jpi, glamt, jpj, gphit,                                            &
-             &             1, jpi, 1, jpj, nit000-1, zjulian, rdt, nh_tb, nidtrdbio, domain_id=nidom )
+             &             1, jpi, 1, jpj, nittrc000-ndttrc, zjulian, rdt, nh_tb, nidtrdbio, domain_id=nidom )
 #endif