gkowal/amun-code
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into reconnection

Browse Source
This commit is contained in:
Grzegorz Kowal 2017-04-05 10:25:09 -03:00
commit 4e4dccc049
1 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/interpolations.F90
View File

@ -1136,16 +1136,16 @@ module interpolations
! !
dql(1) = q(i ,j,k) - q(im1,j,k) dql(1) = q(i ,j,k) - q(im1,j,k)
dqr(1) = q(ip1,j,k) - q(i ,j,k) dqr(1) = q(ip1,j,k) - q(i ,j,k)
dq (1) = minmod(dql(1), dqr(1)) dq (1) = limiter_minmod(0.5d+00, dql(1), dqr(1))
dql(2) = q(i,j ,k) - q(i,jm1,k) dql(2) = q(i,j ,k) - q(i,jm1,k)
dqr(2) = q(i,jp1,k) - q(i,j ,k) dqr(2) = q(i,jp1,k) - q(i,j ,k)
dq (2) = minmod(dql(2), dqr(2)) dq (2) = limiter_minmod(0.5d+00, dql(2), dqr(2))
#if NDIMS == 3 #if NDIMS == 3
dql(3) = q(i,j,k ) - q(i,j,km1) dql(3) = q(i,j,k ) - q(i,j,km1)
dqr(3) = q(i,j,kp1) - q(i,j,k ) dqr(3) = q(i,j,kp1) - q(i,j,k )
dq (3) = minmod(dql(3), dqr(3)) dq (3) = limiter_minmod(0.5d+00, dql(3), dqr(3))
#endif /* NDIMS == 3 */ #endif /* NDIMS == 3 */
! calculate dqc ! calculate dqc
@ -1197,33 +1197,36 @@ module interpolations
#endif /* NDIMS == 3 */ #endif /* NDIMS == 3 */
do m = 1, NDIMS do m = 1, NDIMS
dq(m) = sign(ap(m), dq(m)) dq(m) = sign(ap(m), dq(m))
end do end do
end if
! calculate the limited variable increments
!
dql(1) = minmod(dq(1), qi(i ,j,k,1,1) - q(i,j,k))
dqr(1) = minmod(dq(1), - qi(im1,j,k,2,1) + q(i,j,k))
dql(2) = minmod(dq(2), qi(i,j ,k,1,2) - q(i,j,k))
dqr(2) = minmod(dq(2), - qi(i,jm1,k,2,2) + q(i,j,k))
#if NDIMS == 3
dql(3) = minmod(dq(3), qi(i,j,k ,1,3) - q(i,j,k))
dqr(3) = minmod(dq(3), - qi(i,j,km1,2,3) + q(i,j,k))
#endif /* NDIMS == 3 */
! update the interpolated states ! update the interpolated states
! !
qi(i ,j,k,1,1) = q(i,j,k) + dql(1) dql(1) = qi(i ,j,k,1,1) - q(i,j,k)
qi(im1,j,k,2,1) = q(i,j,k) - dqr(1) dqr(1) = qi(im1,j,k,2,1) - q(i,j,k)
if (max(abs(dql(1)), abs(dqr(1))) > abs(dq(1))) then
qi(i ,j,k,1,1) = q(i,j,k) + dq(1)
qi(im1,j,k,2,1) = q(i,j,k) - dq(1)
end if
dql(2) = qi(i,j ,k,1,2) - q(i,j,k)
dqr(2) = qi(i,jm1,k,2,2) - q(i,j,k)
if (max(abs(dql(2)), abs(dqr(2))) > abs(dq(2))) then
qi(i,j ,k,1,2) = q(i,j,k) + dq(2)
qi(i,jm1,k,2,2) = q(i,j,k) - dq(2)
end if
qi(i,j ,k,1,2) = q(i,j,k) + dql(2)
qi(i,jm1,k,2,2) = q(i,j,k) - dqr(2)
#if NDIMS == 3 #if NDIMS == 3
qi(i,j,k ,1,3) = q(i,j,k) + dql(3) dql(3) = qi(i,j,k ,1,3) - q(i,j,k))
qi(i,j,km1,2,3) = q(i,j,k) - dqr(3) dqr(3) = qi(i,j,km1,2,3) - q(i,j,k))
if (max(abs(dql(3)), abs(dqr(3))) > abs(dq(3))) then
qi(i,j,k ,1,3) = q(i,j,k) + dq(3)
qi(i,j,km1,2,3) = q(i,j,k) - dq(3)
end if
#endif /* NDIMS == 3 */ #endif /* NDIMS == 3 */
end if
end do ! i = ibl, ieu end do ! i = ibl, ieu
end do ! j = jbl, jeu end do ! j = jbl, jeu
end do ! k = kbl, keu end do ! k = kbl, keu