Changeset 15192 for NEMO/branches/2021

Timestamp:

2021-08-13T15:16:48+02:00 (3 years ago)

Author:

techene

Message:

#2715 rearrange passive tracer time stepping specifically for RK3

Location:

NEMO/branches/2021/dev_r14318_RK3_stage1/src

Files:

• OCE/stprk3_stg.F90 (modified) (6 diffs)
• TOP/trcstp_rk3.F90 (added)

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

@@ -22 +22 @@
    USE dynspg_ts, ONLY:   un_adv , vn_adv   ! advective transport from N to N+1
    USE bdydyn         ! ocean open boundary conditions (define bdy_dyn)
-#if defined key_agrif
+# if defined key_top
+   USE trc            ! ocean passive tracers variables
+   USE trcadv         ! advection                           (trc_adv routine)
+   USE trcsms         ! source and sink
+   USE trctrp         ! transport
+   USE trcbdy
+   USE trcstp_rk3
+# endif
+# if defined key_agrif
    USE agrif_oce_interp
-#endif
+# endif
    
    !
@@ -71 +79 @@
       INTEGER, INTENT(in) ::   kstp, Kbb, Kmm, Krhs, Kaa   ! ocean time-step and time-level indices
       !
-      INTEGER  ::   ji, jj, jk, jtile                      ! dummy loop indices
+      INTEGER  ::   ji, jj, jk, jn, jtile                  ! dummy loop indices
       REAL(wp) ::   ze3Tb, ze3Sb, z1_e3t     ! local scalars
       REAL(wp) ::   ze3Tr, ze3Sr             !   -      -
@@ -194 +202 @@
       ! RHS of tracers : ADV only using (zaU,zaV,ww)
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-#if defined key_top
+
+# if defined key_top
       !                       !==  Passive Tracer  ==!
-!===>>>>>> create a specific trc_RK3_adv routine with Advective velocity 
-!                                                and with Kstg as input argument
-!                         CALL trc_stp    ( kstp, Kbb, Kmm, Krhs, Kaa )            ! time-stepping
-#endif
+      !
+      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
+      CALL trc_adv( kstp, Kbb, Kmm, tr, Krhs, zaU, zaV, ww )      ! horizontal & vertical advection
+      !
+      !
+      SELECT CASE( kstg )
+      !                    !-------------------!
+      CASE ( 1 , 2 )       !==  Stage 1 & 2  ==!   stg1:  Kbb = N  ;  Kaa = N+1/3
+         !                 !-------------------!   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 )
+               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
+         !                 !---------------!
+      CASE ( 3 )           !==  Stage 3  ==!   add all RHS terms but advection (=> Kbb only)
+         !                 !---------------!
+         CALL trc_sms( kstp, Kbb, Kbb, Krhs      )       ! tracers: sinks and sources
+         CALL trc_trp( kstp, Kbb, Kbb, Krhs, Kaa )       ! transport of passive tracers (without advection)
+         !
+!!st a mettre dans trp 
+!!st# if defined key_agrif
+!!st         CALL Agrif_trc( kstp )                ! AGRIF zoom boundaries
+!!st# endif
+!!st         ! Update after tracer on domain lateral boundaries
+!!st         CALL lbc_lnk( 'stprk3_stg', tr(:,:,:,:,Kaa), 'T', 1._wp )   
+!!st         !
+!!st         IF( ln_bdy )  CALL trc_bdy( kstp, Kbb, Kmm, Kaa )
+         !
+         CALL trc_stp_end( kstp, Kbb, Kmm, Kaa )
+         !
+      END SELECT
+# endif
 
       !                       !==  T-S Tracers  ==!
 
 !===>>>>>> Modify tra_adv_...  routines so that Krhs to zero useless
-      DO_3D( 0, 0, 0, 0, 1, jpkm1 )
-         ts(ji,jj,jk,:,Krhs) = 0._wp                                    ! set tracer trends to zero
-      END_3D
-
-!===>>> CAUTION here sans GM velocity  but with stokes drift ! 
+      DO jn = 1, jpts
+         DO_3D( 0, 0, 0, 0, 1, jpkm1 )
+            ts(ji,jj,jk,jn,Krhs) = 0._wp                                    ! set tracer trends to zero
+         END_3D
+      END DO
+
+!===>>> 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
 
@@ -268 +324 @@
             &                                  tab3d_2=ts(:,:,:,jp_sal,Kaa), clinfo2=           ' Sa: ', mask2=tmask, clinfo3='tra' )
          !
-         !
          !                 !---------------!
       CASE ( 3 )           !==  Stage 3  ==!   add all remaining RHS terms
@@ -284 +339 @@
          ENDIF
 
-#if defined key_agrif
+# if defined key_agrif
          IF(.NOT. Agrif_Root() ) THEN     ! AGRIF:   sponge ==> momentum and tracer RHS
             CALL Agrif_Sponge_dyn
             CALL Agrif_Sponge_tra
          ENDIF
-#endif
+# endif
          !                                      !==  complete the tracers RHS  ==!   except ZDF (implicit)
-#if defined key_top
-         !                                            !*  Passive Tracer  *!
-
-!===>>>>>> create a specific trc_RK3_NOadv routine with other trend than ADV 
-!                                                and with Kstg as input argument
-!                         CALL trc_stp    ( kstp, Kbb, Kmm, Krhs, Kaa )            ! time-stepping
-#endif
          !                                            !*  T-S Tracer  *!
          !
@@ -324 +372 @@
          !
          IF( ln_zdfnpc  )   CALL tra_npc( kstp,      Kmm, Krhs, ts    , Kaa  )  ! update after fields by non-penetrative convection
-
-
-!==>>>>>   Missing obc CALL....
-
          !         
       END SELECT