Changeset 15513 for NEMO/branches/2021

Timestamp:

2021-11-15T18:31:29+01:00 (3 years ago)

Author:

techene

Message:

#2605 RK3 : correct dia_ptr initialisation and add a switch for diags/trends logicals

Location:

NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE

Files:

• DIA/diaptr.F90 (modified) (2 diffs)
• stprk3.F90 (modified) (5 diffs)

NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/DIA/diaptr.F90

@@ -42 +42 @@
 
    PUBLIC   dia_ptr        ! call in step module
+   PUBLIC   dia_ptr_init   ! call in stprk3 module
    PUBLIC   dia_ptr_hst    ! called from tra_ldf/tra_adv routines
 
@@ -82 +83 @@
       IF( ln_timing )   CALL timing_start('dia_ptr')
 
+#if ! defined key_RK3
       IF( kt == nit000 .AND. ll_init )   CALL dia_ptr_init    ! -> will define l_diaptr and nbasin
+#endif
       !
       IF( l_diaptr ) THEN

NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/stprk3.F90

@@ -23 +23 @@
    USE stp2d          ! external mode solver
    USE dynspg_ts, ONLY: un_adv, vn_adv   ! updated Kmm barotropic transport
+   USE trd_oce        ! trends: ocean variables
+   USE diaptr
+   USE ldftra
 
    IMPLICIT NONE
@@ -92 +95 @@
                              CALL iom_init( cxios_context, ld_closedef=.FALSE. )   ! for model grid (including possible AGRIF zoom)
          IF( lk_diamlr   )   CALL dia_mlr_iom_init    ! with additional setup for multiple-linear-regression analysis
+                             CALL dia_ptr_init        ! called here since it uses iom_use
                              CALL iom_init_closedef
          IF( ln_crs      )   CALL iom_init( TRIM(cxios_context)//"_crs" )  ! for coarse grid
@@ -188 +192 @@
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
+      CALL rk3_dia( kstp, 0 )                          ! Diagnostics switched off for stage 1 & 2
+      !
       ! Stage 1 :
       CALL stp_RK3_stg( 1, kstp, Nbb, Nbb, Nrhs, Naa )
@@ -199 +205 @@
       !
       ! Stage 3 :
+      CALL rk3_dia( kstp, 1 )                          ! Diagnostics switched on for stage 3
+      !
       CALL stp_RK3_stg( 3, kstp, Nbb, Nnn, Nrhs, Naa )
       !
@@ -337 +345 @@
    END SUBROUTINE mlf_baro_corr
 
+
+   SUBROUTINE rk3_dia( kstp, kswitch )
+      !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
+      INTEGER, INTENT(in) ::   kstp      ! ocean time-step index
+      INTEGER, INTENT(in) ::   kswitch   ! on/off = 1/0
+      !!
+      LOGICAL, SAVE ::   ll_trddyn, ll_trdtrc, ll_trdtra  ! call trd at stage 3 only
+      LOGICAL, SAVE ::   ll_diaptr, ll_ldfeiv_dia
+      !!----------------------------------------------------------------------
+      !
+      IF( kstp == nit000 ) THEN   ! save diagnotic logical
+         ll_trdtra = l_trdtra
+         ll_trdtrc = l_trdtrc
+         ll_trddyn = l_trddyn
+         ll_diaptr = l_diaptr
+         ll_ldfeiv_dia = l_ldfeiv_dia
+      ENDIF
+      !
+      SELECT CASE( kswitch ) 
+      CASE ( 1 )                ! diagnostic activated (on)
+         l_trdtra = ll_trdtra
+         l_trdtrc = ll_trdtrc
+         l_trddyn = ll_trddyn
+         l_diaptr = ll_diaptr
+         l_ldfeiv_dia = ll_ldfeiv_dia
+      CASE ( 0 )                ! diagnostic desactivated (off)
+         l_trdtra  = .FALSE.
+         l_trdtrc  = .FALSE.
+         l_trddyn  = .FALSE.
+         l_diaptr  = .FALSE.
+         l_ldfeiv_dia  = .FALSE.
+      END SELECT
+      !
+   END SUBROUTINE rk3_dia
+
 #else
    !!----------------------------------------------------------------------