Changeset 10905 for NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP

Timestamp:

2019-04-29T13:50:19+02:00 (5 years ago)

Author:

davestorkey

Message:

2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps :

1. Alter top-level TOP routines so they use the time-level indices from step.F90 rather than having their own time level indices.
2. First part of changes for OFF modules.

Location:

NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP

Files:

• trcini.F90 (modified) (3 diffs)
• trcstp.F90 (modified) (6 diffs)

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

@@ -40 +40 @@
 CONTAINS
    
-   SUBROUTINE trc_init
+   SUBROUTINE trc_init( Kbb, Kmm, Kaa )
       !!---------------------------------------------------------------------
       !!                     ***  ROUTINE trc_init  ***
@@ -52 +52 @@
       !!                or read data or analytical formulation
       !!---------------------------------------------------------------------
+      !! Time level indices only required for call to update_pointers_trc
+      !! To be removed after IMMERSE development finished. 
+      INTEGER, INTENT( in ) :: Kbb, Kmm, Kaa ! time level indices
       !
       IF( ln_timing )   CALL timing_start('trc_init')
@@ -63 +66 @@
       CALL top_alloc()   ! allocate TOP arrays
 
-      ! Initialise time level indices
-      Nbb = 1; Nnn = 2; Naa = 3; Nrhs = Naa
-
       ! Initialisation of temporary pointers (to be deleted after development finished)
-      CALL update_pointers_trc()
+      CALL update_pointers_trc( Kbb, Kmm, Kaa )
       !
       IF(.NOT.ln_trcdta )   ln_trc_ini(:) = .FALSE.

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

@@ -32 +32 @@
    PUBLIC   update_pointers_trc ! called in initialisation
 
-   !!----------------------------------------------------------------------
-   !! time level indices
-   !!----------------------------------------------------------------------
-   INTEGER, PUBLIC :: Nbb, Nnn, Naa, Nrhs               !! used by trc_init
-
    LOGICAL  ::   llnew                   ! ???
    REAL(wp) ::   rdt_sampl               ! ???
@@ -50 +45 @@
 CONTAINS
 
-   SUBROUTINE trc_stp( kt )
+   SUBROUTINE trc_stp( kt, Kbb, Kmm, Krhs, Kaa )
       !!-------------------------------------------------------------------
       !!                     ***  ROUTINE trc_stp  ***
@@ -59 +54 @@
       !!                Update the passive tracers
       !!-------------------------------------------------------------------
-      INTEGER, INTENT( in ) ::   kt   ! ocean time-step index
+      INTEGER, INTENT( in ) :: kt                  ! ocean time-step index
+      INTEGER, INTENT( in ) :: Kbb, Kmm, Krhs, Kaa ! time level indices
       !
       INTEGER ::   jk, jn   ! dummy loop indices
@@ -106 +102 @@
                                    CALL trc_wri      ( kt )       ! output of passive tracers with iom I/O manager
                                    CALL trc_sms      ( kt )       ! tracers: sinks and sources
-                                   CALL trc_trp      ( kt, Nbb, Nnn, Nrhs, Naa )       ! transport of passive tracers
+                                   CALL trc_trp      ( kt, Kbb, Kmm, Krhs, Kaa )       ! transport of passive tracers
          IF( kt == nittrc000 ) THEN
             CALL iom_close( numrtr )       ! close input tracer restart file
@@ -131 +127 @@
    END SUBROUTINE trc_stp
 
-   SUBROUTINE update_pointers_trc
+   SUBROUTINE update_pointers_trc( Kbb, Kmm, Kaa )
       !!----------------------------------------------------------------------
       !!                     ***  ROUTINE update_pointers_trc  ***
@@ -140 +136 @@
       !! ** Method  :
       !!----------------------------------------------------------------------
-
-      trb => tr(:,:,:,:,Nbb); trn => tr(:,:,:,:,Nnn); tra => tr(:,:,:,:,Naa)
+      INTEGER, INTENT( in ) :: Kbb, Kmm, Kaa ! time level indices
+
+      trb => tr(:,:,:,:,Kbb); trn => tr(:,:,:,:,Kmm); tra => tr(:,:,:,:,Kaa)
 
    END SUBROUTINE update_pointers_trc