Changeset 14604

Timestamp:

2021-03-09T14:12:13+01:00 (3 years ago)

Author:

techene

Message:

#2605 : allow time filtering of barotropic variables

File:

• NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/DYN/dynspg_ts.F90 (modified) (3 diffs)

NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/DYN/dynspg_ts.F90

@@ -156 +156 @@
       LOGICAL  ::   ll_init               ! =T : special startup of 2d equations
       INTEGER  ::   noffset               ! local integers  : time offset for bdy update
-      REAL(wp) ::   z1_hu, z1_hv              ! local scalars
+      REAL(wp) ::   z1_hu , z1_hv             ! local scalars
+      REAL(wp) ::   zzsshu, zzsshv            !   -      -
       REAL(wp) ::   za0, za1, za2, za3        !   -      -
       REAL(wp) ::   zztmp, zldg               !   -      -
@@ -234 +235 @@
       !                    !========================================!
       !
-      !                          ! Currently, RK3 requires the forward mode and NO time filtering of barotropic variables
+      !                          ! Currently, RK3 requires the forward mode
       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')
+         IF( .NOT.ln_bt_fw  )   CALL ctl_stop( 'dyn_spg_ts: RK3 requires forward mode (ln_bt_fw=T)' )
       ENDIF
       !
@@ -764 +765 @@
 #if defined key_RK3
       !                                                !*  RK3 case
+      !
+      IF( ln_bt_av ) THEN                  ! at this stage, pssh(:,:,:,Krhs) has been corrected: compute new depths at velocity points
+         !
+# if defined key_qcoTest_FluxForm
+         !                                       ! 'key_qcoTest_FluxForm' : simple ssh average
+         DO_2D( 0, 0, 0, 0 )
+            zzsshu = r1_2 * ( pssh(ji,jj,Kaa) + pssh(ji+1,jj  ,Kaa) ) * ssumask(ji,jj)
+            zzsshv = r1_2 * ( pssh(ji,jj,Kaa) + pssh(ji  ,jj+1,Kaa) ) * ssvmask(ji,jj)
+            !
+            !                              ! Save barotropic velocities (not transport)
+            puu_b(ji,jj,Kaa) = puu_b(ji,jj,Kaa) / ( hu_0(ji,jj) + zzsshu + 1._wp - ssumask(ji,jj) )
+            pvv_b(ji,jj,Kaa) = pvv_b(ji,jj,Kaa) / ( hv_0(ji,jj) + zzsshv + 1._wp - ssvmask(ji,jj) )
+         END_2D
+# else
+         DO_2D( 0, 0, 0, 0 )
+            zzsshu = r1_2 * r1_e1e2u(ji,jj) * ( e1e2t(ji  ,jj) * pssh(ji  ,jj,Kaa)   &
+               &                              + e1e2t(ji+1,jj) * pssh(ji+1,jj,Kaa) ) * ssumask(ji,jj)
+            zzsshv = r1_2 * r1_e1e2v(ji,jj) * ( e1e2t(ji,jj  ) * pssh(ji,jj  ,Kaa)   &
+               &                              + e1e2t(ji,jj+1) * pssh(ji,jj+1,Kaa) ) * ssvmask(ji,jj)
+            !
+            !                             ! Save barotropic velocities (not transport)
+            puu_b(ji,jj,Kaa) = puu_b(ji,jj,Kaa) / ( hu_0(ji,jj) + zzsshu + 1._wp - ssumask(ji,jj) )
+            pvv_b(ji,jj,Kaa) = pvv_b(ji,jj,Kaa) / ( hv_0(ji,jj) + zzsshv + 1._wp - ssvmask(ji,jj) )
+         END_2D
+# endif   
+         !
+         CALL lbc_lnk_multi( 'dynspg_ts', puu_b, 'U', -1._wp, pvv_b, 'V', -1._wp ) ! Boundary conditions
+         !
+      ENDIF
       !
       ! advective transport from N to N+1 (i.e. Kbb to Kaa)