Changed all uid's to id's.

This commit is contained in:
Paul Romano 2011-11-02 15:52:47 -04:00
parent b030a369c5
commit de522016f7
36 changed files with 242 additions and 242 deletions

View file

@ -10,13 +10,13 @@
====================================================
-->
<surface uid="1" type="z-cylinder" coeffs="0. 0. 1.27" />
<surface uid="2" type="x-plane" coeffs="-2.54" boundary="reflective" />
<surface uid="3" type="x-plane" coeffs="2.54" boundary="reflective" />
<surface uid="4" type="y-plane" coeffs="-2.54" boundary="reflective" />
<surface uid="5" type="y-plane" coeffs="2.54" boundary="reflective" />
<surface id="1" type="z-cylinder" coeffs="0. 0. 1.27" />
<surface id="2" type="x-plane" coeffs="-2.54" boundary="reflective" />
<surface id="3" type="x-plane" coeffs="2.54" boundary="reflective" />
<surface id="4" type="y-plane" coeffs="-2.54" boundary="reflective" />
<surface id="5" type="y-plane" coeffs="2.54" boundary="reflective" />
<cell uid="1" material="1" surfaces="-1" />
<cell uid="2" material="2" surfaces="1 2 -3 4 -5" />
<cell id="1" material="1" surfaces="-1" />
<cell id="2" material="2" surfaces="1 2 -3 4 -5" />
</geometry>

View file

@ -11,14 +11,14 @@
-->
<!-- Fuel composed of 99.02 a/o U-238 and 0.98 a/o U-235 -->
<material uid="1">
<material id="1">
<density value="18.8" units="g/cc" />
<nuclide name="U-238" xs="03c" ao="99.02" />
<nuclide name="U-235" xs="03c" ao="0.98" />
</material>
<!-- Water at 1 g/cc -->
<material uid="2">
<material id="2">
<density value="1.0" units="g/cc" />
<nuclide name="H-1" xs="03c" ao="2.0" />
<nuclide name="O-16" xs="03c" ao="1.0" />

View file

@ -10,13 +10,13 @@
====================================================
-->
<surface uid="1" type="z-cylinder" coeffs="0. 0. 0.635" />
<surface uid="2" type="x-plane" coeffs="-2.54" boundary="reflective" />
<surface uid="3" type="x-plane" coeffs="2.54" boundary="reflective" />
<surface uid="4" type="y-plane" coeffs="-2.54" boundary="reflective" />
<surface uid="5" type="y-plane" coeffs="2.54" boundary="reflective" />
<surface id="1" type="z-cylinder" coeffs="0. 0. 0.635" />
<surface id="2" type="x-plane" coeffs="-2.54" boundary="reflective" />
<surface id="3" type="x-plane" coeffs="2.54" boundary="reflective" />
<surface id="4" type="y-plane" coeffs="-2.54" boundary="reflective" />
<surface id="5" type="y-plane" coeffs="2.54" boundary="reflective" />
<cell uid="1" material="1" surfaces="-1" />
<cell uid="2" material="2" surfaces="1 2 -3 4 -5" />
<cell id="1" material="1" surfaces="-1" />
<cell id="2" material="2" surfaces="1 2 -3 4 -5" />
</geometry>

View file

@ -11,14 +11,14 @@
-->
<!-- Fuel composed of 96.5 a/o U-238 and 3.5 a/o U-235 -->
<material uid="1">
<material id="1">
<density value="18.8" units="g/cc" />
<nuclide name="U-238" xs="03c" ao="96.5" />
<nuclide name="U-235" xs="03c" ao="3.5" />
</material>
<!-- Water at 1 g/cc -->
<material uid="2">
<material id="2">
<density value="1.0" units="g/cc" />
<nuclide name="H-1" xs="03c" ao="2.0" />
<nuclide name="O-16" xs="03c" ao="1.0" />

View file

@ -10,13 +10,13 @@
====================================================
-->
<surface uid="1" type="z-cylinder" coeffs="0. 0. 0.3175" />
<surface uid="2" type="x-plane" coeffs="-2.54" boundary="reflective" />
<surface uid="3" type="x-plane" coeffs="2.54" boundary="reflective" />
<surface uid="4" type="y-plane" coeffs="-2.54" boundary="reflective" />
<surface uid="5" type="y-plane" coeffs="2.54" boundary="reflective" />
<surface id="1" type="z-cylinder" coeffs="0. 0. 0.3175" />
<surface id="2" type="x-plane" coeffs="-2.54" boundary="reflective" />
<surface id="3" type="x-plane" coeffs="2.54" boundary="reflective" />
<surface id="4" type="y-plane" coeffs="-2.54" boundary="reflective" />
<surface id="5" type="y-plane" coeffs="2.54" boundary="reflective" />
<cell uid="1" material="1" surfaces="-1" />
<cell uid="2" material="2" surfaces="1 2 -3 4 -5" />
<cell id="1" material="1" surfaces="-1" />
<cell id="2" material="2" surfaces="1 2 -3 4 -5" />
</geometry>

View file

@ -11,14 +11,14 @@
-->
<!-- Fuel composed of 30 a/o U-238 and 70 a/o U-235 -->
<material uid="1">
<material id="1">
<density value="18.8" units="g/cc" />
<nuclide name="U-238" xs="03c" ao="30.0" />
<nuclide name="U-235" xs="03c" ao="70.0" />
</material>
<!-- Water at 1 g/cc -->
<material uid="2">
<material id="2">
<density value="1.0" units="g/cc" />
<nuclide name="H-1" xs="03c" ao="2.0" />
<nuclide name="O-16" xs="03c" ao="1.0" />

View file

@ -10,13 +10,13 @@
==========================================
-->
<cell uid="1">
<cell id="1">
<universe>0</universe>
<material>1</material>
<surfaces>-1</surfaces>
</cell>
<surface uid="1">
<surface id="1">
<type>sphere</type>
<coeffs>0. 0. 0. 6.3849</coeffs>
<boundary>vacuum</boundary>

View file

@ -10,7 +10,7 @@
==========================================
-->
<material uid="1">
<material id="1">
<density value="0.04029014" units="atom/b-cm" />
<nuclide name="Pu-239" xs="03c" ao="0.037047" />
<nuclide name="Pu-240" xs="03c" ao="0.0017512" />

View file

@ -10,13 +10,13 @@
==========================================
-->
<cell uid="1">
<cell id="1">
<universe>0</universe>
<material>1</material>
<surfaces>-1</surfaces>
</cell>
<surface uid="1">
<surface id="1">
<type>sphere</type>
<coeffs>0. 0. 0. 6.6595</coeffs>
<boundary>vacuum</boundary>

View file

@ -10,7 +10,7 @@
==========================================
-->
<material uid="1">
<material id="1">
<density value="0.04055292" units="atom/b-cm" />
<nuclide name="Pu-239" xs="03c" ao="0.029934" />
<nuclide name="Pu-240" xs="03c" ao="0.0078754" />

View file

@ -10,22 +10,22 @@
===============================================================
-->
<cell uid="1">
<cell id="1">
<universe>0</universe>
<material>1</material>
<surfaces>-1</surfaces>
</cell>
<cell uid="2">
<cell id="2">
<universe>0</universe>
<material>2</material>
<surfaces>1 -2</surfaces>
</cell>
<surface uid="1">
<surface id="1">
<type>sphere</type>
<coeffs>0. 0. 0. 5.0419</coeffs>
</surface>
<surface uid="2">
<surface id="2">
<type>sphere</type>
<coeffs>0. 0. 0. 9.7409</coeffs>
<boundary>vacuum</boundary>

View file

@ -10,14 +10,14 @@
===============================================================
-->
<material uid="1">
<material id="1">
<density value="0.04070346" units="atom/b-cm" />
<nuclide name="Pu-239" xs="03c" ao="0.037291" />
<nuclide name="Pu-240" xs="03c" ao="0.0019277" />
<nuclide name="Pu-241" xs="03c" ao="0.00012196" />
<nuclide name="Ga-nat" xs="03c" ao="0.0013628" />
</material>
<material uid="2">
<material id="2">
<density value="0.06605308" units="atom/b-cm" />
<nuclide name="W-nat" xs="03c" ao="0.051468" />
<nuclide name="Ni-nat" xs="03c" ao="0.0097124" />

View file

@ -2,14 +2,14 @@
<geometry>
<!-- Definition of Cells -->
<cell uid="1" universe="0" fill="37" surfaces="-2" />
<cell uid="100" universe="37" material="40" surfaces="-1" />
<cell uid="101" universe="37" material="41" surfaces="1" />
<cell uid="2" universe="0" material="41" surfaces = "2 -3" />
<cell id="1" universe="0" fill="37" surfaces="-2" />
<cell id="100" universe="37" material="40" surfaces="-1" />
<cell id="101" universe="37" material="41" surfaces="1" />
<cell id="2" universe="0" material="41" surfaces = "2 -3" />
<!-- Defition of Surfaces -->
<surface uid="1" type="z-cylinder" coeffs="0 0 7" />
<surface uid="2" type="z-cylinder" coeffs="0 0 9" />
<surface uid="3" type="z-cylinder" coeffs="0 0 11" boundary="vacuum" />
<surface id="1" type="z-cylinder" coeffs="0 0 7" />
<surface id="2" type="z-cylinder" coeffs="0 0 9" />
<surface id="3" type="z-cylinder" coeffs="0 0 11" boundary="vacuum" />
</geometry>

View file

@ -2,12 +2,12 @@
<materials>
<!-- Definition of materials -->
<material uid="40">
<material id="40">
<density value="4.5" units="g/cc" />
<nuclide name="U-235" xs="03c" ao="1.0" />
</material>
<material uid="41">
<material id="41">
<density value="1.0" units="g/cc" />
<nuclide name="H-1" xs="03c" ao="2.0" />
<nuclide name="O-16" xs="03c" ao="1.0" />

View file

@ -1,23 +1,23 @@
<?xml version="1.0"?>
<geometry>
<cell uid="1">
<cell id="1">
<universe>0</universe>
<fill>111</fill>
<surfaces>1 -2 3 -4</surfaces>
</cell>
<cell uid="100">
<cell id="100">
<universe>3</universe>
<material>40</material>
<surfaces>-5</surfaces>
</cell>
<cell uid="101">
<cell id="101">
<universe>3</universe>
<material>41</material>
<surfaces>5</surfaces>
</cell>
<lattice uid="111">
<lattice id="111">
<type>rectangular</type>
<dimension>20 20</dimension>
<origin>-10.0 -10.0</origin>
@ -46,11 +46,11 @@
</universes>
</lattice>
<surface uid="1" type="x-plane" coeffs="-9.9" boundary="vacuum" />
<surface uid="2" type="x-plane" coeffs="9.9" boundary="vacuum" />
<surface uid="3" type="y-plane" coeffs="-9.9" boundary="vacuum" />
<surface uid="4" type="y-plane" coeffs="9.9" boundary="vacuum" />
<surface uid="5">
<surface id="1" type="x-plane" coeffs="-9.9" boundary="vacuum" />
<surface id="2" type="x-plane" coeffs="9.9" boundary="vacuum" />
<surface id="3" type="y-plane" coeffs="-9.9" boundary="vacuum" />
<surface id="4" type="y-plane" coeffs="9.9" boundary="vacuum" />
<surface id="5">
<type>z-cylinder</type>
<coeffs>0.0 0.0 0.4</coeffs>
</surface>

View file

@ -2,16 +2,16 @@
<materials>
<!-- Definition of materials -->
<material uid="40">
<material id="40">
<density value="4.5" units="g/cc" />
<nuclide name="U-235" xs="03c" ao="1.0" />
</material>
<material uid="41">
<material id="41">
<density value="1.0" units="g/cc" />
<nuclide name="H-1" xs="03c" ao="2.0" />
<nuclide name="O-16" xs="03c" ao="1.0" />
<sab uid="H-H2O" xs="10t" />
<sab name="lwe7" xs="00t" />
</material>
</materials>

View file

@ -2,18 +2,18 @@
<geometry>
<!-- Definition of Cells -->
<cell uid="1">
<cell id="1">
<universe>0</universe>
<material>1</material>
<surfaces>1 -2 3 -4 5 -6</surfaces>
</cell>
<!-- Defition of Surfaces -->
<surface uid="1" type="x-plane" coeffs="-1" boundary="vacuum" />
<surface uid="2" type="x-plane" coeffs="1" boundary="vacuum" />
<surface uid="3" type="y-plane" coeffs="-1" boundary="reflective" />
<surface uid="4" type="y-plane" coeffs="1" boundary="reflective" />
<surface uid="5" type="z-plane" coeffs="-1" boundary="reflective" />
<surface uid="6" type="z-plane" coeffs="1" boundary="reflective" />
<surface id="1" type="x-plane" coeffs="-1" boundary="vacuum" />
<surface id="2" type="x-plane" coeffs="1" boundary="vacuum" />
<surface id="3" type="y-plane" coeffs="-1" boundary="reflective" />
<surface id="4" type="y-plane" coeffs="1" boundary="reflective" />
<surface id="5" type="z-plane" coeffs="-1" boundary="reflective" />
<surface id="6" type="z-plane" coeffs="1" boundary="reflective" />
</geometry>

View file

@ -2,7 +2,7 @@
<materials>
<!-- Definition of materials -->
<material uid="1">
<material id="1">
<density value="4.5" units="g/cc" />
<nuclide name="U-235" xs="03c" ao="1.0" />
</material>

View file

@ -9,7 +9,7 @@ module bank_header
!===============================================================================
type Bank
integer(8) :: uid ! Unique ID
integer(8) :: id ! Unique ID
real(8) :: xyz(3) ! location of bank particle
real(8) :: uvw(3) ! diretional cosines
real(8) :: E ! energy

View file

@ -156,7 +156,7 @@ contains
! Check to make sure S(a,b) table matched a nuclide
if (mat % sab_nuclide == 0) then
message = "S(a,b) table " // trim(mat % sab_name) // " did not match " &
// "any nuclide on material " // trim(int_to_str(mat % uid))
// "any nuclide on material " // trim(int_to_str(mat % id))
call fatal_error()
end if
end if

View file

@ -117,7 +117,7 @@ contains
! set particle attributes
p % cell = univ % cells(i)
p % universe = dict_get_key(universe_dict, univ % uid)
p % universe = dict_get_key(universe_dict, univ % id)
p % material = c % material
exit
elseif (c % type == CELL_FILL) then
@ -153,7 +153,7 @@ contains
exit
else
message = "Could not locate particle in lattice: " &
& // int_to_str(lat % uid)
& // int_to_str(lat % id)
call fatal_error()
end if
end if
@ -197,7 +197,7 @@ contains
surf => surfaces(abs(p % surface))
if (verbosity >= 10) then
message = " Crossing surface " // trim(int_to_str(surf % uid))
message = " Crossing surface " // trim(int_to_str(surf % id))
call write_message()
end if
@ -220,7 +220,7 @@ contains
! Display message
if (verbosity >= 10) then
message = " Leaked out of surface " // trim(int_to_str(surf % uid))
message = " Leaked out of surface " // trim(int_to_str(surf % id))
call write_message()
end if
return
@ -313,7 +313,7 @@ contains
p % uvw = (/ u, v, w /)
case default
message = "Reflection not supported for surface " // &
trim(int_to_str(surf % uid))
trim(int_to_str(surf % id))
call fatal_error()
end select
@ -330,7 +330,7 @@ contains
! Diagnostic message
if (verbosity >= 10) then
message = " Reflected from surface " // trim(int_to_str(surf%uid))
message = " Reflected from surface " // trim(int_to_str(surf%id))
call write_message()
end if
return
@ -375,7 +375,7 @@ contains
call find_cell(lower_univ, p, found)
if (.not. found) then
message = "Could not locate particle in lattice: " // &
trim(int_to_str(lat % uid))
trim(int_to_str(lat % id))
call fatal_error()
end if
else
@ -422,7 +422,7 @@ contains
call find_cell(lower_univ, p, found)
if (.not. found) then
message = "Could not locate particle in lattice: " // &
trim(int_to_str(lat % uid))
trim(int_to_str(lat % id))
call fatal_error()
end if
else

View file

@ -7,7 +7,7 @@ module geometry_header
!===============================================================================
type Universe
integer :: uid ! Unique ID
integer :: id ! Unique ID
integer :: type ! Type
integer :: level ! Level of universe (0=base)
integer :: n_cells ! # of cells within
@ -24,7 +24,7 @@ module geometry_header
!===============================================================================
type Lattice
integer :: uid ! Universe number for lattice
integer :: id ! Universe number for lattice
integer :: type ! Type of lattice (rectangular, hex, etc)
integer :: level ! Level of lattice
integer :: n_x ! number of lattice cells in x-direction
@ -43,7 +43,7 @@ module geometry_header
!===============================================================================
type Surface
integer :: uid ! Unique ID
integer :: id ! Unique ID
integer :: type ! Type of surface
real(8), allocatable :: coeffs(:) ! Definition of surface
integer, allocatable :: &
@ -57,7 +57,7 @@ module geometry_header
!===============================================================================
type Cell
integer :: uid ! Unique ID
integer :: id ! Unique ID
integer :: type ! Type of cell (normal, universe, lattice)
integer :: universe ! universe # this cell is in
integer :: fill ! universe # filling this cell

View file

@ -212,18 +212,18 @@ contains
! We also need to allocate the cell count lists for each universe. The logic
! for this is a little more convoluted. In universe_dict, the (key,value)
! pairs are the uid of the universe and the index in the array. In
! ucount_dict, it's the uid of the universe and the number of cells.
! pairs are the id of the universe and the index in the array. In
! ucount_dict, it's the id of the universe and the number of cells.
key_list => dict_keys(universe_dict)
do while (associated(key_list))
! find index of universe in universes array
index = key_list%data%value
univ => universes(index)
univ % uid = key_list%data%key
univ % id = key_list%data%key
! check for lowest level universe
if (univ % uid == 0) BASE_UNIVERSE = index
if (univ % id == 0) BASE_UNIVERSE = index
! find cell count for this universe
count = dict_get_key(cells_in_univ_dict, key_list%data%key)
@ -271,7 +271,7 @@ contains
integer :: j ! index over surface list
integer :: k
integer :: index ! index in surfaces/materials array
integer :: uid ! user-specified uid
integer :: id ! user-specified id
type(Cell), pointer :: c => null()
type(Lattice), pointer :: l => null()
type(TallyObject), pointer :: t => null()
@ -282,14 +282,14 @@ contains
c => cells(i)
do j = 1, c % n_surfaces
uid = c % surfaces(j)
if (uid < OP_DIFFERENCE) then
if (dict_has_key(surface_dict, abs(uid))) then
index = dict_get_key(surface_dict, abs(uid))
c % surfaces(j) = sign(index, uid)
id = c % surfaces(j)
if (id < OP_DIFFERENCE) then
if (dict_has_key(surface_dict, abs(id))) then
index = dict_get_key(surface_dict, abs(id))
c % surfaces(j) = sign(index, id)
else
message = "Could not find surface " // trim(int_to_str(abs(uid))) // &
& " specified on cell " // trim(int_to_str(c % uid))
message = "Could not find surface " // trim(int_to_str(abs(id))) // &
& " specified on cell " // trim(int_to_str(c % id))
call fatal_error()
end if
end if
@ -298,39 +298,39 @@ contains
! =======================================================================
! ADJUST UNIVERSE INDEX FOR EACH CELL
uid = c % universe
if (dict_has_key(universe_dict, uid)) then
c % universe = dict_get_key(universe_dict, uid)
id = c % universe
if (dict_has_key(universe_dict, id)) then
c % universe = dict_get_key(universe_dict, id)
else
message = "Could not find universe " // trim(int_to_str(uid)) // &
" specified on cell " // trim(int_to_str(c % uid))
message = "Could not find universe " // trim(int_to_str(id)) // &
" specified on cell " // trim(int_to_str(c % id))
call fatal_error()
end if
! =======================================================================
! ADJUST MATERIAL/FILL POINTERS FOR EACH CELL
uid = c % material
if (uid /= 0) then
if (dict_has_key(material_dict, uid)) then
id = c % material
if (id /= 0) then
if (dict_has_key(material_dict, id)) then
c % type = CELL_NORMAL
c % material = dict_get_key(material_dict, uid)
c % material = dict_get_key(material_dict, id)
else
message = "Could not find material " // trim(int_to_str(uid)) // &
" specified on cell " // trim(int_to_str(c % uid))
message = "Could not find material " // trim(int_to_str(id)) // &
" specified on cell " // trim(int_to_str(c % id))
call fatal_error()
end if
else
uid = c % fill
if (dict_has_key(universe_dict, uid)) then
id = c % fill
if (dict_has_key(universe_dict, id)) then
c % type = CELL_FILL
c % fill = dict_get_key(universe_dict, uid)
elseif (dict_has_key(lattice_dict, uid)) then
c % fill = dict_get_key(universe_dict, id)
elseif (dict_has_key(lattice_dict, id)) then
c % type = CELL_LATTICE
c % fill = dict_get_key(lattice_dict, uid)
c % fill = dict_get_key(lattice_dict, id)
else
message = "Specified fill " // trim(int_to_str(uid)) // " on cell " // &
trim(int_to_str(c % uid)) // " is neither a universe nor a lattice."
message = "Specified fill " // trim(int_to_str(id)) // " on cell " // &
trim(int_to_str(c % id)) // " is neither a universe nor a lattice."
call fatal_error()
end if
end if
@ -343,12 +343,12 @@ contains
l => lattices(i)
do j = 1, l % n_x
do k = 1, l % n_y
uid = l % element(j,k)
if (dict_has_key(universe_dict, uid)) then
l % element(j,k) = dict_get_key(universe_dict, uid)
id = l % element(j,k)
if (dict_has_key(universe_dict, id)) then
l % element(j,k) = dict_get_key(universe_dict, id)
else
message = "Invalid universe number " // trim(int_to_str(uid)) &
// " specified on lattice " // trim(int_to_str(l % uid))
message = "Invalid universe number " // trim(int_to_str(id)) &
// " specified on lattice " // trim(int_to_str(l % id))
call fatal_error()
end if
end do
@ -363,12 +363,12 @@ contains
if (t % n_bins(T_CELL) > 0) then
do j = 1, t % n_bins(T_CELL)
uid = t % cell_bins(j) % scalar
if (dict_has_key(cell_dict, uid)) then
t % cell_bins(j) % scalar = dict_get_key(cell_dict, uid)
id = t % cell_bins(j) % scalar
if (dict_has_key(cell_dict, id)) then
t % cell_bins(j) % scalar = dict_get_key(cell_dict, id)
else
message = "Could not find cell " // trim(int_to_str(uid)) // &
& " specified on tally " // trim(int_to_str(t % uid))
message = "Could not find cell " // trim(int_to_str(id)) // &
& " specified on tally " // trim(int_to_str(t % id))
call fatal_error()
end if
end do
@ -379,12 +379,12 @@ contains
if (t % n_bins(T_SURFACE) > 0) then
do j = 1, t % n_bins(T_SURFACE)
uid = t % surface_bins(j) % scalar
if (dict_has_key(surface_dict, uid)) then
t % surface_bins(j) % scalar = dict_get_key(surface_dict, uid)
id = t % surface_bins(j) % scalar
if (dict_has_key(surface_dict, id)) then
t % surface_bins(j) % scalar = dict_get_key(surface_dict, id)
else
message = "Could not find surface " // trim(int_to_str(uid)) // &
& " specified on tally " // trim(int_to_str(t % uid))
message = "Could not find surface " // trim(int_to_str(id)) // &
& " specified on tally " // trim(int_to_str(t % id))
call fatal_error()
end if
end do
@ -395,12 +395,12 @@ contains
if (t % n_bins(T_UNIVERSE) > 0) then
do j = 1, t % n_bins(T_UNIVERSE)
uid = t % universe_bins(j) % scalar
if (dict_has_key(universe_dict, uid)) then
t % universe_bins(j) % scalar = dict_get_key(universe_dict, uid)
id = t % universe_bins(j) % scalar
if (dict_has_key(universe_dict, id)) then
t % universe_bins(j) % scalar = dict_get_key(universe_dict, id)
else
message = "Could not find universe " // trim(int_to_str(uid)) // &
& " specified on tally " // trim(int_to_str(t % uid))
message = "Could not find universe " // trim(int_to_str(id)) // &
& " specified on tally " // trim(int_to_str(t % id))
call fatal_error()
end if
end do
@ -411,12 +411,12 @@ contains
if (t % n_bins(T_MATERIAL) > 0) then
do j = 1, t % n_bins(T_MATERIAL)
uid = t % material_bins(j) % scalar
if (dict_has_key(material_dict, uid)) then
t % material_bins(j) % scalar = dict_get_key(material_dict, uid)
id = t % material_bins(j) % scalar
if (dict_has_key(material_dict, id)) then
t % material_bins(j) % scalar = dict_get_key(material_dict, id)
else
message = "Could not find material " // trim(int_to_str(uid)) // &
& " specified on tally " // trim(int_to_str(t % uid))
message = "Could not find material " // trim(int_to_str(id)) // &
& " specified on tally " // trim(int_to_str(t % id))
call fatal_error()
end if
end do
@ -427,12 +427,12 @@ contains
if (t % n_bins(T_CELLBORN) > 0) then
do j = 1, t % n_bins(T_CELLBORN)
uid = t % cellborn_bins(j) % scalar
if (dict_has_key(cell_dict, uid)) then
t % cellborn_bins(j) % scalar = dict_get_key(cell_dict, uid)
id = t % cellborn_bins(j) % scalar
if (dict_has_key(cell_dict, id)) then
t % cellborn_bins(j) % scalar = dict_get_key(cell_dict, id)
else
message = "Could not find material " // trim(int_to_str(uid)) // &
& " specified on tally " // trim(int_to_str(t % uid))
message = "Could not find material " // trim(int_to_str(id)) // &
& " specified on tally " // trim(int_to_str(t % id))
call fatal_error()
end if
end do
@ -442,12 +442,12 @@ contains
! ADJUST MESH INDICES FOR EACH TALLY
if (t % n_bins(T_MESH) > 0) then
uid = t % mesh
if (dict_has_key(mesh_dict, uid)) then
t % mesh = dict_get_key(mesh_dict, uid)
id = t % mesh
if (dict_has_key(mesh_dict, id)) then
t % mesh = dict_get_key(mesh_dict, id)
else
message = "Could not find mesh " // trim(int_to_str(uid)) // &
& " specified on tally " // trim(int_to_str(t % uid))
message = "Could not find mesh " // trim(int_to_str(id)) // &
& " specified on tally " // trim(int_to_str(t % id))
call fatal_error()
end if
end if
@ -543,7 +543,7 @@ contains
if (.not. (all(mat%atom_percent > ZERO) .or. &
& all(mat%atom_percent < ZERO))) then
message = "Cannot mix atom and weight percents in material " // &
& int_to_str(mat%uid)
& int_to_str(mat % id)
call fatal_error()
end if

View file

@ -165,7 +165,7 @@ contains
c => cells(i)
! Copy data into cells
c % uid = cell_(i) % uid
c % id = cell_(i) % id
c % universe = cell_(i) % universe
c % material = cell_(i) % material
c % fill = cell_(i) % fill
@ -173,7 +173,7 @@ contains
! Check to make sure that either material or fill was specified
if (c % material == 0 .and. c % fill == 0) then
message = "Neither material nor fill was specified for cell " // &
trim(int_to_str(c % uid))
trim(int_to_str(c % id))
call fatal_error()
end if
@ -187,7 +187,7 @@ contains
! Check to make sure that surfaces were specified
if (.not. associated(cell_(i) % surfaces)) then
message = "No surfaces specified for cell " // &
trim(int_to_str(c % uid))
trim(int_to_str(c % id))
call fatal_error()
end if
@ -198,7 +198,7 @@ contains
c % surfaces = cell_(i) % surfaces
! Add cell to dictionary
call dict_add_key(cell_dict, c % uid, i)
call dict_add_key(cell_dict, c % id, i)
! For cells, we also need to check if there's a new universe --
! also for every cell add 1 to the count of cells for the
@ -226,7 +226,7 @@ contains
s => surfaces(i)
! Copy data into cells
s % uid = surface_(i) % uid
s % id = surface_(i) % id
! Copy and interpret surface type
word = surface_(i) % type
@ -283,12 +283,12 @@ contains
n = size(surface_(i) % coeffs)
if (n < coeffs_reqd) then
message = "Not enough coefficients specified for surface: " // &
trim(int_to_str(s % uid))
trim(int_to_str(s % id))
print *, n, coeffs_reqd
call fatal_error()
elseif (n > coeffs_reqd) then
message = "Too many coefficients specified for surface: " // &
trim(int_to_str(s % uid))
trim(int_to_str(s % id))
call fatal_error()
else
allocate(s % coeffs(n))
@ -309,12 +309,12 @@ contains
s % bc = BC_PERIODIC
case default
message = "Unknown boundary condition '" // trim(word) // &
"' specified on surface " // trim(int_to_str(s % uid))
"' specified on surface " // trim(int_to_str(s % id))
call fatal_error()
end select
! Add surface to dictionary
call dict_add_key(surface_dict, s % uid, i)
call dict_add_key(surface_dict, s % id, i)
end do
@ -328,8 +328,8 @@ contains
do i = 1, n_lattices
l => lattices(i)
! UID of lattice
l % uid = lattice_(i) % uid
! ID of lattice
l % id = lattice_(i) % id
! Read lattice type
word = lattice_(i) % type
@ -382,7 +382,7 @@ contains
end do
! Add lattice to dictionary
call dict_add_key(lattice_dict, l % uid, i)
call dict_add_key(lattice_dict, l % id, i)
end do
@ -430,8 +430,8 @@ contains
do i = 1, n_materials
m => materials(i)
! Copy material uid
m % uid = material_(i) % uid
! Copy material id
m % id = material_(i) % id
! Copy density -- the default value for the units is given in the
! material_t.xml file and doesn't need to be specified here, hence case
@ -450,14 +450,14 @@ contains
m % density = 1.0e-24 * val
case default
message = "Unkwown units '" // trim(material_(i) % density % units) &
// "' specified on material " // trim(int_to_str(m % uid))
// "' specified on material " // trim(int_to_str(m % id))
call fatal_error()
end select
! Check to ensure material has at least one nuclide
if (.not. associated(material_(i) % nuclides)) then
message = "No nuclides specified on material " // &
trim(int_to_str(m % uid))
trim(int_to_str(m % id))
call fatal_error()
end if
@ -508,7 +508,7 @@ contains
end do
! Add material to dictionary
call dict_add_key(material_dict, m % uid, i)
call dict_add_key(material_dict, m % id, i)
end do
@ -525,7 +525,7 @@ contains
integer :: i ! loop over user-specified tallies
integer :: j ! loop over words
integer :: uid ! user-specified identifier
integer :: id ! user-specified identifier
integer :: index ! index in meshes array
integer :: n ! size of arrays in mesh specification
integer :: n_words ! number of words read
@ -579,8 +579,8 @@ contains
do i = 1, n_meshes
m => meshes(i)
! copy mesh uid
m % uid = mesh_(i) % id
! copy mesh id
m % id = mesh_(i) % id
! Read mesh type
word = mesh_(i) % type
@ -628,7 +628,7 @@ contains
m % width = mesh_(i) % width
! Add mesh to dictionary
call dict_add_key(mesh_dict, m % uid, i)
call dict_add_key(mesh_dict, m % id, i)
end do
! ==========================================================================
@ -645,14 +645,14 @@ contains
t % n_bins = 0
t % stride = 0
! Copy material uid
t % uid = tally_(i) % id
! Copy material id
t % id = tally_(i) % id
! Check to make sure that both cells and surfaces were not specified
if (len_trim(tally_(i) % filters % cell) > 0 .and. &
len_trim(tally_(i) % filters % surface) > 0) then
message = "Cannot specify both cell and surface filters for tally " &
// trim(int_to_str(t % uid))
// trim(int_to_str(t % id))
call fatal_error()
end if
@ -702,13 +702,13 @@ contains
t % mesh = tally_(i) % filters % mesh
if (t % mesh > 0) then
! Determine index in mesh array for this bin
uid = t % mesh
if (dict_has_key(mesh_dict, uid)) then
index = dict_get_key(mesh_dict, uid)
id = t % mesh
if (dict_has_key(mesh_dict, id)) then
index = dict_get_key(mesh_dict, id)
m => meshes(index)
else
message = "Could not find mesh " // trim(int_to_str(uid)) // &
" specified on tally " // trim(int_to_str(t % uid))
message = "Could not find mesh " // trim(int_to_str(id)) // &
" specified on tally " // trim(int_to_str(t % id))
call fatal_error()
end if
@ -826,8 +826,8 @@ contains
t % n_bins(T_MESH) = t % n_bins(T_MESH) - product(m % dimension)
! Get pointer to mesh
uid = t % mesh
index = dict_get_key(mesh_dict, uid)
id = t % mesh
index = dict_get_key(mesh_dict, id)
m => meshes(index)
! We need to increase the dimension by one since we also need

View file

@ -87,7 +87,7 @@ contains
end if
! set random number seed
i_particle = (i_cycle-1)*n_particles + p % uid
i_particle = (i_cycle-1)*n_particles + p % id
call RN_init_particle(i_particle)
! transport particle

View file

@ -7,7 +7,7 @@ module material_header
!===============================================================================
type Material
integer :: uid ! unique identifier
integer :: id ! unique identifier
integer :: n_nuclides ! number of nuclides
character(10), allocatable :: names(:) ! isotope names
integer, allocatable :: xs_listing(:) ! index in xs_listings list

View file

@ -8,7 +8,7 @@ module mesh_header
!===============================================================================
type StructuredMesh
integer :: uid
integer :: id
integer :: type
integer :: n_dimension
integer, allocatable :: dimension(:)

View file

@ -68,7 +68,7 @@ contains
end if
! Determine displacements for MPI_BANK type
call MPI_GET_ADDRESS(b % uid, bank_disp(1), ierr)
call MPI_GET_ADDRESS(b % id, bank_disp(1), ierr)
call MPI_GET_ADDRESS(b % xyz, bank_disp(2), ierr)
call MPI_GET_ADDRESS(b % uvw, bank_disp(3), ierr)
call MPI_GET_ADDRESS(b % E, bank_disp(4), ierr)
@ -112,7 +112,7 @@ contains
integer(8) :: finish ! ending index in local fission bank
integer(8) :: total ! total sites in global fission bank
integer(8) :: count ! index for source bank
integer(8) :: index ! index for uid -- accounts for all nodes
integer(8) :: index ! index for id -- accounts for all nodes
integer :: send_to_left ! # of bank sites to send/recv to or from left
integer :: send_to_right ! # of bank sites to send/recv to or from right
integer(8) :: sites_needed ! # of sites to be sampled
@ -169,7 +169,7 @@ contains
allocate(temp_sites(2*work))
count = 0_8 ! Index for local source_bank
index = 0_8 ! Index for global source uid -- must account for all nodes
index = 0_8 ! Index for global source id -- must account for all nodes
if (total < n_particles) then
sites_needed = mod(n_particles,total)

View file

@ -231,13 +231,13 @@ contains
select case (p % type)
case (NEUTRON)
write(ou,*) 'Neutron ' // int_to_str(p % uid)
write(ou,*) 'Neutron ' // int_to_str(p % id)
case (PHOTON)
write(ou,*) 'Photon ' // int_to_str(p % uid)
write(ou,*) 'Photon ' // int_to_str(p % id)
case (ELECTRON)
write(ou,*) 'Electron ' // int_to_str(p % uid)
write(ou,*) 'Electron ' // int_to_str(p % id)
case default
write(ou,*) 'Unknown Particle ' // int_to_str(p % uid)
write(ou,*) 'Unknown Particle ' // int_to_str(p % id)
end select
write(ou,*) ' x = ' // real_to_str(p % xyz(1))
write(ou,*) ' y = ' // real_to_str(p % xyz(2))
@ -257,20 +257,20 @@ contains
if (p % cell > 0) then
c => cells(p % cell)
write(ou,*) ' Cell = ' // int_to_str(c % uid)
write(ou,*) ' Cell = ' // int_to_str(c % id)
else
write(ou,*) ' Cell not determined'
end if
if (p % surface > 0) then
s => surfaces(p % surface)
write(ou,*) ' Surface = ' // int_to_str(s % uid)
write(ou,*) ' Surface = ' // int_to_str(s % id)
else
write(ou,*) ' Surface = None'
end if
u => universes(p % universe)
write(ou,*) ' Universe = ' // int_to_str(u % uid)
write(ou,*) ' Universe = ' // int_to_str(u % id)
write(ou,*)
nullify(c)
@ -314,26 +314,26 @@ contains
type(Lattice), pointer :: l => null()
type(Material), pointer :: m => null()
write(ou,*) 'Cell ' // int_to_str(c % uid)
temp = dict_get_key(cell_dict, c % uid)
write(ou,*) 'Cell ' // int_to_str(c % id)
temp = dict_get_key(cell_dict, c % id)
write(ou,*) ' Array Index = ' // int_to_str(temp)
u => universes(c % universe)
write(ou,*) ' Universe = ' // int_to_str(u % uid)
write(ou,*) ' Universe = ' // int_to_str(u % id)
select case (c % type)
case (CELL_NORMAL)
write(ou,*) ' Fill = NONE'
case (CELL_FILL)
u => universes(c % fill)
write(ou,*) ' Fill = Universe ' // int_to_str(u % uid)
write(ou,*) ' Fill = Universe ' // int_to_str(u % id)
case (CELL_LATTICE)
l => lattices(c % fill)
write(ou,*) ' Fill = Lattice ' // int_to_str(l % uid)
write(ou,*) ' Fill = Lattice ' // int_to_str(l % id)
end select
if (c % material == 0) then
write(ou,*) ' Material = NONE'
else
m => materials(c % material)
write(ou,*) ' Material = ' // int_to_str(m % uid)
write(ou,*) ' Material = ' // int_to_str(m % id)
end if
write(ou,*) ' Parent Cell = ' // int_to_str(c % parent)
string = ""
@ -372,12 +372,12 @@ contains
character(MAX_LINE_LEN) :: string
type(Cell), pointer :: c => null()
write(ou,*) 'Universe ' // int_to_str(univ % uid)
write(ou,*) 'Universe ' // int_to_str(univ % id)
write(ou,*) ' Level = ' // int_to_str(univ % level)
string = ""
do i = 1, univ % n_cells
c => cells(univ % cells(i))
string = trim(string) // ' ' // int_to_str(c % uid)
string = trim(string) // ' ' // int_to_str(c % id)
end do
write(ou,*) ' Cells =' // trim(string)
write(ou,*)
@ -394,7 +394,7 @@ contains
type(Lattice), pointer :: lat
write(ou,*) 'Lattice ' // int_to_str(lat % uid)
write(ou,*) 'Lattice ' // int_to_str(lat % id)
write(ou,*) ' n_x = ' // int_to_str(lat % n_x)
write(ou,*) ' n_y = ' // int_to_str(lat % n_y)
write(ou,*) ' x0 = ' // real_to_str(lat % x0)
@ -416,7 +416,7 @@ contains
integer :: i
character(MAX_LINE_LEN) :: string
write(ou,*) 'Surface ' // int_to_str(surf % uid)
write(ou,*) 'Surface ' // int_to_str(surf % id)
select case (surf % type)
case (SURF_PX)
string = "X Plane"
@ -492,7 +492,7 @@ contains
type(Nuclide), pointer :: nuc => null()
! Write identifier for material
write(ou,*) 'Material ' // int_to_str(mat % uid)
write(ou,*) 'Material ' // int_to_str(mat % id)
! Write total atom density in atom/b-cm
write(ou,*) ' Atom Density = ' // trim(real_to_str(mat % density)) &
@ -527,7 +527,7 @@ contains
type(TallyObject), pointer :: t
integer :: i
integer :: uid
integer :: id
character(MAX_LINE_LEN) :: string
type(Cell), pointer :: c => null()
type(Surface), pointer :: s => null()
@ -535,14 +535,14 @@ contains
type(Material), pointer :: m => null()
type(StructuredMesh), pointer :: sm => null()
write(ou,*) 'Tally ' // int_to_str(t % uid)
write(ou,*) 'Tally ' // int_to_str(t % id)
if (t % n_bins(T_CELL) > 0) then
string = ""
do i = 1, t % n_bins(T_CELL)
uid = t % cell_bins(i) % scalar
c => cells(uid)
string = trim(string) // ' ' // trim(int_to_str(c % uid))
id = t % cell_bins(i) % scalar
c => cells(id)
string = trim(string) // ' ' // trim(int_to_str(c % id))
end do
write(ou, *) ' Cell Bins:' // trim(string)
end if
@ -550,9 +550,9 @@ contains
if (t % n_bins(T_SURFACE) > 0) then
string = ""
do i = 1, t % n_bins(T_SURFACE)
uid = t % surface_bins(i) % scalar
s => surfaces(uid)
string = trim(string) // ' ' // trim(int_to_str(s % uid))
id = t % surface_bins(i) % scalar
s => surfaces(id)
string = trim(string) // ' ' // trim(int_to_str(s % id))
end do
write(ou, *) ' Surface Bins:' // trim(string)
end if
@ -560,9 +560,9 @@ contains
if (t % n_bins(T_UNIVERSE) > 0) then
string = ""
do i = 1, t % n_bins(T_UNIVERSE)
uid = t % universe_bins(i) % scalar
u => universes(uid)
string = trim(string) // ' ' // trim(int_to_str(u % uid))
id = t % universe_bins(i) % scalar
u => universes(id)
string = trim(string) // ' ' // trim(int_to_str(u % id))
end do
write(ou, *) ' Material Bins:' // trim(string)
end if
@ -570,17 +570,17 @@ contains
if (t % n_bins(T_MATERIAL) > 0) then
string = ""
do i = 1, t % n_bins(T_MATERIAL)
uid = t % material_bins(i) % scalar
m => materials(uid)
string = trim(string) // ' ' // trim(int_to_str(m % uid))
id = t % material_bins(i) % scalar
m => materials(id)
string = trim(string) // ' ' // trim(int_to_str(m % id))
end do
write(ou, *) ' Material Bins:' // trim(string)
end if
if (t % n_bins(T_MESH) > 0) then
string = ""
uid = t % mesh
sm => meshes(uid)
id = t % mesh
sm => meshes(id)
string = trim(string) // ' ' // trim(int_to_str(sm % dimension(1)))
do i = 2, sm % n_dimension
string = trim(string) // ' x ' // trim(int_to_str(sm % dimension(i)))
@ -591,9 +591,9 @@ contains
if (t % n_bins(T_CELLBORN) > 0) then
string = ""
do i = 1, t % n_bins(T_CELLBORN)
uid = t % cellborn_bins(i) % scalar
c => cells(uid)
string = trim(string) // ' ' // trim(int_to_str(c % uid))
id = t % cellborn_bins(i) % scalar
c => cells(id)
string = trim(string) // ' ' // trim(int_to_str(c % id))
end do
write(ou, *) ' Birth Region Bins:' // trim(string)
end if

View file

@ -11,7 +11,7 @@ module particle_header
type Particle
! Basic data
integer(8) :: uid ! Unique ID
integer(8) :: id ! Unique ID
integer :: type ! Particle type (n, p, e, etc)
! Physical data

View file

@ -54,12 +54,12 @@ contains
end if
if (verbosity >= 9) then
message = "Simulating Particle " // trim(int_to_str(p % uid))
message = "Simulating Particle " // trim(int_to_str(p % id))
call write_message()
end if
if (verbosity >= 10) then
message = " Born in cell " // trim(int_to_str(cells(p%cell)%uid))
message = " Born in cell " // trim(int_to_str(cells(p%cell)%id))
call write_message()
end if
@ -637,7 +637,7 @@ contains
if (i > nuc % n_reaction) then
message = "Did not sample any reaction for nuclide " // &
trim(nuc % name) // " on material " // &
trim(int_to_str(mat % uid))
trim(int_to_str(mat % id))
call fatal_error()
end if
@ -1076,7 +1076,7 @@ contains
if (nu == 0 .or. n_bank == 3*n_particles) return
do i = n_bank + 1, min(n_bank + nu, 3*n_particles)
! Bank source neutrons by copying particle data
fission_bank(i) % uid = p % uid
fission_bank(i) % id = p % id
fission_bank(i) % xyz = p % xyz
! sample cosine of angle

View file

@ -51,7 +51,7 @@ contains
! Initialize first cycle source bank
do i = 0, n_procs - 1
if (rank == i) then
! UID's of first and last source particles
! ID's of first and last source particles
bank_first = i*maxwork + 1
bank_last = min((i+1)*maxwork, n_particles)
@ -66,7 +66,7 @@ contains
! sample position
r = (/ (rang(), k = 1,3) /)
p % uid = j
p % id = j
p % xyz = p_min + r*(p_max - p_min)
p % xyz_local = p % xyz
p % last_xyz = p % xyz
@ -120,8 +120,8 @@ contains
! point to next source particle
p => source_bank(source_index)
! set uid
p % uid = bank_first + source_index - 1
! set id
p % id = bank_first + source_index - 1
end function get_source_particle

View file

@ -989,7 +989,7 @@ contains
t => tallies(i)
! Write header block
call header("TALLY " // trim(int_to_str(t % uid)), 3, UNIT_TALLY)
call header("TALLY " // trim(int_to_str(t % id)), 3, UNIT_TALLY)
! Handle surface current tallies separately
if (t % surface_current) then
@ -1221,19 +1221,19 @@ contains
select case(filter_type)
case (T_UNIVERSE)
index = t % universe_bins(bin) % scalar
label = int_to_str(universes(index) % uid)
label = int_to_str(universes(index) % id)
case (T_MATERIAL)
index = t % material_bins(bin) % scalar
label = int_to_str(materials(index) % uid)
label = int_to_str(materials(index) % id)
case (T_CELL)
index = t % cell_bins(bin) % scalar
label = int_to_str(cells(index) % uid)
label = int_to_str(cells(index) % id)
case (T_CELLBORN)
index = t % cellborn_bins(bin) % scalar
label = int_to_str(cells(index) % uid)
label = int_to_str(cells(index) % id)
case (T_SURFACE)
index = t % surface_bins(bin) % scalar
label = int_to_str(surfaces(index) % uid)
label = int_to_str(surfaces(index) % id)
case (T_MESH)
m => meshes(t % mesh)
allocate(ijk(m % n_dimension))

View file

@ -58,7 +58,7 @@ module tally_header
type TallyObject
! Basic data
integer :: uid
integer :: id
integer :: type
real(8) :: volume
logical :: surface_current = .false.

View file

@ -6,7 +6,7 @@
<options rootname="geometry" />
<typedef name="cell_xml">
<component name="uid" type="integer" />
<component name="id" type="integer" />
<component name="universe" type="integer" default="0" />
<component name="material" type="integer" default="0" />
<component name="fill" type="integer" default="0" />
@ -14,14 +14,14 @@
</typedef>
<typedef name="surface_xml">
<component name="uid" type="integer" />
<component name="id" type="integer" />
<component name="type" type="word" length="15" />
<component name="coeffs" type="double-array" />
<component name="boundary" type="word" length="12" default="'transmit'" />
</typedef>
<typedef name="lattice_xml">
<component name="uid" type="integer" />
<component name="id" type="integer" />
<component name="type" type="word" length="12" />
<component name="dimension" type="integer-array" />
<component name="origin" type="double-array" />

View file

@ -31,7 +31,7 @@
<!-- Type for specifying a material -->
<typedef name="material_xml">
<component name="uid" type="integer" />
<component name="id" type="integer" />
<component name="density" type="density_xml" />
<component name="nuclides" tag="nuclide" type="nuclide_xml" dimension="1" />
<component name="sab" type="sab_xml" dimension="1" />