Changeset 2194

Timestamp:

2010-10-09T00:08:28+02:00 (14 years ago)

Author:

cetlod

Message:

ensure restartability of PISCES

Location:

branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC

Files:

• TRP/trcadv.F90 (modified) (2 diffs)
• TRP/trctrp.F90 (modified) (1 diff)
• trcini.F90 (modified) (1 diff)

branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/TRP/trcadv.F90

@@ -67 +67 @@
       IF( kt == nit000 )   CALL trc_adv_ctl          ! initialisation & control of options
 
+#if ! defined key_pisces
       IF( neuler == 0 .AND. kt == nit000 ) THEN     ! at nit000
          r2dt(:) =  rdttra(:) * FLOAT(nn_dttrc)          ! = rdtra (restarting with Euler time stepping)
@@ -72 +73 @@
          r2dt(:) = 2. * rdttra(:) * FLOAT(nn_dttrc)      ! = 2 rdttra (leapfrog)
       ENDIF
+#else
+      r2dt(:) =  rdttra(:) * FLOAT(nn_dttrc)          ! = rdtra (restarting with Euler time stepping)
+#endif
 
       !                                                   ! effective transport

branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/TRP/trctrp.F90

@@ -74 +74 @@
 #endif
                                 CALL trc_zdf( kstp )            ! vertical mixing and after tracer fields
+                                CALL trc_nxt( kstp )            ! tracer fields at next time step     
+         IF( ln_trcrad )        CALL trc_rad( kstp )            ! Correct artificial negative concentrations
          IF( ln_zps    )        CALL zps_hde( kstp, jptra, trn, gtru, gtrv )  ! Partial steps: now horizontal gradient of passive
                                                                 ! tracers at the bottom ocean level
-                                CALL trc_nxt( kstp )            ! tracer fields at next time step     
-         IF( ln_trcrad )        CALL trc_rad( kstp )            ! Correct artificial negative concentrations
          !
       ELSE                                               ! 1D vertical configuration

branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/trcini.F90

@@ -133 +133 @@
       
       IF( ln_zps .AND. .NOT. lk_trc_c1d )   &              ! Partial steps: before horizontal gradient of passive
-      &                     CALL zps_hde( nit000, jptra, trb, gtru, gtrv )       ! tracers at the bottom ocean level
+      &                     CALL zps_hde( nit000, jptra, trn, gtru, gtrv )       ! tracers at the bottom ocean level