Merge branch 'master' into reconnection
This commit is contained in:
commit
9c1b2661fb
@ -1017,8 +1017,9 @@ module equations
|
||||
|
||||
! include external procedures and variables
|
||||
!
|
||||
use coordinates, only : im, jm, km, in, jn, kn
|
||||
use coordinates, only : ib, jb, kb, ie, je, ke
|
||||
use coordinates, only : im , jm , km , in , jn , kn
|
||||
use coordinates, only : ib , jb , kb , ie , je , ke
|
||||
use coordinates, only : ibl, jbl, kbl, ieu, jeu, keu
|
||||
|
||||
! local variables are not implicit by default
|
||||
!
|
||||
@ -1079,6 +1080,29 @@ module equations
|
||||
|
||||
end if
|
||||
|
||||
! fill out the borders
|
||||
!
|
||||
do i = ibl, 1, -1
|
||||
qq(1:nv, i,jb:je,kb:ke) = qq(1:nv,ib,jb:je,kb:ke)
|
||||
end do
|
||||
do i = ieu, im
|
||||
qq(1:nv, i,jb:je,kb:ke) = qq(1:nv,ie,jb:je,kb:ke)
|
||||
end do
|
||||
do j = jbl, 1, -1
|
||||
qq(1:nv, 1:im, j,kb:ke) = qq(1:nv, 1:im,jb,kb:ke)
|
||||
end do
|
||||
do j = jeu, jm
|
||||
qq(1:nv, 1:im, j,kb:ke) = qq(1:nv, 1:im,je,kb:ke)
|
||||
end do
|
||||
#if NDIMS == 3
|
||||
do k = kbl, 1, -1
|
||||
qq(1:nv, 1:im, 1:jm, k) = qq(1:nv, 1:im, 1:jm,kb)
|
||||
end do
|
||||
do k = keu, km
|
||||
qq(1:nv, 1:im, 1:jm, k) = qq(1:nv, 1:im, 1:jm,ke)
|
||||
end do
|
||||
#endif /* NDIMS == 3 */
|
||||
|
||||
!-------------------------------------------------------------------------------
|
||||
!
|
||||
end subroutine update_primitive_variables
|
||||
|
||||
@ -1848,10 +1848,6 @@ module evolution
|
||||
dx(2) = ady(pdata%meta%level)
|
||||
dx(3) = adz(pdata%meta%level)
|
||||
|
||||
! initialize fluxes
|
||||
!
|
||||
pdata%f(1:NDIMS,1:nv,1:im,1:jm,1:km) = 0.0d+00
|
||||
|
||||
! update fluxes for the current block
|
||||
!
|
||||
do n = 1, NDIMS
|
||||
|
||||
37
src/mesh.F90
37
src/mesh.F90
@ -1373,6 +1373,43 @@ module mesh
|
||||
|
||||
end do ! p = 1, nchildren
|
||||
|
||||
! fill out the borders
|
||||
!
|
||||
#if NDIMS == 2
|
||||
do il = is - 1, 1, -1
|
||||
pparent%u(1:nv,il,js:jt, 1 ) = pparent%u(1:nv,is,js:jt, 1 )
|
||||
end do
|
||||
do iu = it + 1, im
|
||||
pparent%u(1:nv,iu,js:jt, 1 ) = pparent%u(1:nv,it,js:jt, 1 )
|
||||
end do
|
||||
do jl = js - 1, 1, -1
|
||||
pparent%u(1:nv, 1:im,jl, 1 ) = pparent%u(1:nv, 1:im,js, 1 )
|
||||
end do
|
||||
do ju = jt + 1, jm
|
||||
pparent%u(1:nv, 1:im,ju, 1 ) = pparent%u(1:nv, 1:im,jt, 1 )
|
||||
end do
|
||||
#endif /* NDIMS == 2 */
|
||||
#if NDIMS == 3
|
||||
do il = is - 1, 1, -1
|
||||
pparent%u(1:nv,il,js:jt,ks:kt) = pparent%u(1:nv,is,js:jt,ks:kt)
|
||||
end do
|
||||
do iu = it + 1, im
|
||||
pparent%u(1:nv,iu,js:jt,ks:kt) = pparent%u(1:nv,it,js:jt,ks:kt)
|
||||
end do
|
||||
do jl = js - 1, 1, -1
|
||||
pparent%u(1:nv, 1:im,jl,ks:kt) = pparent%u(1:nv, 1:im,js,ks:kt)
|
||||
end do
|
||||
do ju = jt + 1, jm
|
||||
pparent%u(1:nv, 1:im,ju,ks:kt) = pparent%u(1:nv, 1:im,jt,ks:kt)
|
||||
end do
|
||||
do kl = ks - 1, 1, -1
|
||||
pparent%u(1:nv, 1:im, 1:jm,kl) = pparent%u(1:nv, 1:im, 1:jm,ks)
|
||||
end do
|
||||
do ku = kt + 1, km
|
||||
pparent%u(1:nv, 1:im, 1:jm,ku) = pparent%u(1:nv, 1:im, 1:jm,kt)
|
||||
end do
|
||||
#endif /* NDIMS == 3 */
|
||||
|
||||
#ifdef PROFILE
|
||||
! stop accounting time for the block restriction
|
||||
!
|
||||
|
||||
@ -592,10 +592,10 @@ module schemes
|
||||
|
||||
! input arguments
|
||||
!
|
||||
integer , intent(in) :: idir
|
||||
real(kind=8) , intent(in) :: dx
|
||||
real(kind=8), dimension(nv,im,jm,km), intent(in) :: q
|
||||
real(kind=8), dimension(nv,im,jm,km), intent(inout) :: f
|
||||
integer , intent(in) :: idir
|
||||
real(kind=8) , intent(in) :: dx
|
||||
real(kind=8), dimension(nv,im,jm,km), intent(in) :: q
|
||||
real(kind=8), dimension(nv,im,jm,km), intent(out) :: f
|
||||
|
||||
! local variables
|
||||
!
|
||||
@ -615,6 +615,10 @@ module schemes
|
||||
call start_timer(imf)
|
||||
#endif /* PROFILE */
|
||||
|
||||
! initialize fluxes
|
||||
!
|
||||
f(1:nv,1:im,1:jm,1:km) = 0.0d+00
|
||||
|
||||
! select the directional flux to compute
|
||||
!
|
||||
select case(idir)
|
||||
@ -1094,10 +1098,10 @@ module schemes
|
||||
|
||||
! input arguments
|
||||
!
|
||||
integer , intent(in) :: idir
|
||||
real(kind=8) , intent(in) :: dx
|
||||
real(kind=8), dimension(nv,im,jm,km), intent(in) :: q
|
||||
real(kind=8), dimension(nv,im,jm,km), intent(inout) :: f
|
||||
integer , intent(in) :: idir
|
||||
real(kind=8) , intent(in) :: dx
|
||||
real(kind=8), dimension(nv,im,jm,km), intent(in) :: q
|
||||
real(kind=8), dimension(nv,im,jm,km), intent(out) :: f
|
||||
|
||||
! local variables
|
||||
!
|
||||
@ -1117,6 +1121,10 @@ module schemes
|
||||
call start_timer(imf)
|
||||
#endif /* PROFILE */
|
||||
|
||||
! initialize fluxes
|
||||
!
|
||||
f(1:nv,1:im,1:jm,1:km) = 0.0d+00
|
||||
|
||||
! select the directional flux to compute
|
||||
!
|
||||
select case(idir)
|
||||
@ -1778,10 +1786,10 @@ module schemes
|
||||
|
||||
! input arguments
|
||||
!
|
||||
integer , intent(in) :: idir
|
||||
real(kind=8) , intent(in) :: dx
|
||||
real(kind=8), dimension(nv,im,jm,km), intent(in) :: q
|
||||
real(kind=8), dimension(nv,im,jm,km), intent(inout) :: f
|
||||
integer , intent(in) :: idir
|
||||
real(kind=8) , intent(in) :: dx
|
||||
real(kind=8), dimension(nv,im,jm,km), intent(in) :: q
|
||||
real(kind=8), dimension(nv,im,jm,km), intent(out) :: f
|
||||
|
||||
! local variables
|
||||
!
|
||||
@ -1801,6 +1809,10 @@ module schemes
|
||||
call start_timer(imf)
|
||||
#endif /* PROFILE */
|
||||
|
||||
! initialize fluxes
|
||||
!
|
||||
f(1:nv,1:im,1:jm,1:km) = 0.0d+00
|
||||
|
||||
! select the directional flux to compute
|
||||
!
|
||||
select case(idir)
|
||||
@ -3090,10 +3102,10 @@ module schemes
|
||||
|
||||
! input arguments
|
||||
!
|
||||
integer , intent(in) :: idir
|
||||
real(kind=8) , intent(in) :: dx
|
||||
real(kind=8), dimension(nv,im,jm,km), intent(in) :: q
|
||||
real(kind=8), dimension(nv,im,jm,km), intent(inout) :: f
|
||||
integer , intent(in) :: idir
|
||||
real(kind=8) , intent(in) :: dx
|
||||
real(kind=8), dimension(nv,im,jm,km), intent(in) :: q
|
||||
real(kind=8), dimension(nv,im,jm,km), intent(out) :: f
|
||||
|
||||
! local variables
|
||||
!
|
||||
@ -3113,6 +3125,10 @@ module schemes
|
||||
call start_timer(imf)
|
||||
#endif /* PROFILE */
|
||||
|
||||
! initialize fluxes
|
||||
!
|
||||
f(1:nv,1:im,1:jm,1:km) = 0.0d+00
|
||||
|
||||
! select the directional flux to compute
|
||||
!
|
||||
select case(idir)
|
||||
@ -4538,10 +4554,10 @@ module schemes
|
||||
|
||||
! input arguments
|
||||
!
|
||||
integer , intent(in) :: idir
|
||||
real(kind=8) , intent(in) :: dx
|
||||
real(kind=8), dimension(nv,im,jm,km), intent(in) :: q
|
||||
real(kind=8), dimension(nv,im,jm,km), intent(inout) :: f
|
||||
integer , intent(in) :: idir
|
||||
real(kind=8) , intent(in) :: dx
|
||||
real(kind=8), dimension(nv,im,jm,km), intent(in) :: q
|
||||
real(kind=8), dimension(nv,im,jm,km), intent(out) :: f
|
||||
|
||||
! local variables
|
||||
!
|
||||
@ -4561,6 +4577,10 @@ module schemes
|
||||
call start_timer(imf)
|
||||
#endif /* PROFILE */
|
||||
|
||||
! initialize fluxes
|
||||
!
|
||||
f(1:nv,1:im,1:jm,1:km) = 0.0d+00
|
||||
|
||||
! select the directional flux to compute
|
||||
!
|
||||
select case(idir)
|
||||
@ -5233,10 +5253,10 @@ module schemes
|
||||
|
||||
! input arguments
|
||||
!
|
||||
integer , intent(in) :: idir
|
||||
real(kind=8) , intent(in) :: dx
|
||||
real(kind=8), dimension(nv,im,jm,km), intent(in) :: q
|
||||
real(kind=8), dimension(nv,im,jm,km), intent(inout) :: f
|
||||
integer , intent(in) :: idir
|
||||
real(kind=8) , intent(in) :: dx
|
||||
real(kind=8), dimension(nv,im,jm,km), intent(in) :: q
|
||||
real(kind=8), dimension(nv,im,jm,km), intent(out) :: f
|
||||
|
||||
! local variables
|
||||
!
|
||||
@ -5256,6 +5276,10 @@ module schemes
|
||||
call start_timer(imf)
|
||||
#endif /* PROFILE */
|
||||
|
||||
! initialize fluxes
|
||||
!
|
||||
f(1:nv,1:im,1:jm,1:km) = 0.0d+00
|
||||
|
||||
! select the directional flux to compute
|
||||
!
|
||||
select case(idir)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user