Skip to content
Snippets Groups Projects

Bugfix inc hyd

Merged Alexander BREUGEM requested to merge bugfixIncHyd into main
@@ -79,6 +79,14 @@
!+ V7P0
!+ Now SH%TYPR checked to cancel vertical diffusion.
!
!history WA BREUGEM (IMDC)
!+ 12/01/2024
!+ V9P0
!+ Hydrostatic inconsistencies filter not applied to vertical
!+ diffusivity
!+ Application of the filter leads to completely different tidal
!+ signal with and without
!
!~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
!| F |-->| FUNCTION USED IN THE FORMULA
!| FORMUL |-->| FORMULA DESCRIBING THE RESULTING MATRIX
@@ -269,9 +277,6 @@
NG4=0.D0
NG5=0.D0
NG6=0.D0
NH1=0.D0
NH2=0.D0
NH3=0.D0
ELSE
NF1=F(I1)/H1
NF2=F(I2)/H2
@@ -292,6 +297,20 @@
NH2=(H(I2)+H(II5))/H2
NH3=(H(I3)+H(II6))/H3
ENDIF
!VERTICAL DIFFUSIVITY SHOULD NOT BE SET TO ZERO.
!OTHERWISE BOTTOM FRICTION IS NOT TAKEN IN TO ACCOUNT CORRECTLY
IF(H1.LT.CHOUIA.OR.H2.LT.CHOUIA.OR.H3.LT.CHOUIA) THEN
NH1 = 0.0D0
NH2 = 0.0D0
NH3 = 0.0D0
ELSE
! DEPENDING ON THE CASE (II4=I1 OR I4, ETC.)
! ALTERNATIVE WITH VERTICAL LINEAR VISCOSITY (II4=I4)
! ALTERNATIVE WITH P0 VERTICAL VISCOSITY ON THE VERTICAL (II4=I1)
NH1=(H(I1)+H(II4))/H1
NH2=(H(I2)+H(II5))/H2
NH3=(H(I3)+H(II6))/H3
ENDIF
!
SNI=NF1+NF2+NF3
SNS=NF4+NF5+NF6
Loading