Commit 4fcdf7ac authored by Knut's avatar Knut

bottfric: -D_SLR_V26_ default again; semi-implicit treatment available with -D_SLR_NOCLIP_

parent bbaf9f2e
......@@ -197,7 +197,7 @@
zm = max( z(i ,j) , -H(i+1,j)+min( min_depth , D(i ,j) ) )
zx = ( zp - zm + (airp(i+1,j)-airp(i,j))*gammai ) / DXU
tausu = _HALF_ * ( tausx(i,j) + tausx(i+1,j) )
#ifdef _SLR_V26_
#ifndef _SLR_NOCLIP_
if (U(i,j) .gt. _ZERO_) then
Slr = max( Slru(i,j) , _ZERO_ )
else
......@@ -363,7 +363,7 @@
zm = max( z(i,j ) , -H(i,j+1)+min( min_depth , D(i,j ) ) )
zy = ( zp - zm + (airp(i,j+1)-airp(i,j))*gammai ) / DYV
tausv = _HALF_ * ( tausy(i,j) + tausy(i,j+1) )
#ifdef _SLR_V26_
#ifndef _SLR_NOCLIP_
if (V(i,j) .gt. _ZERO_) then
Slr = max( Slrv(i,j) , _ZERO_ )
else
......
......@@ -85,7 +85,7 @@
k=kumin(i,j)
rrdraghm1 = rru(i,j) / hun(i,j,k)
rdragDm1 = ru (i,j) / Dun(i,j)
#ifdef _SLR_V26_
#ifndef _SLR_NOCLIP_
Slru(i,j) = rrdraghm1*uu (i,j,k) &
- rdragDm1 *Uadv(i,j)
#else
......@@ -125,7 +125,7 @@
k=kvmin(i,j)
rrdraghm1 = rrv(i,j) / hvn(i,j,k)
rdragDm1 = rv (i,j) / Dvn(i,j)
#ifdef _SLR_V26_
#ifndef _SLR_NOCLIP_
Slrv(i,j) = rrdraghm1*vv (i,j,k) &
- rdragDm1 *Vadv(i,j)
#else
......
......@@ -93,8 +93,8 @@
#ifdef NO_SLR
LEVEL1 'NO_SLR'
#endif
#ifdef _SLR_V26_
LEVEL1 '_SLR_V26_'
#ifdef _SLR_NOCLIP_
LEVEL1 '_SLR_NOCLIP_'
#endif
#ifdef CONSTANT_VISCOSITY
LEVEL1 'CONSTANT_VISCOSITY'
......
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