Changeset 15510 for NEMO/branches/2021

Timestamp:

2021-11-15T16:33:37+01:00 (3 years ago)

Author:

techene

Message:

#2715 RK3 & TOP: musl adv scheme is only called at stage 3

Location:

NEMO/branches/2021/dev_r14318_RK3_stage1/src

Files:

• OCE/stprk3_stg.F90 (modified) (3 diffs)
• TOP/TRP/trcadv.F90 (modified) (1 diff)

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

@@ -208 +208 @@
       !                       !==  Passive Tracer  ==!
       !
-      IF( kstg == 1 ) THEN
-         CALL trc_stp_start( kstp, Kbb, Kmm, Krhs, Kaa )
-      ENDIF
-      !
-      DO jn = 1, jptra
-         DO_3D( 0, 0, 0, 0, 1, jpkm1 )
-            tr(ji,jj,jk,jn,Krhs) = 0._wp                              ! set tracer trends to zero
-         END_3D
-      END DO
-      !                                         !==  advection of passive tracers  ==!
-      rDt_trc = rDt
-!!st
-      CALL trc_sbc_RK3( kstp,      Kmm, tr, Krhs, kstg )              ! surface boundary condition
-      !
-      CALL trc_adv    ( kstp, Kbb, Kmm, tr, Krhs, zaU, zaV, ww )      ! horizontal & vertical advection
-      !
-      !
       SELECT CASE( kstg )
       !                    !-------------------!
@@ -230 +213 @@
          !                 !-------------------!   stg2:  Kbb = N  ;  Kmm = N+1/3  ;  Kaa = N+1/2
          !
-         !                                      !==  time integration  ==!   ∆t = rn_Dt/3 (stg1) or rn_Dt/2 (stg2)
-         DO jn = 1, jptra
-            DO_3D( 0, 0, 0, 0, 1, jpkm1 )
+         IF( kstg == 1 ) THEN
+            CALL trc_stp_start( kstp, Kbb, Kmm, Krhs, Kaa )
+         ENDIF
+         !
+         IF(.NOT. ln_trcadv_mus ) THEN
+            !
+            DO jn = 1, jptra
+               DO_3D( 0, 0, 0, 0, 1, jpkm1 )
+               tr(ji,jj,jk,jn,Krhs) = 0._wp                              ! set tracer trends to zero
+               END_3D
+            END DO
+            !                                      !==  advection of passive tracers  ==!
+            rDt_trc = rDt
+            !
+            CALL trc_sbc_RK3( kstp,      Kmm, tr, Krhs, kstg )              ! surface boundary condition
+            !
+            CALL trc_adv    ( kstp, Kbb, Kmm, tr, Krhs, zaU, zaV, ww )      ! horizontal & vertical advection
+            !
+            !                                      !==  time integration  ==!   ∆t = rn_Dt/3 (stg1) or rn_Dt/2 (stg2)
+            DO jn = 1, jptra
+               DO_3D( 0, 0, 0, 0, 1, jpkm1 )
                ze3Tb = e3t(ji,jj,jk,Kbb) * tr(ji,jj,jk,jn,Kbb )
                ze3Tr = e3t(ji,jj,jk,Kmm) * tr(ji,jj,jk,jn,Krhs)
                z1_e3t= 1._wp / e3t(ji,jj,jk, Kaa)
                tr(ji,jj,jk,jn,Kaa) = ( ze3Tb + rDt * ze3Tr*tmask(ji,jj,jk) ) * z1_e3t
+               END_3D
+            END DO
+            !
+         ENDIF
+         !                 !---------------!
+      CASE ( 3 )           !==  Stage 3  ==!   add all RHS terms but advection (=> Kbb only)
+         !                 !---------------!
+         !
+         DO jn = 1, jptra
+            DO_3D( 0, 0, 0, 0, 1, jpkm1 )
+            tr(ji,jj,jk,jn,Krhs) = 0._wp                              ! set tracer trends to zero
             END_3D
          END DO
-         !                 !---------------!
-      CASE ( 3 )           !==  Stage 3  ==!   add all RHS terms but advection (=> Kbb only)
-         !                 !---------------!
+         !                                         !==  advection of passive tracers  ==!
+         rDt_trc = rDt
+         !
+         CALL trc_sbc_RK3( kstp,      Kmm, tr, Krhs, kstg )              ! surface boundary condition
+         !
+         CALL trc_adv    ( kstp, Kbb, Kmm, tr, Krhs, zaU, zaV, ww )      ! horizontal & vertical advection
+         !
          CALL trc_sms    ( kstp, Kbb, Kbb, Krhs      )       ! tracers: sinks and sources
          CALL trc_trp    ( kstp, Kbb, Kmm, Krhs, Kaa )       ! transport of passive tracers (without advection)
@@ -262 +278 @@
 !===>>> CAUTION here may be without GM velocity but stokes drift required ! 0 barotropic divergence for GM  != 0 barotropic divergence for SD 
 !!st consistence 2D / 3D - flux de masse 
-      CALL tra_adv( kstp, Kbb, Kmm, ts, Krhs, zaU, zaV, ww )       ! hor. + vert. advection  ==> RHS
+      CALL tra_adv( kstp, Kbb, Kmm, ts, Krhs, zaU, zaV, ww, kstg )       ! hor. + vert. advection  ==> RHS
 
 !===>>>>>> stg1&2:  Verify the necessity of these trends (we may need it as there are in the RHS of dynspg_ts ?)

NEMO/branches/2021/dev_r14318_RK3_stage1/src/TOP/TRP/trcadv.F90

@@ -48 +48 @@
    LOGICAL ::   ln_trcadv_fct    ! FCT scheme flag
    INTEGER ::      nn_fct_h, nn_fct_v   ! =2/4 : horizontal and vertical choices of the order of FCT scheme
-   LOGICAL ::   ln_trcadv_mus    ! MUSCL scheme flag
+   LOGICAL, PUBLIC ::   ln_trcadv_mus    ! MUSCL scheme flag
    LOGICAL ::      ln_mus_ups           ! use upstream scheme in vivcinity of river mouths
    LOGICAL ::   ln_trcadv_ubs    ! UBS scheme flag