Changeset 11480 for NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/trcini.F90

Timestamp:

2019-08-29T11:23:25+02:00 (5 years ago)

Author:

davestorkey

Message:

2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps : Merge in changes from branch of branch.
Main changes:

1. "nxt" modules renamed as "atf" and now just do Asselin time filtering. The time level swapping is achieved by swapping indices.
2. Some additional prognostic grid variables changed to use a time dimension.

Notes:

1. This merged branch passes SETTE tests but does not identical results to the SETTE tests with the trunk@10721 unless minor bugs to do with Euler timestepping and the OFF timestepping are fixed in the trunk (NEMO tickets #2310 and #2311).
2. The nn_dttrc > 1 option for TOP (TOP has a different timestep to OCE) doesn't work. But it doesn't work in the trunk or NEMO 4.0 release either.

File:

• NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/trcini.F90 (modified) (5 diffs)

NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/trcini.F90

@@ -40 +40 @@
 CONTAINS
    
-   SUBROUTINE trc_init( Kbb, Kmm, Kaa )
+   SUBROUTINE trc_init
       !!---------------------------------------------------------------------
       !!                     ***  ROUTINE trc_init  ***
@@ -52 +52 @@
       !!                or read data or analytical formulation
       !!---------------------------------------------------------------------
-      INTEGER, INTENT( in ) :: Kbb, Kmm, Kaa ! time level indices
       !
       IF( ln_timing )   CALL timing_start('trc_init')
@@ -59 +58 @@
       IF(lwp) WRITE(numout,*) 'trc_init : initial set up of the passive tracers'
       IF(lwp) WRITE(numout,*) '~~~~~~~~'
+      !
+      ! Initialise time level indices
+      Nbb_trc = 1; Nnn_trc = 2; Naa_trc = 3; Nrhs_trc = Naa_trc
       !
       CALL trc_ini_ctl   ! control 
@@ -71 +73 @@
       IF(lwp) WRITE(numout,*)
       !
-      CALL trc_ini_sms( Kmm )   ! SMS
+      CALL trc_ini_sms( Nnn_trc )   ! SMS
       CALL trc_ini_trp          ! passive tracers transport
       CALL trc_ice_ini          ! Tracers in sea ice
@@ -79 +81 @@
       ENDIF
       !
-      CALL trc_ini_state( Kbb, Kmm, Kaa )  !  passive tracers initialisation : from a restart or from clim
+      CALL trc_ini_state( Nbb_trc, Nnn_trc, Naa_trc )  !  passive tracers initialisation : from a restart or from clim
       IF( nn_dttrc /= 1 ) &
-      CALL trc_sub_ini( Kmm )    ! Initialize variables for substepping passive tracers
-      !
-      CALL trc_ini_inv( Kmm )    ! Inventories
+      CALL trc_sub_ini( Nnn_trc )    ! Initialize variables for substepping passive tracers
+      !
+      CALL trc_ini_inv( Nnn_trc )    ! Inventories
       !
       IF( ln_timing )   CALL timing_stop('trc_init')