Changeset 11427 for NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/TOP/TRP/trctrp.F90

Timestamp:

2019-08-09T15:44:20+02:00 (5 years ago)

Author:

davestorkey

Message:

dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap :
Restore independent time level indices for TOP in order to enable the option for
TOP to have a different timestep to OCE (nn_dttrc > 1). But note that this version of
the code only works for nn_dttrc=1. Also sort out the time-level swapping for OFF.
This commit passes the GYRE_PISCES and ORCA2_OFF_PISCES tests but fails restartability
and bit-comparison with the control for ORCA2_ICE_PISCES.

File:

• NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/TOP/TRP/trctrp.F90 (modified) (4 diffs)

NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/TOP/TRP/trctrp.F90

@@ -36 +36 @@
    PUBLIC   trc_trp    ! called by trc_stp
 
+   INTEGER, SAVE :: N_save  !  Save value of time index for time swapping for ln_top_euler=.true.
+
    !!----------------------------------------------------------------------
    !! NEMO/TOP 4.0 , NEMO Consortium (2018)
@@ -53 +55 @@
       !!              - Update the passive tracers
       !!----------------------------------------------------------------------
-      INTEGER, INTENT( in ) :: kt                  ! ocean time-step index
-      INTEGER, INTENT( in ) :: Kbb, Kmm, Krhs, Kaa ! time level indices
+      INTEGER, INTENT( in    ) :: kt                  ! ocean time-step index
+      INTEGER, INTENT( inout ) :: Kbb, Kmm, Krhs, Kaa ! TOP time level indices (swapped in this routine)
       !! ---------------------------------------------------------------------
       !
       IF( ln_timing )   CALL timing_start('trc_trp')
+      !
+      IF ( kt == nit000 ) N_save = Kbb
       !
       IF( .NOT. lk_c1d ) THEN
@@ -79 +83 @@
                                 CALL trc_zdf    ( kt, Kbb, Kmm, Krhs, tr, Kaa  )  ! vert. mixing & after tracer   ==> after
                                 CALL trc_atf    ( kt, Kbb, Kmm, Kaa , tr )        ! time filtering of "now" tracer fields    
-         IF( ln_trcrad )        CALL trc_rad    ( kt, Kbb, Kmm, Krhs, tr       )  ! Correct artificial negative concentrations
-         IF( ln_trcdmp_clo )    CALL trc_dmp_clo( kt, Kbb, Kmm )                  ! internal damping trends on closed seas only
+         !
+         ! Swap TOP time levels (= Nrhs_trc, Nbb_trc etc)
+         IF( ln_top_euler ) THEN
+            ! For Euler timestepping we need the "before" and "now" fields to be the same.
+            ! Use N_save to ensure that the indices stay in sync with the (leapfrogging) OCE time indices for nn_dttrc=1.
+            Krhs = N_save
+            N_save = Kmm
+            Kbb = Kaa
+         ELSE
+            Krhs = Kbb
+            Kbb = Kmm
+         ENDIF
+         Kmm = Kaa
+         Kaa = Krhs
+         !
+         IF( ln_trcrad )        CALL trc_rad    ( kt, Kbb, Kmm, Krhs, tr   )    ! Correct artificial negative concentrations
+         IF( ln_trcdmp_clo )    CALL trc_dmp_clo( kt, Kbb, Kmm )                ! internal damping trends on closed seas only
 
          !
@@ -88 +107 @@
                                 CALL trc_zdf( kt, Kbb, Kmm, Krhs, tr, Kaa  )  ! vert. mixing & after tracer ==> after
                                 CALL trc_atf( kt, Kbb, Kmm, Kaa , tr )        ! time filtering of "now" tracer fields
-          IF( ln_trcrad )       CALL trc_rad( kt, Kbb, Kmm, Krhs, tr       )  ! Correct artificial negative concentrations
+         !
+         ! Swap TOP time levels (= Nrhs_trc, Nbb_trc etc)
+         Krhs = Kbb
+         Kbb = Kmm
+         Kmm = Kaa
+         Kaa = Krhs
+         !
+         IF( ln_trcrad )       CALL trc_rad( kt, Kbb, Kmm, Krhs, tr       )  ! Correct artificial negative concentrations
          !
       END IF