From 1505942008e819abf7c53ee220d4c56807b030b3 Mon Sep 17 00:00:00 2001 From: Sterling Harper Date: Thu, 14 Aug 2014 13:49:02 +0200 Subject: [PATCH] Extended lattice polymorphism --- src/geometry.F90 | 103 ++++++--------- src/geometry_header.F90 | 17 +-- src/hdf5_summary.F90 | 122 ++++++++++++------ src/initialize.F90 | 32 ++--- src/input_xml.F90 | 100 +++++++------- src/output.F90 | 56 +++++--- tests/test_filter_cell/geometry.xml | 10 +- tests/test_filter_cellborn/geometry.xml | 10 +- tests/test_filter_energy/geometry.xml | 10 +- tests/test_filter_energyout/geometry.xml | 10 +- tests/test_filter_group_transfer/geometry.xml | 10 +- tests/test_filter_material/geometry.xml | 10 +- tests/test_filter_mesh_2d/geometry.xml | 10 +- tests/test_filter_mesh_3d/geometry.xml | 10 +- tests/test_filter_universe/geometry.xml | 10 +- tests/test_lattice/geometry.xml | 4 +- tests/test_lattice_multiple/geometry.xml | 10 +- tests/test_score_MT/geometry.xml | 10 +- tests/test_score_absorption/geometry.xml | 10 +- tests/test_score_current/geometry.xml | 10 +- tests/test_score_events/geometry.xml | 10 +- tests/test_score_fission/geometry.xml | 10 +- tests/test_score_flux/geometry.xml | 10 +- tests/test_score_flux_yn/geometry.xml | 10 +- tests/test_score_kappafission/geometry.xml | 10 +- tests/test_score_nufission/geometry.xml | 10 +- tests/test_score_nuscatter/geometry.xml | 10 +- tests/test_score_nuscatter_n/geometry.xml | 10 +- tests/test_score_nuscatter_pn/geometry.xml | 10 +- tests/test_score_nuscatter_yn/geometry.xml | 10 +- tests/test_score_scatter/geometry.xml | 10 +- tests/test_score_scatter_n/geometry.xml | 10 +- tests/test_score_scatter_pn/geometry.xml | 10 +- tests/test_score_scatter_yn/geometry.xml | 10 +- tests/test_score_total/geometry.xml | 10 +- tests/test_score_total_yn/geometry.xml | 10 +- tests/test_tally_assumesep/geometry.xml | 10 +- tests/test_track_output/geometry.xml | 20 +-- 38 files changed, 394 insertions(+), 360 deletions(-) diff --git a/src/geometry.F90 b/src/geometry.F90 index 6b96598a1d..94e28bd799 100644 --- a/src/geometry.F90 +++ b/src/geometry.F90 @@ -286,33 +286,30 @@ contains real(8) :: xyz_t(3) - integer :: n_rings - select type(lat) type is (RectLattice) xyz_t(1) = xyz(1) - (lat % lower_left(1) + & - &(i_xyz(1) - 0.5_8)*lat % width(1)) + &(i_xyz(1) - 0.5_8)*lat % pitch(1)) xyz_t(2) = xyz(2) - (lat % lower_left(2) + & - &(i_xyz(2) - 0.5_8)*lat % width(2)) - if (lat % n_dimension == 3) then + &(i_xyz(2) - 0.5_8)*lat % pitch(2)) + if (lat % is_3d) then xyz_t(3) = xyz(3) - (lat % lower_left(3) + & - &(i_xyz(3) - 0.5_8)*lat % width(3)) + &(i_xyz(3) - 0.5_8)*lat % pitch(3)) else xyz_t(3) = xyz(3) end if type is (HexLattice) - n_rings = lat % dimension(1) - - xyz_t(1) = xyz(1) - (lat % lower_left(1) + & - &sqrt(3.0_8) * (i_xyz(1) - n_rings) * lat % width(1)) - xyz_t(2) = xyz(2) - (lat % lower_left(2) + & - &(2 * (i_xyz(2) - n_rings)) * lat % width(1) + & - &(i_xyz(1) - n_rings) * lat % width(1)) - if (lat % n_dimension == 3) then - xyz_t(3) = xyz(3) - (lat % lower_left(3) + & - &(i_xyz(3) - 0.5_8) * lat % width(3)) + xyz_t(1) = xyz(1) - (lat % center(1) + & + &sqrt(3.0_8) * (i_xyz(1) - lat % n_rings) * lat % pitch(1)) + xyz_t(2) = xyz(2) - (lat % center(2) + & + &(2 * (i_xyz(2) - lat % n_rings)) * lat % pitch(1) + & + &(i_xyz(1) - lat % n_rings) * lat % pitch(1)) + ! TODO transition to center from lower_left + if (lat % is_3d) then + xyz_t(3) = xyz(3) - (lat % center(3) + & + &(i_xyz(3) - 0.5_8) * lat % pitch(3)) else xyz_t(3) = xyz(3) end if @@ -331,37 +328,19 @@ contains integer , intent(in) :: i_xyz(3) logical :: is_valid - integer :: n_rings, n_x, n_y, n_z - select type(lat) type is (RectLattice) - n_x = lat % dimension(1) - n_y = lat % dimension(2) - if (lat % n_dimension == 3) then - n_z = lat % dimension(3) - else - n_z = 1 - end if - - is_valid = i_xyz(1) > 0 .and. i_xyz(1) <= n_x .and. & - &i_xyz(2) > 0 .and. i_xyz(2) <= n_y .and. & - &i_xyz(3) > 0 .and. i_xyz(3) <= n_z + is_valid = (i_xyz(1) > 0 .and. i_xyz(1) <= lat % n_cells(1) .and. & + &i_xyz(2) > 0 .and. i_xyz(2) <= lat % n_cells(2) .and. & + &i_xyz(3) > 0 .and. i_xyz(3) <= lat % n_cells(3)) type is (HexLattice) - n_rings = lat % dimension(1) - - if (lat % n_dimension == 2) then - n_z = lat % dimension(2) - else - n_z = 1 - end if - - is_valid = (i_xyz(1) > 0 .and. i_xyz(1) < 2*n_rings .and. & - &i_xyz(2) > 0 .and. i_xyz(2) < 2*n_rings .and. & - &i_xyz(1) + i_xyz(2) > n_rings .and. & - &i_xyz(1) + i_xyz(2) < 3*n_rings .and. & - &i_xyz(3) > 0 .and. i_xyz(3) < n_z + 1) + is_valid = (i_xyz(1) > 0 .and. i_xyz(1) < 2*lat % n_rings .and. & + &i_xyz(2) > 0 .and. i_xyz(2) < 2*lat % n_rings .and. & + &i_xyz(1) + i_xyz(2) > lat % n_rings .and. & + &i_xyz(1) + i_xyz(2) < 3*lat % n_rings .and. & + &i_xyz(3) > 0 .and. i_xyz(3) <= lat % n_axial) end select @@ -389,10 +368,10 @@ contains type is (RectLattice) ! Find approximate indices using ceiling division. - i_xyz(1) = ceiling((xyz(1) - lat % lower_left(1))/lat % width(1)) - i_xyz(2) = ceiling((xyz(2) - lat % lower_left(2))/lat % width(2)) - if (lat % n_dimension == 3) then - i_xyz(3) = ceiling((xyz(3) - lat % lower_left(3))/lat % width(3)) + i_xyz(1) = ceiling((xyz(1) - lat % lower_left(1))/lat % pitch(1)) + i_xyz(2) = ceiling((xyz(2) - lat % lower_left(2))/lat % pitch(2)) + if (lat % is_3d) then + i_xyz(3) = ceiling((xyz(3) - lat % lower_left(3))/lat % pitch(3)) else i_xyz(3) = 1 end if @@ -425,8 +404,9 @@ contains type is (HexLattice) ! Index z direction. - if (lat % n_dimension == 2) then - i_xyz(3) = ceiling((xyz(3) - lat % lower_left(3)) / lat % width(2)) + ! TODO transition to center from lower_left + if (lat % is_3d) then + i_xyz(3) = ceiling((xyz(3) - lat % center(3)) / lat % pitch(2)) else i_xyz(3) = 1 end if @@ -435,14 +415,13 @@ contains ! used to find the index of the particle coordinates to within 4 ! cells. alpha = xyz(2) - xyz(1) / sqrt(3.0_8) - i_xyz(1) = floor(xyz(1) / (sqrt(3.0_8) * lat % width(1))) - i_xyz(2) = floor(alpha / (2.0_8 * lat % width(1))) + i_xyz(1) = floor(xyz(1) / (sqrt(3.0_8) * lat % pitch(1))) + i_xyz(2) = floor(alpha / (2.0_8 * lat % pitch(1))) ! Add offset to indices (the center cell is (i_x, i_alpha) = (0, 0) ! but the array is offset so that the indices never go below 1). - n_rings = lat % dimension(1) - i_xyz(1) = i_xyz(1) + n_rings - i_xyz(2) = i_xyz(2) + n_rings + i_xyz(1) = i_xyz(1) + lat % n_rings + i_xyz(2) = i_xyz(2) + lat % n_rings ! Calculate the (squared) distance between the particle and the centers of ! the four possible cells. Regular hexagonal tiles form a centroidal @@ -1431,8 +1410,8 @@ contains z = coord % xyz(3) ! determine oncoming edge - x0 = sign(lat % width(1) * 0.5_8, u) - y0 = sign(lat % width(2) * 0.5_8, v) + x0 = sign(lat % pitch(1) * 0.5_8, u) + y0 = sign(lat % pitch(2) * 0.5_8, v) ! left and right sides if (abs(x - x0) < FP_PRECISION) then @@ -1468,8 +1447,8 @@ contains end if end if - if (lat % n_dimension == 3) then - z0 = -sign(lat % width(3) * 0.5_8, w) + if (lat % is_3d) then + z0 = sign(lat % pitch(3) * 0.5_8, w) ! top and bottom sides if (abs(z - z0) < FP_PRECISION) then @@ -1510,7 +1489,7 @@ contains gama_dir = -v/2.0_8 + sqrt(3.0_8)*u/2.0_8 ! Upper right and lower left sides. - edge = -sign(lat % width(1), beta_dir) ! Oncoming edge + edge = -sign(lat % pitch(1), beta_dir) ! Oncoming edge if (beta_dir > 0.0) then xyz_t = get_lat_trans(lat, parent_coord % xyz, i_xyz + (/1, 0, 0/)) else @@ -1533,7 +1512,7 @@ contains end if ! Lower right and upper left sides. - edge = -sign(lat % width(1), gama_dir) ! Oncoming edge + edge = -sign(lat % pitch(1), gama_dir) ! Oncoming edge if (gama_dir > 0.0) then xyz_t = get_lat_trans(lat, parent_coord % xyz, i_xyz + (/1, -1, 0/)) else @@ -1558,7 +1537,7 @@ contains end if ! Upper and lower sides. - edge = -sign(lat % width(1), v) ! Oncoming edge + edge = -sign(lat % pitch(1), v) ! Oncoming edge if (v > 0.0) then xyz_t = get_lat_trans(lat, parent_coord % xyz, i_xyz + (/0, 1, 0/)) else @@ -1582,8 +1561,8 @@ contains end if ! Top and bottom sides. - if (lat % n_dimension == 2) then - z0 = sign(lat % width(3) * 0.5_8, w) + if (lat % is_3d) then + z0 = sign(lat % pitch(3) * 0.5_8, w) if (abs(z - z0) < FP_PRECISION) then d = INFINITY diff --git a/src/geometry_header.F90 b/src/geometry_header.F90 index 7ac32cae73..eb321b1bad 100644 --- a/src/geometry_header.F90 +++ b/src/geometry_header.F90 @@ -23,20 +23,21 @@ module geometry_header type, abstract :: Lattice integer :: id ! Universe number for lattice - integer :: type ! Type of lattice (rectangular, hex, etc) - integer :: level ! Level of lattice - integer :: n_dimension ! Number of dimensions - integer, allocatable :: dimension(:) ! number of cells in each direction - real(8), allocatable :: lower_left(:) ! lower-left corner of lattice - real(8), allocatable :: width(:) ! width of each lattice cell - integer, allocatable :: universes(:,:,:) ! specified universes - integer :: outside ! material to fill area outside + real(8), allocatable :: pitch(:) ! Pitch along each axis + integer, allocatable :: universes(:,:,:) ! Specified universes + integer :: outside ! Material to fill area outside + logical :: is_3d ! Lattice has cells on z axis end type Lattice type, extends(Lattice) :: RectLattice + integer :: n_cells(3) ! Number of cells along each axis + real(8), allocatable :: lower_left(:) ! Global lower-left corner of lat end type RectLattice type, extends(Lattice) :: HexLattice + integer :: n_rings ! Number of radial ring cell positoins + integer :: n_axial ! Number of axial cell positions + real(8), allocatable :: center(:) ! Global center of lattice end type HexLattice type LatticeContainer diff --git a/src/hdf5_summary.F90 b/src/hdf5_summary.F90 index 8263f0a053..faf6df6e2f 100644 --- a/src/hdf5_summary.F90 +++ b/src/hdf5_summary.F90 @@ -100,8 +100,6 @@ contains subroutine hdf5_write_geometry() integer :: i, j, k, m - integer :: n_x, n_y, n_z - integer :: length(3) integer, allocatable :: lattice_universes(:,:,:) type(Cell), pointer :: c => null() type(Surface), pointer :: s => null() @@ -275,50 +273,102 @@ contains LATTICE_LOOP: do i = 1, n_lattices lat => lattices(i) % obj - ! Write lattice type select type (lat) type is (RectLattice) + ! Write lattice type. call su % write_data("rectangular", "type", & group="geometry/lattices/lattice " // trim(to_str(lat % id))) - type is (HexLattice) - call su % write_data("hexagonal", "type", & + + ! Write number of lattice cells. + call su % write_data(lat % n_cells, "n_cells", length=3, & group="geometry/lattices/lattice " // trim(to_str(lat % id))) - end select - ! Write lattice dimensions, lower left corner, and width of element - call su % write_data(lat % dimension, "dimension", & - length=lat % n_dimension, & - group="geometry/lattices/lattice " // trim(to_str(lat % id))) - call su % write_data(lat % lower_left, "lower_left", & - length=lat % n_dimension, & - group="geometry/lattices/lattice " // trim(to_str(lat % id))) - call su % write_data(lat % width, "width", & - length=lat % n_dimension, & - group="geometry/lattices/lattice " // trim(to_str(lat % id))) + ! Write lattice lower-left. + if (lat % is_3d) then + call su % write_data(lat % lower_left, "lower_left", length=3, & + group="geometry/lattices/lattice " // trim(to_str(lat % id))) + else + call su % write_data(lat % lower_left, "lower_left", length=2, & + group="geometry/lattices/lattice " // trim(to_str(lat % id))) + end if - ! Determine dimensions of lattice - n_x = lat % dimension(1) - n_y = lat % dimension(2) - if (lat % n_dimension == 3) then - n_z = lat % dimension(3) - else - n_z = 1 - end if - - ! Write lattice universes - allocate(lattice_universes(n_x, n_y, n_z)) - do j = 1, n_x - do k = 1, n_y - do m = 1, n_z - lattice_universes(j,k,m) = universes(lat % universes(j,k,m)) % id + ! Write lattice pitch. + if (lat % is_3d) then + call su % write_data(lat % pitch, "pitch", length=3, & + group="geometry/lattices/lattice " // trim(to_str(lat % id))) + else + call su % write_data(lat % pitch, "pitch", length=2, & + group="geometry/lattices/lattice " // trim(to_str(lat % id))) + end if + + ! Write lattice universes. + allocate(lattice_universes(lat % n_cells(1), lat % n_cells(2), & + &lat % n_cells(3))) + do j = 1, lat % n_cells(1) + do k = 1, lat % n_cells(2) + do m = 1, lat % n_cells(3) + lattice_universes(j,k,m) = universes(lat % universes(j,k,m)) % id + end do end do end do - end do - length = [n_x, n_y, n_z] - call su % write_data(lattice_universes, "universes", length=length, & - group="geometry/lattices/lattice " // trim(to_str(lat % id))) - deallocate(lattice_universes) + call su % write_data(lattice_universes, "universes", & + length=lat % n_cells, & + group="geometry/lattices/lattice " // trim(to_str(lat % id))) + deallocate(lattice_universes) + type is (HexLattice) + ! Write lattice type. + call su % write_data("hexagonal", "type", & + group="geometry/lattices/lattice " // trim(to_str(lat % id))) + + ! Write number of lattice cells. + call su % write_data(lat % n_rings, "n_rings", & + group="geometry/lattices/lattice " // trim(to_str(lat % id))) + call su % write_data(lat % n_rings, "n_axial", & + group="geometry/lattices/lattice " // trim(to_str(lat % id))) + + ! Write lattice center. + if (lat % is_3d) then + call su % write_data(lat % center, "center", length=3, & + group="geometry/lattices/lattice " // trim(to_str(lat % id))) + else + call su % write_data(lat % center, "center", length=2, & + group="geometry/lattices/lattice " // trim(to_str(lat % id))) + end if + + ! Write lattice pitch. + if (lat % is_3d) then + call su % write_data(lat % pitch, "pitch", length=2, & + group="geometry/lattices/lattice " // trim(to_str(lat % id))) + else + call su % write_data(lat % pitch, "pitch", length=1, & + group="geometry/lattices/lattice " // trim(to_str(lat % id))) + end if + + ! Write lattice universes. + allocate(lattice_universes(2*lat % n_rings - 1, 2*lat % n_rings - 1, & + &lat % n_axial)) + do j = 1, lat % n_axial + do k = 1, 2*lat % n_rings - 1 + do m = 1, 2*lat % n_rings - 1 + if (j + k < lat % n_rings + 1) then + ! This array position is never used; put a -1 to indicate this + lattice_universes(j,k,m) = -1 + cycle + else if (j + k > 3*lat % n_rings - 1) then + ! This array position is never used; put a -1 to indicate this + lattice_universes(j,k,m) = -1 + cycle + end if + lattice_universes(j,k,m) = universes(lat % universes(j,k,m)) % id + end do + end do + end do + call su % write_data(lattice_universes, "universes", & + &length=(/lat % n_axial, 2*lat % n_rings-1, 2*lat % n_rings-1/), & + &group="geometry/lattices/lattice " // trim(to_str(lat % id))) + deallocate(lattice_universes) + end select end do LATTICE_LOOP end subroutine hdf5_write_geometry diff --git a/src/initialize.F90 b/src/initialize.F90 index 6ab3ac4930..4c0b996b1f 100644 --- a/src/initialize.F90 +++ b/src/initialize.F90 @@ -563,7 +563,6 @@ contains integer :: k ! loop index for lattices integer :: m ! loop index for lattices integer :: mid, lid ! material and lattice IDs - integer :: n_x, n_y, n_z, n_rings ! size of lattice integer :: i_array ! index in surfaces/materials array integer :: id ! user-specified id type(Cell), pointer :: c => null() @@ -652,17 +651,9 @@ contains select type (lat) type is (RectLattice) - n_x = lat % dimension(1) - n_y = lat % dimension(2) - if (lat % n_dimension == 3) then - n_z = lat % dimension(3) - else - n_z = 1 - end if - - do m = 1, n_z - do k = 1, n_y - do j = 1, n_x + do m = 1, lat % n_cells(3) + do k = 1, lat % n_cells(2) + do j = 1, lat % n_cells(1) id = lat % universes(j,k,m) if (universe_dict % has_key(id)) then lat % universes(j,k,m) = universe_dict % get_key(id) @@ -676,19 +667,12 @@ contains end do type is (HexLattice) - n_rings = lat % dimension(1) - if (lat % n_dimension == 2) then - n_z = lat % dimension(2) - else - n_z = 1 - end if - - do m = 1, n_z - do k = 1, 2*n_rings - 1 - do j = 1, 2*n_rings - 1 - if (j + k < n_rings + 1) then + do m = 1, lat % n_axial + do k = 1, 2*lat % n_rings - 1 + do j = 1, 2*lat % n_rings - 1 + if (j + k < lat % n_rings + 1) then cycle - else if (j + k > 3*n_rings - 1) then + else if (j + k > 3*lat % n_rings - 1) then cycle end if id = lat % universes(j, k, m) diff --git a/src/input_xml.F90 b/src/input_xml.F90 index 366e5f1a72..b85ed8c242 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -1200,6 +1200,8 @@ contains RECT_LATTICES: do i = 1, n_rlats allocate(RectLattice::lattices(i) % obj) lat => lattices(i) % obj + select type(lat) + type is (RectLattice) ! Get pointer to i-th lattice call get_list_item(node_rlat_list, i, node_lat) @@ -1221,18 +1223,20 @@ contains ! Read number of lattice cells in each dimension n = get_arraysize_integer(node_lat, "dimension") - if (n /= 2 .and. n /= 3) then + if (n == 2) then + call get_node_array(node_lat, "dimension", lat % n_cells(1:2)) + lat % n_cells(3) = 1 + lat % is_3d = .false. + else if (n == 3) then + call get_node_array(node_lat, "dimension", lat % n_cells) + lat % is_3d = .true. + else message = "Rectangular lattice must be two or three dimensions." call fatal_error() end if - lat % n_dimension = n - allocate(lat % dimension(n)) - call get_node_array(node_lat, "dimension", lat % dimension) - ! Read lattice lower-left location - if (size(lat % dimension) /= & - &get_arraysize_double(node_lat, "lower_left")) then + if (get_arraysize_double(node_lat, "lower_left") /= n) then message = "Number of entries on must be the same as & &the number of entries on ." call fatal_error() @@ -1241,25 +1245,20 @@ contains allocate(lat % lower_left(n)) call get_node_array(node_lat, "lower_left", lat % lower_left) - ! Read lattice widths - if (size(lat % dimension) /= & - get_arraysize_double(node_lat, "width")) then - message = "Number of entries on must be the same as & + ! Read lattice pitches + if (get_arraysize_double(node_lat, "pitch") /= n) then + message = "Number of entries on must be the same as & &the number of entries on ." call fatal_error() end if - allocate(lat % width(n)) - call get_node_array(node_lat, "width", lat % width) + allocate(lat % pitch(n)) + call get_node_array(node_lat, "pitch", lat % pitch) ! Copy number of dimensions - n_x = lat % dimension(1) - n_y = lat % dimension(2) - if (lat % n_dimension == 3) then - n_z = lat % dimension(3) - else - n_z = 1 - end if + n_x = lat % n_cells(1) + n_y = lat % n_cells(2) + n_z = lat % n_cells(3) allocate(lat % universes(n_x, n_y, n_z)) ! Check that number of universes matches size @@ -1298,11 +1297,14 @@ contains ! Add lattice to dictionary call lattice_dict % add_key(lat % id, i) + end select end do RECT_LATTICES HEX_LATTICES: do i = 1, n_hlats allocate(HexLattice::lattices(i) % obj) lat => lattices(i) % obj + select type (lat) + type is (HexLattice) ! Get pointer to i-th lattice call get_list_item(node_hlat_list, i, node_lat) @@ -1323,45 +1325,48 @@ contains end if ! Read number of lattice cells in each dimension - n = get_arraysize_integer(node_lat, "dimension") - if (n /= 1 .and. n/= 2) then - message = "Hexagonal lattice must be one or two dimension(s)." - call fatal_error() + call get_node_value(node_lat, "n_rings", lat % n_rings) + if (check_for_node(node_lat, "n_axial")) then + call get_node_value(node_lat, "n_axial", lat % n_axial) + lat % is_3d = .true. + else + lat % n_axial = 1 + lat % is_3d = .false. end if - lat % n_dimension = n - allocate(lat % dimension(n)) - call get_node_array(node_lat, "dimension", lat % dimension) - ! Read lattice lower-left location - if (size(lat % dimension) /= & - &get_arraysize_double(node_lat, "lower_left") - 1) then - message = "Number of entries on must be one greater & - &than the number of entries on ." + n = get_arraysize_double(node_lat, "center") + if (lat % is_3d .and. n /= 3) then + message = "A hexagonal lattice with must have
& + &specified by 3 numbers." + call fatal_error() + else if ((.not. lat % is_3d) .and. n /= 2) then + message = "A hexagonal lattice without must have
& + &specified by 2 numbers." call fatal_error() end if - allocate(lat % lower_left(n+1)) - call get_node_array(node_lat, "lower_left", lat % lower_left) + allocate(lat % center(n)) + call get_node_array(node_lat, "center", lat % center) - ! Read lattice widths - if (size(lat % dimension) /= & - get_arraysize_double(node_lat, "width")) then - message = "Number of entries on must be the same as & - &the number of entries on ." + ! Read lattice pitches + n = get_arraysize_double(node_lat, "pitch") + if (lat % is_3d .and. n /= 2) then + message = "A hexagonal lattice with must have & + &specified by 2 numbers." + call fatal_error() + else if ((.not. lat % is_3d) .and. n /= 1) then + message = "A hexagonal lattice without must have & + &specified by 1 number." call fatal_error() end if - allocate(lat % width(n)) - call get_node_array(node_lat, "width", lat % width) + allocate(lat % pitch(n)) + call get_node_array(node_lat, "pitch", lat % pitch) ! Copy number of dimensions - n_rings = lat % dimension(1) - if (lat % n_dimension == 2) then - n_z = lat % dimension(2) - else - n_z = 1 - end if + n_rings = lat % n_rings + n_z = lat % n_axial allocate(lat % universes(2*n_rings - 1, 2*n_rings - 1, n_z)) ! Check that number of universes matches size @@ -1474,6 +1479,7 @@ contains ! Add lattice to dictionary call lattice_dict % add_key(lat % id, i) + end select end do HEX_LATTICES ! Close geometry XML file diff --git a/src/output.F90 b/src/output.F90 index 7630228233..c0695a7f3e 100644 --- a/src/output.F90 +++ b/src/output.F90 @@ -6,7 +6,8 @@ module output use constants use endf, only: reaction_name use error, only: warning - use geometry_header, only: Cell, Universe, Surface, BASE_UNIVERSE + use geometry_header, only: Cell, Universe, Surface, Lattice, RectLattice, & + &HexLattice, BASE_UNIVERSE use global use math, only: t_percentile use mesh_header, only: StructuredMesh @@ -474,7 +475,6 @@ contains class(Lattice), pointer :: lat integer, optional :: unit - integer :: i ! loop index integer :: unit_ ! unit to write to character(MAX_LINE_LEN) :: string @@ -489,27 +489,41 @@ contains ! Write information about lattice write(unit_,*) 'Lattice ' // to_str(lat % id) - ! Write dimension of lattice - string = "" - do i = 1, lat % n_dimension - string = trim(string) // ' ' // to_str(lat % dimension(i)) - end do - write(unit_,*) ' Dimension =' // string + select type(lat) + type is (RectLattice) + ! Write dimension of lattice. + string = to_str(lat % n_cells(1)) // ' ' // to_str(lat % n_cells(2)) + if (lat % is_3d) string = string // ' ' // to_str(lat % n_cells(3)) + write(unit_,*) ' Dimension =' // string - ! Write lower-left coordinates of lattice - string = "" - do i = 1, lat % n_dimension - string = trim(string) // ' ' // to_str(lat % lower_left(i)) - end do - write(unit_,*) ' Lower-left =' // string + ! Write lower-left coordinates of lattice. + string = to_str(lat % lower_left(1)) // ' ' // to_str(lat % lower_left(2)) + if (lat % is_3d) string = string // ' ' // to_str(lat % lower_left(3)) + write(unit_,*) ' Lower-left =' // string + + ! Write lattice pitch along each axis. + string = to_str(lat % pitch(1)) // ' ' // to_str(lat % pitch(2)) + if (lat % is_3d) string = string // ' ' // to_str(lat % pitch(3)) + write(unit_,*) ' Pitch =' // string + write(unit_,*) + + type is (HexLattice) + ! Write dimension of lattice. + write(unit_,*) ' N-rings = ' // to_str(lat % n_rings) + if (lat % is_3d) write(unit_,*) ' N-axial = ' // to_str(lat % n_axial) + + ! Write center coordinates of lattice. + string = to_str(lat % center(1)) // ' ' // to_str(lat % center(2)) + if (lat % is_3d) string = string // ' ' // to_str(lat % center(3)) + write(unit_,*) ' Center =' // string + + ! Write lattice pitch along each axis. + string = to_str(lat % pitch(1)) + if (lat % is_3d) string = string // ' ' // to_str(lat % pitch(2)) + write(unit_,*) ' Pitch =' // string + write(unit_,*) + end select - ! Write width of each lattice cell - string = "" - do i = 1, lat % n_dimension - string = trim(string) // ' ' // to_str(lat % width(i)) - end do - write(unit_,*) ' Width =' // string - write(unit_,*) end subroutine print_lattice diff --git a/tests/test_filter_cell/geometry.xml b/tests/test_filter_cell/geometry.xml index 2407bf74b3..69269a1b8a 100644 --- a/tests/test_filter_cell/geometry.xml +++ b/tests/test_filter_cell/geometry.xml @@ -71,7 +71,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 @@ -98,7 +98,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 @@ -125,7 +125,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 @@ -156,7 +156,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 @@ -182,4 +182,4 @@ - \ No newline at end of file + diff --git a/tests/test_filter_cellborn/geometry.xml b/tests/test_filter_cellborn/geometry.xml index 2407bf74b3..69269a1b8a 100644 --- a/tests/test_filter_cellborn/geometry.xml +++ b/tests/test_filter_cellborn/geometry.xml @@ -71,7 +71,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 @@ -98,7 +98,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 @@ -125,7 +125,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 @@ -156,7 +156,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 @@ -182,4 +182,4 @@ - \ No newline at end of file + diff --git a/tests/test_filter_energy/geometry.xml b/tests/test_filter_energy/geometry.xml index 2407bf74b3..69269a1b8a 100644 --- a/tests/test_filter_energy/geometry.xml +++ b/tests/test_filter_energy/geometry.xml @@ -71,7 +71,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 @@ -98,7 +98,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 @@ -125,7 +125,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 @@ -156,7 +156,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 @@ -182,4 +182,4 @@ - \ No newline at end of file + diff --git a/tests/test_filter_energyout/geometry.xml b/tests/test_filter_energyout/geometry.xml index 2407bf74b3..69269a1b8a 100644 --- a/tests/test_filter_energyout/geometry.xml +++ b/tests/test_filter_energyout/geometry.xml @@ -71,7 +71,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 @@ -98,7 +98,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 @@ -125,7 +125,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 @@ -156,7 +156,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 @@ -182,4 +182,4 @@ - \ No newline at end of file + diff --git a/tests/test_filter_group_transfer/geometry.xml b/tests/test_filter_group_transfer/geometry.xml index 2407bf74b3..69269a1b8a 100644 --- a/tests/test_filter_group_transfer/geometry.xml +++ b/tests/test_filter_group_transfer/geometry.xml @@ -71,7 +71,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 @@ -98,7 +98,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 @@ -125,7 +125,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 @@ -156,7 +156,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 @@ -182,4 +182,4 @@ - \ No newline at end of file + diff --git a/tests/test_filter_material/geometry.xml b/tests/test_filter_material/geometry.xml index 2407bf74b3..69269a1b8a 100644 --- a/tests/test_filter_material/geometry.xml +++ b/tests/test_filter_material/geometry.xml @@ -71,7 +71,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 @@ -98,7 +98,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 @@ -125,7 +125,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 @@ -156,7 +156,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 @@ -182,4 +182,4 @@ - \ No newline at end of file + diff --git a/tests/test_filter_mesh_2d/geometry.xml b/tests/test_filter_mesh_2d/geometry.xml index 2407bf74b3..69269a1b8a 100644 --- a/tests/test_filter_mesh_2d/geometry.xml +++ b/tests/test_filter_mesh_2d/geometry.xml @@ -71,7 +71,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 @@ -98,7 +98,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 @@ -125,7 +125,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 @@ -156,7 +156,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 @@ -182,4 +182,4 @@ - \ No newline at end of file + diff --git a/tests/test_filter_mesh_3d/geometry.xml b/tests/test_filter_mesh_3d/geometry.xml index 2407bf74b3..69269a1b8a 100644 --- a/tests/test_filter_mesh_3d/geometry.xml +++ b/tests/test_filter_mesh_3d/geometry.xml @@ -71,7 +71,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 @@ -98,7 +98,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 @@ -125,7 +125,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 @@ -156,7 +156,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 @@ -182,4 +182,4 @@ - \ No newline at end of file + diff --git a/tests/test_filter_universe/geometry.xml b/tests/test_filter_universe/geometry.xml index 2407bf74b3..69269a1b8a 100644 --- a/tests/test_filter_universe/geometry.xml +++ b/tests/test_filter_universe/geometry.xml @@ -71,7 +71,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 @@ -98,7 +98,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 @@ -125,7 +125,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 @@ -156,7 +156,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 @@ -182,4 +182,4 @@ - \ No newline at end of file + diff --git a/tests/test_lattice/geometry.xml b/tests/test_lattice/geometry.xml index 49328d5a82..268ac2cff1 100644 --- a/tests/test_lattice/geometry.xml +++ b/tests/test_lattice/geometry.xml @@ -51,7 +51,7 @@ rectangular 29 29 -0.889 -0.889 - 1.778 1.778 + 1.778 1.778 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 @@ -120,4 +120,4 @@ - \ No newline at end of file + diff --git a/tests/test_lattice_multiple/geometry.xml b/tests/test_lattice_multiple/geometry.xml index 2407bf74b3..69269a1b8a 100644 --- a/tests/test_lattice_multiple/geometry.xml +++ b/tests/test_lattice_multiple/geometry.xml @@ -71,7 +71,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 @@ -98,7 +98,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 @@ -125,7 +125,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 @@ -156,7 +156,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 @@ -182,4 +182,4 @@ - \ No newline at end of file + diff --git a/tests/test_score_MT/geometry.xml b/tests/test_score_MT/geometry.xml index 2407bf74b3..69269a1b8a 100644 --- a/tests/test_score_MT/geometry.xml +++ b/tests/test_score_MT/geometry.xml @@ -71,7 +71,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 @@ -98,7 +98,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 @@ -125,7 +125,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 @@ -156,7 +156,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 @@ -182,4 +182,4 @@ - \ No newline at end of file + diff --git a/tests/test_score_absorption/geometry.xml b/tests/test_score_absorption/geometry.xml index 2407bf74b3..69269a1b8a 100644 --- a/tests/test_score_absorption/geometry.xml +++ b/tests/test_score_absorption/geometry.xml @@ -71,7 +71,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 @@ -98,7 +98,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 @@ -125,7 +125,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 @@ -156,7 +156,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 @@ -182,4 +182,4 @@ - \ No newline at end of file + diff --git a/tests/test_score_current/geometry.xml b/tests/test_score_current/geometry.xml index 2407bf74b3..69269a1b8a 100644 --- a/tests/test_score_current/geometry.xml +++ b/tests/test_score_current/geometry.xml @@ -71,7 +71,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 @@ -98,7 +98,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 @@ -125,7 +125,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 @@ -156,7 +156,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 @@ -182,4 +182,4 @@ - \ No newline at end of file + diff --git a/tests/test_score_events/geometry.xml b/tests/test_score_events/geometry.xml index 2407bf74b3..69269a1b8a 100644 --- a/tests/test_score_events/geometry.xml +++ b/tests/test_score_events/geometry.xml @@ -71,7 +71,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 @@ -98,7 +98,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 @@ -125,7 +125,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 @@ -156,7 +156,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 @@ -182,4 +182,4 @@ - \ No newline at end of file + diff --git a/tests/test_score_fission/geometry.xml b/tests/test_score_fission/geometry.xml index 2407bf74b3..69269a1b8a 100644 --- a/tests/test_score_fission/geometry.xml +++ b/tests/test_score_fission/geometry.xml @@ -71,7 +71,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 @@ -98,7 +98,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 @@ -125,7 +125,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 @@ -156,7 +156,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 @@ -182,4 +182,4 @@ - \ No newline at end of file + diff --git a/tests/test_score_flux/geometry.xml b/tests/test_score_flux/geometry.xml index 2407bf74b3..69269a1b8a 100644 --- a/tests/test_score_flux/geometry.xml +++ b/tests/test_score_flux/geometry.xml @@ -71,7 +71,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 @@ -98,7 +98,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 @@ -125,7 +125,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 @@ -156,7 +156,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 @@ -182,4 +182,4 @@ - \ No newline at end of file + diff --git a/tests/test_score_flux_yn/geometry.xml b/tests/test_score_flux_yn/geometry.xml index 2407bf74b3..69269a1b8a 100644 --- a/tests/test_score_flux_yn/geometry.xml +++ b/tests/test_score_flux_yn/geometry.xml @@ -71,7 +71,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 @@ -98,7 +98,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 @@ -125,7 +125,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 @@ -156,7 +156,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 @@ -182,4 +182,4 @@ - \ No newline at end of file + diff --git a/tests/test_score_kappafission/geometry.xml b/tests/test_score_kappafission/geometry.xml index 2407bf74b3..69269a1b8a 100644 --- a/tests/test_score_kappafission/geometry.xml +++ b/tests/test_score_kappafission/geometry.xml @@ -71,7 +71,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 @@ -98,7 +98,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 @@ -125,7 +125,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 @@ -156,7 +156,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 @@ -182,4 +182,4 @@ - \ No newline at end of file + diff --git a/tests/test_score_nufission/geometry.xml b/tests/test_score_nufission/geometry.xml index 2407bf74b3..69269a1b8a 100644 --- a/tests/test_score_nufission/geometry.xml +++ b/tests/test_score_nufission/geometry.xml @@ -71,7 +71,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 @@ -98,7 +98,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 @@ -125,7 +125,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 @@ -156,7 +156,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 @@ -182,4 +182,4 @@ - \ No newline at end of file + diff --git a/tests/test_score_nuscatter/geometry.xml b/tests/test_score_nuscatter/geometry.xml index 2407bf74b3..69269a1b8a 100644 --- a/tests/test_score_nuscatter/geometry.xml +++ b/tests/test_score_nuscatter/geometry.xml @@ -71,7 +71,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 @@ -98,7 +98,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 @@ -125,7 +125,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 @@ -156,7 +156,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 @@ -182,4 +182,4 @@ - \ No newline at end of file + diff --git a/tests/test_score_nuscatter_n/geometry.xml b/tests/test_score_nuscatter_n/geometry.xml index 2407bf74b3..69269a1b8a 100644 --- a/tests/test_score_nuscatter_n/geometry.xml +++ b/tests/test_score_nuscatter_n/geometry.xml @@ -71,7 +71,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 @@ -98,7 +98,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 @@ -125,7 +125,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 @@ -156,7 +156,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 @@ -182,4 +182,4 @@ - \ No newline at end of file + diff --git a/tests/test_score_nuscatter_pn/geometry.xml b/tests/test_score_nuscatter_pn/geometry.xml index 2407bf74b3..69269a1b8a 100644 --- a/tests/test_score_nuscatter_pn/geometry.xml +++ b/tests/test_score_nuscatter_pn/geometry.xml @@ -71,7 +71,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 @@ -98,7 +98,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 @@ -125,7 +125,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 @@ -156,7 +156,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 @@ -182,4 +182,4 @@ - \ No newline at end of file + diff --git a/tests/test_score_nuscatter_yn/geometry.xml b/tests/test_score_nuscatter_yn/geometry.xml index 2407bf74b3..69269a1b8a 100644 --- a/tests/test_score_nuscatter_yn/geometry.xml +++ b/tests/test_score_nuscatter_yn/geometry.xml @@ -71,7 +71,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 @@ -98,7 +98,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 @@ -125,7 +125,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 @@ -156,7 +156,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 @@ -182,4 +182,4 @@ - \ No newline at end of file + diff --git a/tests/test_score_scatter/geometry.xml b/tests/test_score_scatter/geometry.xml index 2407bf74b3..69269a1b8a 100644 --- a/tests/test_score_scatter/geometry.xml +++ b/tests/test_score_scatter/geometry.xml @@ -71,7 +71,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 @@ -98,7 +98,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 @@ -125,7 +125,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 @@ -156,7 +156,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 @@ -182,4 +182,4 @@ - \ No newline at end of file + diff --git a/tests/test_score_scatter_n/geometry.xml b/tests/test_score_scatter_n/geometry.xml index 2407bf74b3..69269a1b8a 100644 --- a/tests/test_score_scatter_n/geometry.xml +++ b/tests/test_score_scatter_n/geometry.xml @@ -71,7 +71,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 @@ -98,7 +98,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 @@ -125,7 +125,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 @@ -156,7 +156,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 @@ -182,4 +182,4 @@ - \ No newline at end of file + diff --git a/tests/test_score_scatter_pn/geometry.xml b/tests/test_score_scatter_pn/geometry.xml index 2407bf74b3..69269a1b8a 100644 --- a/tests/test_score_scatter_pn/geometry.xml +++ b/tests/test_score_scatter_pn/geometry.xml @@ -71,7 +71,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 @@ -98,7 +98,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 @@ -125,7 +125,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 @@ -156,7 +156,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 @@ -182,4 +182,4 @@ - \ No newline at end of file + diff --git a/tests/test_score_scatter_yn/geometry.xml b/tests/test_score_scatter_yn/geometry.xml index 2407bf74b3..69269a1b8a 100644 --- a/tests/test_score_scatter_yn/geometry.xml +++ b/tests/test_score_scatter_yn/geometry.xml @@ -71,7 +71,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 @@ -98,7 +98,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 @@ -125,7 +125,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 @@ -156,7 +156,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 @@ -182,4 +182,4 @@ - \ No newline at end of file + diff --git a/tests/test_score_total/geometry.xml b/tests/test_score_total/geometry.xml index 2407bf74b3..69269a1b8a 100644 --- a/tests/test_score_total/geometry.xml +++ b/tests/test_score_total/geometry.xml @@ -71,7 +71,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 @@ -98,7 +98,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 @@ -125,7 +125,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 @@ -156,7 +156,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 @@ -182,4 +182,4 @@ - \ No newline at end of file + diff --git a/tests/test_score_total_yn/geometry.xml b/tests/test_score_total_yn/geometry.xml index 2407bf74b3..69269a1b8a 100644 --- a/tests/test_score_total_yn/geometry.xml +++ b/tests/test_score_total_yn/geometry.xml @@ -71,7 +71,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 @@ -98,7 +98,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 @@ -125,7 +125,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 @@ -156,7 +156,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 @@ -182,4 +182,4 @@ - \ No newline at end of file + diff --git a/tests/test_tally_assumesep/geometry.xml b/tests/test_tally_assumesep/geometry.xml index 2407bf74b3..69269a1b8a 100644 --- a/tests/test_tally_assumesep/geometry.xml +++ b/tests/test_tally_assumesep/geometry.xml @@ -71,7 +71,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 @@ -98,7 +98,7 @@ rectangular 17 17 -10.71 -10.71 - 1.26 1.26 + 1.26 1.26 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 @@ -125,7 +125,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 @@ -156,7 +156,7 @@ rectangular 21 21 -224.91 -224.91 - 21.42 21.42 + 21.42 21.42 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 @@ -182,4 +182,4 @@ - \ No newline at end of file + diff --git a/tests/test_track_output/geometry.xml b/tests/test_track_output/geometry.xml index f3566ab17f..dc20bd1b88 100644 --- a/tests/test_track_output/geometry.xml +++ b/tests/test_track_output/geometry.xml @@ -37,7 +37,7 @@ -12.2682 -12.2682 - 1.63576 1.63576 + 1.63576 1.63576 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 @@ -61,7 +61,7 @@ -12.2682 -12.2682 - 1.63576 1.63576 + 1.63576 1.63576 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 @@ -88,7 +88,7 @@ -12.2682 -12.2682 - 1.63576 1.63576 + 1.63576 1.63576 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 @@ -117,7 +117,7 @@ -12.2682 -12.2682 - 1.63576 1.63576 + 1.63576 1.63576 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 @@ -141,7 +141,7 @@ -12.2682 -12.2682 - 1.63576 1.63576 + 1.63576 1.63576 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 @@ -168,7 +168,7 @@ -12.2682 -12.2682 - 1.63576 1.63576 + 1.63576 1.63576 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 @@ -195,7 +195,7 @@ -12.2682 -12.2682 - 1.63576 1.63576 + 1.63576 1.63576 2 2 2 1 1 1 1 1 1 1 1 1 1 1 1 2 2 2 1 1 1 1 1 1 1 1 1 1 1 1 @@ -223,7 +223,7 @@ -12.2682 -12.2682 - 1.63576 1.63576 + 1.63576 1.63576 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 @@ -250,7 +250,7 @@ -12.2682 -12.2682 - 1.63576 1.63576 + 1.63576 1.63576 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 @@ -286,7 +286,7 @@ -85.8774 -85.8774 - 24.5364 24.5364 + 24.5364 24.5364 999 999 130 140 150 999 999 999 220 230 240 250 260 999