Changes between Version 14 and Version 15 of 2021WP/KNL-01_Sibylle_RK3_stage1

Timestamp:

2021-03-02T21:11:16+01:00 (3 years ago)

Author:

techene

Comment:

--

2021WP/KNL-01_Sibylle_RK3_stage1

@@ -226 +226 @@
 }}}
 
-Has been tested and validated against an modified leap frog GYRE in the same configuration with the same namelist.
+Has been tested and validated against an modified leap frog GYRE in the same configuration with the same namelist.[[BR]]
+
+r14549 Allow RK3 time-stepping with 2D mode. [[BR]]
+Prepare forcings and barotropic 2D fields. dynspg_ts remains for 2D mode integration. dyn_vor_RK3 only computes 2D relative vorticity and metric term from 3D to 2D. 
+stp_2D is called by stprk3 in single first.
+{{{
+OCE
+ |--DYN
+     |-- dynspg_ts.F90
+         #remove k_only_ADV
+         PUBLIC dyn_drg_init      ! called by rk3ssh
+         !  Phase 1 : Coupling between general trend and barotropic estimates (1st step)
+         IF( kt == nit000 ) THEN 
+            IF( .NOT.ln_bt_fw  .OR. ln_bt_av )   CALL ctl_stop( 'dyn_spg_ts: RK3 requires ln_bt_fw=T AND ln_bt_av=F') 
+         ENDIF
+         !                          ! set values computed in RK3_ssh 
+         zssh_frc(:,:) = sshe_rhs(:,:) 
+         zu_frc(:,:) =   Ue_rhs(:,:) 
+         zv_frc(:,:) =   Ve_rhs(:,:) 
+         zCdU_u  (:,:) = CdU_u   (:,:) 
+         zCdU_v  (:,:) = CdU_v   (:,:)
+         !
+         IF( kt == nit000 .OR. .NOT. ln_linssh )   CALL dyn_cor_2D_init( Kmm )   ! Set zwz, the barotropic Coriolis force coefficient
+         ! Phase 3. update the general trend with the barotropic trend 
+         IF(.NOT.ln_bt_av ) THEN                          !* Update Kaa barotropic external mode  
+            uu_b(:,:,Kaa) = ua_e  (:,:) 
+            pvv_b(:,:,Kaa) = va_e  (:,:) 
+            pssh (:,:,Kaa) = ssha_e(:,:) 
+         ENDIF
+         un_adv...
+         ubar...
+     |-- dynspg.F90
+         #remove k_only_ADV
+     |-- dynvor.F90
+         SUBROUTINE dyn_vor_3D( kt, Kmm, puu, pvv, Krhs ) 
+     |-- dynzdf.F90
+         zDt_2 = rDt * 0.5_wp # small cosmetic optim
+ |-- stprk3_stg.F90
+ |-- stp2d.F90
+ |-- stprk3.F90
+179           !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+180           !  RK3 : single first external mode computation
+181           !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+182     
+183           CALL stp_2D( kstp, Nbb, Nbb, Naa, Nrhs )   ! out: ssh, (uu_b,vv_b) and (un_adv,vn_adv) at Naa
+184     
+185     
+186           !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+187           !  RK3 time integration
+188           !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+189     
+190           ! Stage 1 :
+191           CALL stp_RK3_stg( 1, kstp, Nbb, Nbb, Nrhs, Naa )
+192           !
+193           Nrhs = Nnn   ;   Nnn  = Naa   ;   Naa  = Nrhs    ! Swap: Nbb unchanged, Nnn <==> Naa
+194           !
+195           ! Stage 2 :
+196           CALL stp_RK3_stg( 2, kstp, Nbb, Nnn, Nrhs, Naa )
+197           !
+198           Nrhs = Nnn   ;   Nnn  = Naa   ;   Naa  = Nrhs    ! Swap: Nbb unchanged, Nnn <==> Naa
+199           !
+200           ! Stage 3 :
+201           CALL stp_RK3_stg( 3, kstp, Nbb, Nnn, Nrhs, Naa )
+202           !
+203           Nrhs = Nbb   ;   Nbb  = Naa   ;   Naa  = Nrhs    ! Swap: Nnn unchanged, Nbb <==> Naa
+}}}
 === Documentation updates