Changeset 3166 for branches/2011/dev_NEMO_MERGE_2011

Timestamp:

2011-11-21T21:21:02+01:00 (12 years ago)

Author:

cetlod

Message:

Correct the timestep at which passive tracers are initialized with climatological data

Location:

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC

Files:

• trcini.F90 (modified) (3 diffs)
• trcstp.F90 (modified) (1 diff)

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/trcini.F90

@@ -109 +109 @@
       IF( ln_rsttr ) THEN
         !
-        IF( lk_offline )  neuler = 1   ! Set time-step indicator at nittrc000 (leap-frog)
+        IF( lk_offline )  neuler = 1   ! Set time-step indicator at nit000 (leap-frog)
         CALL trc_rst_read              ! restart from a file
         !
       ELSE
         IF( lk_offline )  THEN
-           neuler = 0                  ! Set time-step indicator at nittrc000 (euler)
+           neuler = 0                  ! Set time-step indicator at nit000 (euler)
            CALL day_init               ! set calendar
         ENDIF
@@ -123 +123 @@
             ENDIF
             !
-            CALL trc_dta( nittrc000, ztrcdta )   ! read tracer data at nittrc000
+            CALL trc_dta( nit000, ztrcdta )   ! read tracer data at nit000
             !
             DO jn = 1, jptra
@@ -141 +141 @@
       
       IF( ln_zps .AND. .NOT. lk_c1d )   &              ! Partial steps: before horizontal gradient of passive
-        &    CALL zps_hde( nittrc000, jptra, trn, gtru, gtrv )       ! tracers at the bottom ocean level
+        &    CALL zps_hde( nit000, jptra, trn, gtru, gtrv )       ! tracers at the bottom ocean level
       !                                                              ! masked grid volume
       DO jk = 1, jpk

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/trcstp.F90

@@ -80 +80 @@
          tra(:,:,:,:) = 0.e0
          !
-                                   CALL trc_rst_opn( kt )       ! Open tracer restart file 
-         IF( lk_iomput ) THEN  ;   CALL trc_wri    ( kt )       ! output of passive tracers with iom I/O manager
-         ELSE                  ;   CALL trc_dia    ( kt )       ! output of passive tracers with old I/O manager
+                                   CALL trc_rst_opn  ( kt )       ! Open tracer restart file 
+         IF( lk_iomput ) THEN  ;   CALL trc_wri      ( kt )       ! output of passive tracers with iom I/O manager
+         ELSE                  ;   CALL trc_dia      ( kt )       ! output of passive tracers with old I/O manager
          ENDIF
-                                   CALL trc_sms( kt )           ! tracers: sinks and sources
-                                   CALL trc_trp( kt )           ! transport of passive tracers
-         IF( lrst_trc )            CALL trc_rst_wri( kt )       ! write tracer restart file
-         IF( lk_trdmld_trc  )      CALL trd_mld_trc( kt )       ! trends: Mixed-layer
+                                   CALL trc_sms      ( kt )       ! tracers: sinks and sources
+                                   CALL trc_trp      ( kt )       ! transport of passive tracers
+         IF( lrst_trc )            CALL trc_rst_wri  ( kt )       ! write tracer restart file
+         IF( lk_trdmld_trc  )      CALL trd_mld_trc  ( kt )       ! trends: Mixed-layer
          !
-         IF( nn_dttrc /= 1   )     CALL trc_sub_reset( kt )  ! resetting physical variables when sub-stepping
+         IF( nn_dttrc /= 1   )     CALL trc_sub_reset( kt )       ! resetting physical variables when sub-stepping
          !
       ENDIF