INTERPOLATION: rename expand_tvd() to expand().
This commit is contained in:
parent
62f8beccf7
commit
7cb4e2f352
@ -768,7 +768,7 @@ module boundaries
|
||||
, jn, jm, jb, jbl, jbu, je, jel, jeu &
|
||||
, kn, km, kb, kbl, kbu, ke, kel, keu
|
||||
use error , only : print_warning
|
||||
use interpolation, only : expand_tvd
|
||||
use interpolation, only : expand
|
||||
use variables , only : nvr, nqt, nfl
|
||||
#ifdef MHD
|
||||
use variables , only : ibx, iby, ibz
|
||||
@ -948,7 +948,7 @@ module boundaries
|
||||
|
||||
! expand the boundary
|
||||
!
|
||||
call expand_tvd(cm, dm, dl, ub(q,il:iu,jl:ju,kl:ku), u(:,:,:))
|
||||
call expand(cm(:), dm(:), dl, ub(q,il:iu,jl:ju,kl:ku), u(:,:,:))
|
||||
|
||||
! copy expanded boundary in the proper place of the block
|
||||
!
|
||||
@ -956,14 +956,13 @@ module boundaries
|
||||
|
||||
end do
|
||||
#ifdef MHD
|
||||
#ifdef GLM
|
||||
! iterate over magnetic field components
|
||||
!
|
||||
do q = ibx, ibz
|
||||
|
||||
! expand the boundary
|
||||
!
|
||||
call expand_tvd(cm, dm, dl, ub(q,il:iu,jl:ju,kl:ku), u(:,:,:))
|
||||
call expand(cm(:), dm(:), dl, ub(q,il:iu,jl:ju,kl:ku), u(:,:,:))
|
||||
|
||||
! copy expanded boundary in the proper place of the block
|
||||
!
|
||||
@ -971,9 +970,10 @@ module boundaries
|
||||
|
||||
end do
|
||||
|
||||
#ifdef GLM
|
||||
! expand and update the scalar potential
|
||||
!
|
||||
call expand_tvd(cm, dm, dl, ub(iph,il:iu,jl:ju,kl:ku), u(:,:,:))
|
||||
call expand(cm(:), dm(:), dl, ub(iph,il:iu,jl:ju,kl:ku), u(:,:,:))
|
||||
|
||||
! copy expanded boundary in the proper place of the block
|
||||
!
|
||||
|
@ -95,12 +95,12 @@ module interpolation
|
||||
!
|
||||
!===============================================================================
|
||||
!
|
||||
! expand_tvd: expands a multi-dimentional array similar to EXPAND but using
|
||||
! only the second-order TVD interpolation
|
||||
! expand: expands a multi-dimentional array similar using only TVD or high order
|
||||
! interpolation
|
||||
!
|
||||
!===============================================================================
|
||||
!
|
||||
subroutine expand_tvd(cm, dm, ng, u, v)
|
||||
subroutine expand(cm, dm, ng, u, v)
|
||||
|
||||
implicit none
|
||||
|
||||
@ -178,7 +178,7 @@ module interpolation
|
||||
!
|
||||
!-------------------------------------------------------------------------------
|
||||
!
|
||||
end subroutine expand_tvd
|
||||
end subroutine expand
|
||||
!
|
||||
!===============================================================================
|
||||
!
|
||||
|
10
src/mesh.F90
10
src/mesh.F90
@ -812,7 +812,7 @@ module mesh
|
||||
|
||||
use blocks , only : block_meta, block_data, nchild
|
||||
use config , only : ng, nh, in, jn, kn, im, jm, km
|
||||
use interpolation, only : expand_tvd
|
||||
use interpolation, only : expand
|
||||
use variables , only : nfl, nqt
|
||||
#ifdef MHD
|
||||
use variables , only : ibx, iby, ibz
|
||||
@ -870,20 +870,20 @@ module mesh
|
||||
! expand all variables and place them in the array u
|
||||
!
|
||||
do q = 1, nfl
|
||||
call expand_tvd(dm, fm, nh, pdata%u(q,:,:,:), u(q,:,:,:))
|
||||
call expand(dm(:), fm(:), nh, pdata%u(q,:,:,:), u(q,:,:,:))
|
||||
end do
|
||||
|
||||
#ifdef MHD
|
||||
#ifdef GLM
|
||||
! expand the cell centered magnetic field components
|
||||
!
|
||||
do q = ibx, ibz
|
||||
call expand_tvd(dm, fm, nh, pdata%u(q,:,:,:), u(q,:,:,:))
|
||||
call expand(dm(:), fm(:), nh, pdata%u(q,:,:,:), u(q,:,:,:))
|
||||
end do
|
||||
#ifdef GLM
|
||||
|
||||
! expand the scalar potential Psi
|
||||
!
|
||||
call expand_tvd(dm, fm, nh, pdata%u(iph,:,:,:), u(iph,:,:,:))
|
||||
call expand(dm(:), fm(:), nh, pdata%u(iph,:,:,:), u(iph,:,:,:))
|
||||
#endif /* GLM */
|
||||
#endif /* MHD */
|
||||
! iterate over all children
|
||||
|
Loading…
x
Reference in New Issue
Block a user