crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-27 21:55:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fixed typo and moved a section of code in input_xml.F90

Browse source
This commit is contained in:
Sam Shaner 2016-10-25 21:13:14 -04:00
parent a042ff60ed
commit 8a02b76b96
2 changed files with 26 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
openmc/element.py
View file

@ -230,7 +230,7 @@ class Element(object):
for nuclide in abundances.keys():
abundances[nuclide] /= sum_abundances
# Compute the ratio of the nuclide atomic massess to the element
# Compute the ratio of the nuclide atomic masses to the element
# atomic mass
if percent_type == 'wo':

52
src/input_xml.F90
View file

@ -2348,8 +2348,7 @@ contains
! save name to list
call names % push_back(name)
! Check if no atom/weight percents were specified or if both atom and
! weight percents were specified
! Set density for macroscopic data
if (units == 'macro') then
call densities % push_back(ONE)
else
@ -2372,31 +2371,6 @@ contains
// trim(to_str(mat % id)))
end if
! Check if no atom/weight percents were specified or if both atom and
! weight percents were specified
if (units == 'macro') then
call densities % push_back(ONE)
else
if (.not. check_for_node(node_nuc, "ao") .and. &
.not. check_for_node(node_nuc, "wo")) then
call fatal_error("No atom or weight percent specified for &
&nuclide" // trim(name))
elseif (check_for_node(node_nuc, "ao") .and. &
check_for_node(node_nuc, "wo")) then
call fatal_error("Cannot specify both atom and weight percents &
&for a nuclide: " // trim(name))
end if
! Copy atom/weight percents
if (check_for_node(node_nuc, "ao")) then
call get_node_value(node_nuc, "ao", temp_dble)
call densities % push_back(temp_dble)
else
call get_node_value(node_nuc, "wo", temp_dble)
call densities % push_back(-temp_dble)
end if
end if
! Check enforced isotropic lab scattering
if (run_CE) then
if (check_for_node(node_nuc, "scattering")) then
@ -2421,6 +2395,30 @@ contains
! save name to list
call names % push_back(name)
! Check if no atom/weight percents were specified or if both atom and
! weight percents were specified
if (units == 'macro') then
call densities % push_back(ONE)
else
if (.not. check_for_node(node_nuc, "ao") .and. &
.not. check_for_node(node_nuc, "wo")) then
call fatal_error("No atom or weight percent specified for &
&nuclide" // trim(name))
elseif (check_for_node(node_nuc, "ao") .and. &
check_for_node(node_nuc, "wo")) then
call fatal_error("Cannot specify both atom and weight percents &
&for a nuclide: " // trim(name))
end if
! Copy atom/weight percents
if (check_for_node(node_nuc, "ao")) then
call get_node_value(node_nuc, "ao", temp_dble)
call densities % push_back(temp_dble)
else
call get_node_value(node_nuc, "wo", temp_dble)
call densities % push_back(-temp_dble)
end if
end if
end do INDIVIDUAL_NUCLIDES
end if