Changeset 2830 for branches/2011/dev_r2802_TOP_substepping/NEMOGCM/NEMO/TOP_SRC/trcini.F90

Timestamp:

2011-08-23T12:20:06+02:00 (13 years ago)

Author:

kpedwards

Message:

Updates to average physics variables for TOP substepping.

File:

• branches/2011/dev_r2802_TOP_substepping/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) (4 diffs)

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

@@ -29 +29 @@
    USE zpshde          ! partial step: hor. derivative   (zps_hde routine)
    USE prtctl_trc      ! Print control passive tracers (prt_ctl_trc_init routine)
+   USE trcsubstp       ! variables to substep passive tracers
    
    IMPLICIT NONE
@@ -122 +123 @@
       IF( ln_rsttr ) THEN
         !
-        IF( lk_offline )  neuler = 1   ! Set time-step indicator at nit000 (leap-frog)
+        IF( lk_offline )  neuler = 1   ! Set time-step indicator at nittrc000 (leap-frog)
         CALL trc_rst_read              ! restart from a file
         !
       ELSE
         IF( lk_offline )  THEN
-           neuler = 0                  ! Set time-step indicator at nit000 (euler)
+           neuler = 0                  ! Set time-step indicator at nittrc000 (euler)
            CALL day_init               ! set calendar
         ENDIF
 #if defined key_dtatrc
-        CALL trc_dta( nit000 )      ! Initialization of tracer from a file that may also be used for damping
+        CALL trc_dta( nittrc000 )      ! Initialization of tracer from a file that may also be used for damping
         DO jn = 1, jptra
            IF( lutini(jn) )   trn(:,:,:,jn) = trdta(:,:,:,jn) * tmask(:,:,:)   ! initialisation from file if required
@@ -143 +144 @@
       
       IF( ln_zps .AND. .NOT. lk_c1d )   &              ! Partial steps: before horizontal gradient of passive
-        &    CALL zps_hde( nit000, jptra, trn, gtru, gtrv )       ! tracers at the bottom ocean level
+        &    CALL zps_hde( nittrc000, jptra, trn, gtru, gtrv )       ! tracers at the bottom ocean level
 
 
@@ -170 +171 @@
          CALL prt_ctl_trc_info( charout )
          CALL prt_ctl_trc( tab4d=trn, mask=tmask, clinfo=ctrcnm )
+      ENDIF
+
+      IF(nn_dttrc .NE. 1) THEN
+          CALL trc_sub_stp_ini      !initialize variables for substepping passive tracers
       ENDIF
       !