Changeset 4202

Timestamp:

2013-11-14T16:48:15+01:00 (11 years ago)

Author:

cetlod

Message:

trunk: bugfix in passive tracer substepping, see ticket #1177

Location:

trunk/NEMOGCM/NEMO/TOP_SRC

Files:

• trcini.F90 (modified) (1 diff)
• trcstp.F90 (modified) (1 diff)
• trcsub.F90 (modified) (1 diff)

trunk/NEMOGCM/NEMO/TOP_SRC/trcini.F90

@@ -145 +145 @@
 
       !
-      IF( nn_dttrc /= 1 )        CALL trc_sub_ini      ! Initialize variables for substepping passive tracers
-      !
-
       trai(:) = 0._wp                                                   ! initial content of all tracers
       DO jn = 1, jptra

trunk/NEMOGCM/NEMO/TOP_SRC/trcstp.F90

@@ -56 +56 @@
       IF( nn_timing == 1 )   CALL timing_start('trc_stp')
       !
-      IF( kt == nittrc000 .AND. lk_trdmld_trc )  CALL trd_mld_trc_init    ! trends: Mixed-layer
       !
-      IF( lk_vvl ) THEN                                                   ! update ocean volume due to ssh temporal evolution
+      IF( kt == nit000 .AND. nn_dttrc /= 1 )     CALL trc_sub_ini        ! Initialize variables for substepping passive tracers
+      !
+      IF( kt == nit000 .AND. lk_trdmld_trc )     CALL trd_mld_trc_init   ! trends: Mixed-layer
+      !
+      IF( lk_vvl ) THEN                                                      ! update ocean volume due to ssh temporal evolution
          DO jk = 1, jpk
             cvol(:,:,jk) = e1e2t(:,:) * fse3t(:,:,jk) * tmask(:,:,jk)

trunk/NEMOGCM/NEMO/TOP_SRC/trcsub.F90

@@ -550 +550 @@
       ENDIF
       !
-      IF( nn_timing == 1 )  CALL timing_start('trc_sub_stp')
+      IF( nn_timing == 1 )  CALL timing_stop('trc_sub_stp')
       !
    END SUBROUTINE trc_sub_stp