Changeset 15191 for NEMO/branches/2021

Timestamp:

2021-08-13T15:09:12+02:00 (3 years ago)

Author:

techene

Message:

#2715 MLF & RK3 : change time level arguments of restart write routine, RK3 : only read/write Kbb fields

Location:

NEMO/branches/2021/dev_r14318_RK3_stage1/src/TOP

Files:

• trcrst.F90 (modified) (4 diffs)
• trcstp.F90 (modified) (2 diffs)

NEMO/branches/2021/dev_r14318_RK3_stage1/src/TOP/trcrst.F90

@@ -130 +130 @@
 
       ! READ prognostic variables and computes diagnostic variable
-      DO jn = 1, jptra
+#if ! defined key_RK3
+      DO jn = 1, jptra      ! MLF only : Now time step
          CALL iom_get( numrtr, jpdom_auto, 'TRN'//ctrcnm(jn), tr(:,:,:,jn,Kmm) )
       END DO
-
-      DO jn = 1, jptra
+#endif
+      DO jn = 1, jptra      ! RK3 and MLF : Before time step
          CALL iom_get( numrtr, jpdom_auto, 'TRB'//ctrcnm(jn), tr(:,:,:,jn,Kbb) )
       END DO
@@ -141 +142 @@
    END SUBROUTINE trc_rst_read
 
-   SUBROUTINE trc_rst_wri( kt, Kbb, Kmm, Krhs )
+
+   SUBROUTINE trc_rst_wri( kt, Kbb, Kmm, Kaa )
       !!----------------------------------------------------------------------
       !!                    ***  trc_rst_wri  ***
@@ -148 +150 @@
       !!----------------------------------------------------------------------
       INTEGER, INTENT( in ) ::   kt              ! ocean time-step index
-      INTEGER, INTENT( in ) ::   Kbb, Kmm, Krhs  ! time level indices
+      INTEGER, INTENT( in ) ::   Kbb, Kmm, Kaa   ! time level indices
       !!
       INTEGER  :: jn
@@ -155 +157 @@
       CALL iom_rstput( kt, nitrst, numrtw, 'rdttrc1', rn_Dt )   ! passive tracer time step (= ocean time step)
       ! prognostic variables 
-      ! -------------------- 
-      DO jn = 1, jptra
-         CALL iom_rstput( kt, nitrst, numrtw, 'TRN'//ctrcnm(jn), tr(:,:,:,jn,Kmm) )
-      END DO
-
-      DO jn = 1, jptra
-         CALL iom_rstput( kt, nitrst, numrtw, 'TRB'//ctrcnm(jn), tr(:,:,:,jn,Kbb) )
-      END DO
-
+      ! --------------------
+#if defined key_RK3
+      DO jn = 1, jptra      ! MLF : After time step (before the swap) put in TRN
+         CALL iom_rstput( kt, nitrst, numrtw, 'TRN'//ctrcnm(jn), tr(:,:,:,jn,Kaa) )
+      END DO
+      DO jn = 1, jptra      ! RK3 : After time step (before the swap) put in TRB
+         CALL iom_rstput( kt, nitrst, numrtw, 'TRB'//ctrcnm(jn), tr(:,:,:,jn,Kaa) )
+      END DO
+#else
+      DO jn = 1, jptra      ! MLF : After time step (before the swap) put in TRN
+         CALL iom_rstput( kt, nitrst, numrtw, 'TRN'//ctrcnm(jn), tr(:,:,:,jn,Kaa) )
+      END DO
+      DO jn = 1, jptra      ! MLF : Now   time step (before the swap) put in TRB
+         CALL iom_rstput( kt, nitrst, numrtw, 'TRB'//ctrcnm(jn), tr(:,:,:,jn,Kmm) )
+      END DO
+#endif
       IF( .NOT. lwxios ) CALL iom_delay_rst( 'WRITE', 'TOP', numrtw )   ! save only TOP delayed global communication variables
     
       IF( kt == nitrst ) THEN
-          CALL trc_rst_stat( Kmm, Krhs )             ! statistics
+          CALL trc_rst_stat( Kaa, Kbb )             ! statistics Kaa et Kbb
           IF(lwxios) THEN
              CALL iom_context_finalize(      cw_toprst_cxt          )

NEMO/branches/2021/dev_r14318_RK3_stage1/src/TOP/trcstp.F90

@@ -30 +30 @@
    PRIVATE
 
-   PUBLIC   trc_stp    ! called by step
+   PUBLIC   trc_stp    ! called by step or stpmlf
 
    LOGICAL  ::   llnew                   ! ???
@@ -114 +114 @@
          IF(lwm) CALL FLUSH( numont )                     ! flush namelist output
       ENDIF
-      IF( lrst_trc )            CALL trc_rst_wri  ( kt, Kmm, Kaa, Kbb  )       ! write tracer restart file
+      IF( lrst_trc )            CALL trc_rst_wri  ( kt, Kbb, Kmm, Kaa  )       ! write tracer restart file
+!     IF( lrst_trc )            CALL trc_rst_wri  ( kt, Kmm, Kaa, Kbb  )       ! write tracer restart file
+
       IF( lk_trdmxl_trc  )      CALL trd_mxl_trc  ( kt,      Kaa       )       ! trends: Mixed-layer
       !