Fix volume tallies with 2D mesh filter. Closes #144.

This commit is contained in:
Paul Romano 2013-02-01 15:39:02 -05:00
parent 358b7ca7bb
commit d8250aba01
2 changed files with 5 additions and 5 deletions

View file

@ -79,7 +79,7 @@ contains
logical, intent(out) :: in_mesh ! were given coords in mesh?
! Find particle in mesh
ijk = ceiling((xyz - m % lower_left)/m % width)
ijk = ceiling((xyz(:m % n_dimension) - m % lower_left)/m % width)
! Determine if particle is in mesh
if (any(ijk(:m % n_dimension) < 1) .or. &

View file

@ -997,8 +997,8 @@ contains
! Determine indices for starting and ending location
m => meshes(t % filters(i_filter_mesh) % int_bins(1))
call get_mesh_indices(m, xyz0, ijk0, start_in_mesh)
call get_mesh_indices(m, xyz1, ijk1, end_in_mesh)
call get_mesh_indices(m, xyz0, ijk0(:m % n_dimension), start_in_mesh)
call get_mesh_indices(m, xyz1, ijk1(:m % n_dimension), end_in_mesh)
! Check if start or end is in mesh -- if not, check if track still
! intersects with mesh
@ -1407,8 +1407,8 @@ contains
! Determine indices for starting and ending location
m => meshes(t % filters(i_filter_mesh) % int_bins(1))
call get_mesh_indices(m, xyz0, ijk0, start_in_mesh)
call get_mesh_indices(m, xyz1, ijk1, end_in_mesh)
call get_mesh_indices(m, xyz0, ijk0(:m % n_dimension), start_in_mesh)
call get_mesh_indices(m, xyz1, ijk1(:m % n_dimension), end_in_mesh)
! Check to if start or end is in mesh -- if not, check if track still
! intersects with mesh