Skip to content

GitLab

G
getm
Commit 3d4c23d7 authored by Knut's avatar Knut
Browse files
Options

Merge branch 'bdy_3d' into meteo

parents d4a07e29 b0b53e97
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 16 deletions
src/2d/bdy_2d.F90
View file @ 3d4c23d7
...@@ -364,16 +364,18 @@ ...@@ -364,16 +364,18 @@
select case (bdy_2d_type(l)) select case (bdy_2d_type(l))
case (ZERO_GRADIENT,CLAMPED_VEL,FLATHER_VEL) case (ZERO_GRADIENT,CLAMPED_VEL,FLATHER_VEL)
do j = wfj(n),wlj(n) do j = wfj(n),wlj(n)
z(i,j) = z(i+1,j) if ( az(i+1,j) .ne. 0 ) z(i,j) = z(i+1,j)
end do end do
case (SOMMERFELD) case (SOMMERFELD)
do j = wfj(n),wlj(n) do j = wfj(n),wlj(n)
if ( az(i+1,j) .ne. 0 ) then
cfl = sqrt(g*_HALF_*(D(i,j)+D(i+1,j)))*dtm/DXU cfl = sqrt(g*_HALF_*(D(i,j)+D(i+1,j)))*dtm/DXU
z(i,j) = ( & z(i,j) = ( &
(_ONE_ - _TWO_*cfl*(_ONE_-theta))*z (i ,j) & (_ONE_ - _TWO_*cfl*(_ONE_-theta))*z (i ,j) &
+(_ONE_ + _TWO_*cfl*(_ONE_-theta))*zo(i+1,j) & +(_ONE_ + _TWO_*cfl*(_ONE_-theta))*zo(i+1,j) &
-(_ONE_ - _TWO_*cfl*theta )*z (i+1,j) & -(_ONE_ - _TWO_*cfl*theta )*z (i+1,j) &
)/(_ONE_ + _TWO_*cfl*theta ) )/(_ONE_ + _TWO_*cfl*theta )
end if
end do end do
case (CLAMPED_ELEV,CLAMPED) case (CLAMPED_ELEV,CLAMPED)
do j = wfj(n),wlj(n) do j = wfj(n),wlj(n)
...@@ -383,13 +385,16 @@ ...@@ -383,13 +385,16 @@
end do end do
case (FLATHER_ELEV) case (FLATHER_ELEV)
do j = wfj(n),wlj(n) do j = wfj(n),wlj(n)
if ( az(i+1,j) .ne. 0 ) then
! Note (KK): approximate interface depths at vel-time stage ! Note (KK): approximate interface depths at vel-time stage
! by spatial mean at last sse-time stage ! by spatial mean at last sse-time stage
depth = _HALF_*(D(i,j)+D(i+1,j)) depth = _HALF_*(D(i,j)+D(i+1,j))
! Note (KK): note approximation of sse at vel-time stage ! Note (KK): note approximation of sse at vel-time stage
a = ramp*bdy_data(kl) & a = _TWO_/sqrt(g*depth)*(U(i,j)-ramp*bdy_data_u(kl)*depth)
- _TWO_/sqrt(g*depth)*(U(i,j)-ramp*bdy_data_u(kl)*depth) else
z(i,j) = max(a,-H(i,j)+min_depth) a = _ZERO_
end if
z(i,j) = max(ramp*bdy_data(kl)-a,-H(i,j)+min_depth)
k = k+1 k = k+1
kl = kl + 1 kl = kl + 1
end do end do
...@@ -403,16 +408,18 @@ ...@@ -403,16 +408,18 @@
select case (bdy_2d_type(l)) select case (bdy_2d_type(l))
case (ZERO_GRADIENT,CLAMPED_VEL,FLATHER_VEL) case (ZERO_GRADIENT,CLAMPED_VEL,FLATHER_VEL)
do i = nfi(n),nli(n) do i = nfi(n),nli(n)
z(i,j) = z(i,j-1) if ( az(i,j-1) .ne. 0 ) z(i,j) = z(i,j-1)
end do end do
case (SOMMERFELD) case (SOMMERFELD)
do i = nfi(n),nli(n) do i = nfi(n),nli(n)
if ( az(i,j-1) .ne. 0 ) then
cfl = sqrt(g*_HALF_*(D(i,j-1)+D(i,j)))*dtm/DYVJM1 cfl = sqrt(g*_HALF_*(D(i,j-1)+D(i,j)))*dtm/DYVJM1
z(i,j) = ( & z(i,j) = ( &
(_ONE_ - _TWO_*cfl*(_ONE_-theta))*z (i,j ) & (_ONE_ - _TWO_*cfl*(_ONE_-theta))*z (i,j ) &
+(_ONE_ + _TWO_*cfl*(_ONE_-theta))*zo(i,j-1) & +(_ONE_ + _TWO_*cfl*(_ONE_-theta))*zo(i,j-1) &
-(_ONE_ - _TWO_*cfl*theta )*z (i,j-1) & -(_ONE_ - _TWO_*cfl*theta )*z (i,j-1) &
)/(_ONE_ + _TWO_*cfl*theta ) )/(_ONE_ + _TWO_*cfl*theta )
end if
end do end do
case (CLAMPED_ELEV,CLAMPED) case (CLAMPED_ELEV,CLAMPED)
do i = nfi(n),nli(n) do i = nfi(n),nli(n)
...@@ -422,13 +429,16 @@ ...@@ -422,13 +429,16 @@
end do end do
case (FLATHER_ELEV) case (FLATHER_ELEV)
do i = nfi(n),nli(n) do i = nfi(n),nli(n)
if ( az(i,j-1) .ne. 0 ) then
! Note (KK): approximate interface depths at vel-time stage ! Note (KK): approximate interface depths at vel-time stage
! by spatial mean at last sse-time stage ! by spatial mean at last sse-time stage
depth = _HALF_*(D(i,j-1)+D(i,j)) depth = _HALF_*(D(i,j-1)+D(i,j))
! Note (KK): note approximation of sse at vel-time stage ! Note (KK): note approximation of sse at vel-time stage
a = ramp*bdy_data(kl) & a = _TWO_/sqrt(g*depth)*(V(i,j-1)-ramp*bdy_data_v(kl)*depth)
+ _TWO_/sqrt(g*depth)*(V(i,j-1)-ramp*bdy_data_v(kl)*depth) else
z(i,j) = max(a,-H(i,j)+min_depth) a = _ZERO_
end if
z(i,j) = max(ramp*bdy_data(kl)+a,-H(i,j)+min_depth)
k = k+1 k = k+1
kl = kl + 1 kl = kl + 1
end do end do
...@@ -442,16 +452,18 @@ ...@@ -442,16 +452,18 @@
select case (bdy_2d_type(l)) select case (bdy_2d_type(l))
case (ZERO_GRADIENT,CLAMPED_VEL,FLATHER_VEL) case (ZERO_GRADIENT,CLAMPED_VEL,FLATHER_VEL)
do j = efj(n),elj(n) do j = efj(n),elj(n)
z(i,j) = z(i-1,j) if ( az(i-1,j) .ne. 0 ) z(i,j) = z(i-1,j)
end do end do
case (SOMMERFELD) case (SOMMERFELD)
do j = efj(n),elj(n) do j = efj(n),elj(n)
if ( az(i-1,j) .ne. 0 ) then
cfl = sqrt(g*_HALF_*(D(i-1,j)+D(i,j)))*dtm/DXUIM1 cfl = sqrt(g*_HALF_*(D(i-1,j)+D(i,j)))*dtm/DXUIM1
z(i,j) = ( & z(i,j) = ( &
(_ONE_ - _TWO_*cfl*(_ONE_-theta))*z (i ,j) & (_ONE_ - _TWO_*cfl*(_ONE_-theta))*z (i ,j) &
+(_ONE_ + _TWO_*cfl*(_ONE_-theta))*zo(i-1,j) & +(_ONE_ + _TWO_*cfl*(_ONE_-theta))*zo(i-1,j) &
-(_ONE_ - _TWO_*cfl*theta )*z (i-1,j) & -(_ONE_ - _TWO_*cfl*theta )*z (i-1,j) &
)/(_ONE_ + _TWO_*cfl*theta ) )/(_ONE_ + _TWO_*cfl*theta )
end if
end do end do
case (CLAMPED_ELEV,CLAMPED) case (CLAMPED_ELEV,CLAMPED)
do j = efj(n),elj(n) do j = efj(n),elj(n)
...@@ -461,13 +473,16 @@ ...@@ -461,13 +473,16 @@
end do end do
case (FLATHER_ELEV) case (FLATHER_ELEV)
do j = efj(n),elj(n) do j = efj(n),elj(n)
if ( az(i-1,j) .ne. 0 ) then
! Note (KK): approximate interface depths at vel-time stage ! Note (KK): approximate interface depths at vel-time stage
! by spatial mean at last sse-time stage ! by spatial mean at last sse-time stage
depth = _HALF_*(D(i-1,j)+D(i,j)) depth = _HALF_*(D(i-1,j)+D(i,j))
! Note (KK): note approximation of sse at vel-time stage ! Note (KK): note approximation of sse at vel-time stage
a = ramp*bdy_data(kl) & a = _TWO_/sqrt(g*depth)*(U(i-1,j)-ramp*bdy_data_u(kl)*depth)
+ _TWO_/sqrt(g*depth)*(U(i-1,j)-ramp*bdy_data_u(kl)*depth) else
z(i,j) = max(a,-H(i,j)+min_depth) a = _ZERO_
end if
z(i,j) = max(ramp*bdy_data(kl)+a,-H(i,j)+min_depth)
k = k+1 k = k+1
kl = kl + 1 kl = kl + 1
end do end do
...@@ -481,16 +496,18 @@ ...@@ -481,16 +496,18 @@
select case (bdy_2d_type(l)) select case (bdy_2d_type(l))
case (ZERO_GRADIENT,CLAMPED_VEL,FLATHER_VEL) case (ZERO_GRADIENT,CLAMPED_VEL,FLATHER_VEL)
do i = sfi(n),sli(n) do i = sfi(n),sli(n)
z(i,j) = z(i,j+1) if ( az(i,j+1) .ne. 0 ) z(i,j) = z(i,j+1)
end do end do
case (SOMMERFELD) case (SOMMERFELD)
do i = sfi(n),sli(n) do i = sfi(n),sli(n)
if ( az(i,j+1) .ne. 0 ) then
cfl = sqrt(g*_HALF_*(D(i,j)+D(i,j+1)))*dtm/DYV cfl = sqrt(g*_HALF_*(D(i,j)+D(i,j+1)))*dtm/DYV
z(i,j) = ( & z(i,j) = ( &
(_ONE_ - _TWO_*cfl*(_ONE_-theta))*z (i,j ) & (_ONE_ - _TWO_*cfl*(_ONE_-theta))*z (i,j ) &
+(_ONE_ + _TWO_*cfl*(_ONE_-theta))*zo(i,j+1) & +(_ONE_ + _TWO_*cfl*(_ONE_-theta))*zo(i,j+1) &
-(_ONE_ - _TWO_*cfl*theta )*z (i,j+1) & -(_ONE_ - _TWO_*cfl*theta )*z (i,j+1) &
)/(_ONE_ + _TWO_*cfl*theta ) )/(_ONE_ + _TWO_*cfl*theta )
end if
end do end do
case (CLAMPED_ELEV,CLAMPED) case (CLAMPED_ELEV,CLAMPED)
do i = sfi(n),sli(n) do i = sfi(n),sli(n)
...@@ -500,13 +517,16 @@ ...@@ -500,13 +517,16 @@
end do end do
case (FLATHER_ELEV) case (FLATHER_ELEV)
do i = sfi(n),sli(n) do i = sfi(n),sli(n)
if ( az(i,j+1) .ne. 0 ) then
! Note (KK): approximate interface depths at vel-time stage ! Note (KK): approximate interface depths at vel-time stage
! by spatial mean at last sse-time stage ! by spatial mean at last sse-time stage
depth = _HALF_*(D(i,j)+D(i,j+1)) depth = _HALF_*(D(i,j)+D(i,j+1))
! Note (KK): note approximation of sse at vel-time stage ! Note (KK): note approximation of sse at vel-time stage
a = ramp*bdy_data(kl) & a = _TWO_/sqrt(g*depth)*(V(i,j)-ramp*bdy_data_v(kl)*depth)
- _TWO_/sqrt(g*depth)*(V(i,j)-ramp*bdy_data_v(kl)*depth) else
z(i,j) = max(a,-H(i,j)+min_depth) a = _ZERO_
end if
z(i,j) = max(ramp*bdy_data(kl)-a,-H(i,j)+min_depth)
k = k+1 k = k+1
kl = kl + 1 kl = kl + 1
end do end do
...@@ -601,21 +621,25 @@ ...@@ -601,21 +621,25 @@
select case (bdy_2d_type(l)) select case (bdy_2d_type(l))
case (FLATHER_VEL) case (FLATHER_VEL)
do j = wfj(n),wlj(n) do j = wfj(n),wlj(n)
if ( az(i+1,j) .ne. 0 ) then
! Note (KK): approximate interface depths at vel-time stage ! Note (KK): approximate interface depths at vel-time stage
! by spatial mean at last sse-time stage ! by spatial mean at last sse-time stage
depth = _HALF_*(D(i,j)+D(i+1,j)) depth = _HALF_*(D(i,j)+D(i+1,j))
! Note (KK): note approximation of sse at vel-time stage ! Note (KK): note approximation of sse at vel-time stage
U(i,j) = ramp*bdy_data_u(kl)*depth & U(i,j) = ramp*bdy_data_u(kl)*depth &
- _HALF_*sqrt(g*depth)*(z(i,j)-ramp*bdy_data(kl)) - _HALF_*sqrt(g*depth)*(z(i,j)-ramp*bdy_data(kl))
end if
k = k+1 k = k+1
kl = kl + 1 kl = kl + 1
end do end do
case (CLAMPED_VEL,CLAMPED) case (CLAMPED_VEL,CLAMPED)
do j = wfj(n),wlj(n) do j = wfj(n),wlj(n)
if ( az(i+1,j) .ne. 0 ) then
! Note (KK): approximate interface depths at vel-time stage ! Note (KK): approximate interface depths at vel-time stage
! by spatial mean at last sse-time stage ! by spatial mean at last sse-time stage
depth = _HALF_*(D(i,j)+D(i+1,j)) depth = _HALF_*(D(i,j)+D(i+1,j))
U(i,j) = ramp*bdy_data_u(kl)*depth U(i,j) = ramp*bdy_data_u(kl)*depth
end if
k = k+1 k = k+1
kl = kl + 1 kl = kl + 1
end do end do
...@@ -630,21 +654,25 @@ ...@@ -630,21 +654,25 @@
select case (bdy_2d_type(l)) select case (bdy_2d_type(l))
case (FLATHER_VEL) case (FLATHER_VEL)
do j = efj(n),elj(n) do j = efj(n),elj(n)
if ( az(i-1,j) .ne. 0 ) then
! Note (KK): approximate interface depths at vel-time stage ! Note (KK): approximate interface depths at vel-time stage
! by spatial mean at last sse-time stage ! by spatial mean at last sse-time stage
depth = _HALF_*(D(i-1,j)+D(i,j)) depth = _HALF_*(D(i-1,j)+D(i,j))
! Note (KK): note approximation of sse at vel-time stage ! Note (KK): note approximation of sse at vel-time stage
U(i-1,j) = ramp*bdy_data_u(kl)*depth & U(i-1,j) = ramp*bdy_data_u(kl)*depth &
+ _HALF_*sqrt(g*depth)*(z(i,j)-ramp*bdy_data(kl)) + _HALF_*sqrt(g*depth)*(z(i,j)-ramp*bdy_data(kl))
end if
k = k+1 k = k+1
kl = kl + 1 kl = kl + 1
end do end do
case (CLAMPED_VEL,CLAMPED) case (CLAMPED_VEL,CLAMPED)
do j = efj(n),elj(n) do j = efj(n),elj(n)
if ( az(i-1,j) .ne. 0 ) then
! Note (KK): approximate interface depths at vel-time stage ! Note (KK): approximate interface depths at vel-time stage
! by spatial mean at last sse-time stage ! by spatial mean at last sse-time stage
depth = _HALF_*(D(i-1,j)+D(i,j)) depth = _HALF_*(D(i-1,j)+D(i,j))
U(i-1,j) = ramp*bdy_data_u(kl)*depth U(i-1,j) = ramp*bdy_data_u(kl)*depth
end if
k = k+1 k = k+1
kl = kl + 1 kl = kl + 1
end do end do
...@@ -662,21 +690,25 @@ ...@@ -662,21 +690,25 @@
select case (bdy_2d_type(l)) select case (bdy_2d_type(l))
case (FLATHER_VEL) case (FLATHER_VEL)
do i = nfi(n),nli(n) do i = nfi(n),nli(n)
if ( az(i,j-1) .ne. 0 ) then
! Note (KK): approximate interface depths at vel-time stage ! Note (KK): approximate interface depths at vel-time stage
! by spatial mean at last sse-time stage ! by spatial mean at last sse-time stage
depth = _HALF_*(D(i,j-1)+D(i,j)) depth = _HALF_*(D(i,j-1)+D(i,j))
! Note (KK): note approximation of sse at vel-time stage ! Note (KK): note approximation of sse at vel-time stage
V(i,j-1) = ramp*bdy_data_v(kl)*depth & V(i,j-1) = ramp*bdy_data_v(kl)*depth &
+ _HALF_*sqrt(g*depth)*(z(i,j)-ramp*bdy_data(kl)) + _HALF_*sqrt(g*depth)*(z(i,j)-ramp*bdy_data(kl))
end if
k = k+1 k = k+1
kl = kl + 1 kl = kl + 1
end do end do
case (CLAMPED_VEL,CLAMPED) case (CLAMPED_VEL,CLAMPED)
do i = nfi(n),nli(n) do i = nfi(n),nli(n)
if ( az(i,j-1) .ne. 0 ) then
! Note (KK): approximate interface depths at vel-time stage ! Note (KK): approximate interface depths at vel-time stage
! by spatial mean at last sse-time stage ! by spatial mean at last sse-time stage
depth = _HALF_*(D(i,j-1)+D(i,j)) depth = _HALF_*(D(i,j-1)+D(i,j))
V(i,j-1) = ramp*bdy_data_v(kl)*depth V(i,j-1) = ramp*bdy_data_v(kl)*depth
end if
k = k+1 k = k+1
kl = kl + 1 kl = kl + 1
end do end do
...@@ -691,21 +723,25 @@ ...@@ -691,21 +723,25 @@
select case (bdy_2d_type(l)) select case (bdy_2d_type(l))
case (FLATHER_VEL) case (FLATHER_VEL)
do i = sfi(n),sli(n) do i = sfi(n),sli(n)
if ( az(i,j+1) .ne. 0 ) then
! Note (KK): approximate interface depths at vel-time stage ! Note (KK): approximate interface depths at vel-time stage
! by spatial mean at last sse-time stage ! by spatial mean at last sse-time stage
depth = _HALF_*(D(i,j)+D(i,j+1)) depth = _HALF_*(D(i,j)+D(i,j+1))
! Note (KK): note approximation of sse at vel-time stage ! Note (KK): note approximation of sse at vel-time stage
V(i,j) = ramp*bdy_data_v(kl)*depth & V(i,j) = ramp*bdy_data_v(kl)*depth &
- _HALF_*sqrt(g*depth)*(z(i,j)-ramp*bdy_data(kl)) - _HALF_*sqrt(g*depth)*(z(i,j)-ramp*bdy_data(kl))
end if
k = k+1 k = k+1
kl = kl + 1 kl = kl + 1
end do end do
case (CLAMPED_VEL,CLAMPED) case (CLAMPED_VEL,CLAMPED)
do i = sfi(n),sli(n) do i = sfi(n),sli(n)
if ( az(i,j+1) .ne. 0 ) then
! Note (KK): approximate interface depths at vel-time stage ! Note (KK): approximate interface depths at vel-time stage
! by spatial mean at last sse-time stage ! by spatial mean at last sse-time stage
depth = _HALF_*(D(i,j)+D(i,j+1)) depth = _HALF_*(D(i,j)+D(i,j+1))
V(i,j) = ramp*bdy_data_v(kl)*depth V(i,j) = ramp*bdy_data_v(kl)*depth
end if
k = k+1 k = k+1
kl = kl + 1 kl = kl + 1
end do end do
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment