Commit 6faf7168 authored by Knut's avatar Knut
Browse files

removed MUDFLAT (MUDFLAT is default)

parent 90ea4dfc
...@@ -379,9 +379,7 @@ ...@@ -379,9 +379,7 @@
call coordinates(hotstart) call coordinates(hotstart)
#ifdef MUDFLAT
if (vert_cord .eq. _ADAPTIVE_COORDS_) call shear_frequency() if (vert_cord .eq. _ADAPTIVE_COORDS_) call shear_frequency()
#endif
end if end if
...@@ -414,12 +412,6 @@ ...@@ -414,12 +412,6 @@
! This is a wrapper routine to call all 3D related subroutines. ! This is a wrapper routine to call all 3D related subroutines.
! The call position for the {\tt coordinates} routine depends on ! The call position for the {\tt coordinates} routine depends on
! the compiler option ! the compiler option
! {\tt MUDFLAT}: If it is defined, then the
! call to {\tt coordinates} construction is made such that drying and flooding
! is stable. If {\tt MUDFLAT} is not defined, then the adaptive grids with
! Lagrangian component which are currently under development are supported.
! Both, drying and flooding and
! Lagrangian coordinates does not go together yet.
! The call sequence is as follows: ! The call sequence is as follows:
! !
! \vspace{0.5cm} ! \vspace{0.5cm}
...@@ -494,9 +486,8 @@ ...@@ -494,9 +486,8 @@
#endif #endif
call start_macro() call start_macro()
#ifdef MUDFLAT
call coordinates(.false.) call coordinates(.false.)
#endif
#ifndef NO_BOTTFRIC #ifndef NO_BOTTFRIC
if (kmax .gt. 1) then if (kmax .gt. 1) then
call bottom_friction_3d() call bottom_friction_3d()
...@@ -505,12 +496,12 @@ ...@@ -505,12 +496,12 @@
#ifndef NO_BAROCLINIC #ifndef NO_BAROCLINIC
if (runtype .eq. 4) call do_internal_pressure() if (runtype .eq. 4) call do_internal_pressure()
#endif #endif
call tic(TIM_INTEGR3D) call tic(TIM_INTEGR3D)
huo=hun
hvo=hvn
ip_fac=_ONE_ ip_fac=_ONE_
if (ip_ramp .gt. 0) ip_fac=min( _ONE_ , n*_ONE_/ip_ramp) if (ip_ramp .gt. 0) ip_fac=min( _ONE_ , n*_ONE_/ip_ramp)
call toc(TIM_INTEGR3D) call toc(TIM_INTEGR3D)
#ifdef STRUCTURE_FRICTION #ifdef STRUCTURE_FRICTION
call structure_friction_3d call structure_friction_3d
#endif #endif
...@@ -524,6 +515,8 @@ ...@@ -524,6 +515,8 @@
ufirst=.true. ufirst=.true.
end if end if
if (kmax .gt. 1) then
! KK-TODO: In realistic simulations (gotm) we need SS ! KK-TODO: In realistic simulations (gotm) we need SS
! in any case, therefore it is done here by default. ! in any case, therefore it is done here by default.
! In the future one might check whether a very seldom case ! In the future one might check whether a very seldom case
...@@ -533,12 +526,6 @@ ...@@ -533,12 +526,6 @@
! 3) if(do_numerical_analyses_3d) [physical dissipation analyses] ! 3) if(do_numerical_analyses_3d) [physical dissipation analyses]
call shear_frequency() call shear_frequency()
#ifndef MUDFLAT
call coordinates(.false.)
#endif
if (kmax .gt. 1) then
call ww_momentum_3d() call ww_momentum_3d()
call uv_advect_3d() call uv_advect_3d()
......
...@@ -38,10 +38,6 @@ ...@@ -38,10 +38,6 @@
! Finally, the new velocity profile is shifted such that its vertical ! Finally, the new velocity profile is shifted such that its vertical
! integral is identical to the time integral of the vertically integrated ! integral is identical to the time integral of the vertically integrated
! transport. ! transport.
! If the compiler option {\tt MUDFLAT} is defined, this fitting of profiles
! is made with
! respect to the new surface elevation, otherwise to the
! old surface elevation.
! !
! When GETM is run as a slice model (compiler option {\tt SLICE\_MODEL} ! When GETM is run as a slice model (compiler option {\tt SLICE\_MODEL}
! is activated), the result for $j=2$ is copied to $j=3$. ! is activated), the result for $j=2$ is copied to $j=3$.
...@@ -49,7 +45,7 @@ ...@@ -49,7 +45,7 @@
! !USES: ! !USES:
use exceptions use exceptions
use parameters, only: g,avmmol,rho_0 use parameters, only: g,avmmol,rho_0
use domain, only: imin,imax,jmin,jmax,kmax,H,HU,min_depth use domain, only: imin,imax,jmin,jmax,kmax,H,min_depth
use domain, only: dry_u,coru,au,av,az,ax use domain, only: dry_u,coru,au,av,az,ax
#if defined CURVILINEAR || defined SPHERICAL #if defined CURVILINEAR || defined SPHERICAL
use domain, only: dxu,arud1,dxx,dyc,dyx,dxc use domain, only: dxu,arud1,dxx,dyc,dyx,dxc
...@@ -59,8 +55,7 @@ ...@@ -59,8 +55,7 @@
use variables_2d, only: Uint,D use variables_2d, only: Uint,D
use bdy_3d, only: do_bdy_3d use bdy_3d, only: do_bdy_3d
use variables_3d, only: dt,cnpar,kumin,uu,vv,huo,hun,hvo,uuEx,ww,hvn use variables_3d, only: dt,cnpar,kumin,uu,vv,huo,hun,hvo,uuEx,ww,hvn
use variables_3d, only: num,nuh,sseo,ssun,rru use variables_3d, only: num,nuh,sseo,Dun,rru
use variables_3d, only: ssuo
#ifdef _MOMENTUM_TERMS_ #ifdef _MOMENTUM_TERMS_
use variables_3d, only: tdv_u,cor_u,ipg_u,epg_u,vsd_u,hsd_u use variables_3d, only: tdv_u,cor_u,ipg_u,epg_u,vsd_u,hsd_u
#endif #endif
...@@ -248,11 +243,7 @@ ...@@ -248,11 +243,7 @@
do k=kumin(i,j),kmax do k=kumin(i,j),kmax
ResInt=ResInt+Res(k) ResInt=ResInt+Res(k)
end do end do
#ifdef MUDFLAT Diff=(Uint(i,j)-ResInt)/Dun(i,j)
Diff=(Uint(i,j)-ResInt)/(ssun(i,j)+HU(i,j))
#else
Diff=(Uint(i,j)-ResInt)/(ssuo(i,j)+HU(i,j))
#endif
do k=kumin(i,j),kmax do k=kumin(i,j),kmax
#ifdef _MOMENTUM_TERMS_ #ifdef _MOMENTUM_TERMS_
......
...@@ -40,10 +40,6 @@ ...@@ -40,10 +40,6 @@
! Finally, the new velocity profile is shifted such that its vertical ! Finally, the new velocity profile is shifted such that its vertical
! integral is identical to the time integral of the vertically integrated ! integral is identical to the time integral of the vertically integrated
! transport. ! transport.
! If the compiler option {\tt MUDFLAT} is defined, this fitting of profiles
! is made with
! respect to the new surface elevation, otherwise to the
! old surface elevation.
! !
! When GETM is run as a slice model (compiler option {\tt SLICE\_MODEL} ! When GETM is run as a slice model (compiler option {\tt SLICE\_MODEL}
! is activated), the result for $j=2$ is copied to $j=1$ and $j=3$. ! is activated), the result for $j=2$ is copied to $j=1$ and $j=3$.
...@@ -54,7 +50,7 @@ ...@@ -54,7 +50,7 @@
! !USES: ! !USES:
use exceptions use exceptions
use parameters, only: g,avmmol,rho_0 use parameters, only: g,avmmol,rho_0
use domain, only: imin,imax,jmin,jmax,kmax,H,HV,min_depth use domain, only: imin,imax,jmin,jmax,kmax,H,min_depth
use domain, only: dry_v,corv,au,av,az,ax use domain, only: dry_v,corv,au,av,az,ax
#if defined CURVILINEAR || defined SPHERICAL #if defined CURVILINEAR || defined SPHERICAL
use domain, only: dyv,arvd1,dxc,dyx,dyc,dxx use domain, only: dyv,arvd1,dxc,dyx,dyc,dxx
...@@ -64,8 +60,7 @@ ...@@ -64,8 +60,7 @@
use variables_2d, only: Vint,D use variables_2d, only: Vint,D
use bdy_3d, only: do_bdy_3d use bdy_3d, only: do_bdy_3d
use variables_3d, only: dt,cnpar,kvmin,uu,vv,huo,hvo,hvn,vvEx,ww,hun use variables_3d, only: dt,cnpar,kvmin,uu,vv,huo,hvo,hvn,vvEx,ww,hun
use variables_3d, only: num,nuh,sseo,ssvn,rrv use variables_3d, only: num,nuh,sseo,Dvn,rrv
use variables_3d, only: ssvo
#ifdef _MOMENTUM_TERMS_ #ifdef _MOMENTUM_TERMS_
use variables_3d, only: tdv_v,cor_v,ipg_v,epg_v,vsd_v,hsd_v use variables_3d, only: tdv_v,cor_v,ipg_v,epg_v,vsd_v,hsd_v
#endif #endif
...@@ -268,13 +263,7 @@ ...@@ -268,13 +263,7 @@
do k=kvmin(i,j),kmax do k=kvmin(i,j),kmax
ResInt=ResInt+Res(k) ResInt=ResInt+Res(k)
end do end do
Diff=(Vint(i,j)-ResInt)/Dvn(i,j)
#ifdef MUDFLAT
Diff=(Vint(i,j)-ResInt)/(ssvn(i,j)+HV(i,j))
#else
Diff=(Vint(i,j)-ResInt)/(ssvo(i,j)+HV(i,j))
#endif
do k=kvmin(i,j),kmax do k=kvmin(i,j),kmax
#ifdef _MOMENTUM_TERMS_ #ifdef _MOMENTUM_TERMS_
......
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