Merge remote-tracking branch 'walshjon/iso-lab' into iso-lab

This commit is contained in:
Will Boyd 2015-04-27 00:14:47 -04:00
commit 6a17930ed4
2 changed files with 9 additions and 8 deletions

View file

@ -1737,14 +1737,15 @@ contains
end if
! Check enforced isotropic lab scattering
if (check_for_node(node_nuc, "lab")) then
call get_node_value(node_nuc, "lab", temp_str)
if (trim(adjustl(to_lower(temp_str))) == "true") then
if (check_for_node(node_nuc, "scattering")) then
call get_node_value(node_nuc, "scattering", temp_str)
if (trim(adjustl(to_lower(temp_str))) == "lab") then
call list_iso_lab % append(.true.)
else if (trim(adjustl(to_lower(temp_str))) == "false") then
else if (trim(adjustl(to_lower(temp_str))) == "ace") then
call list_iso_lab % append(.false.)
else
call fatal_error("Isotropic lab scattering must be true or false")
call fatal_error("Scattering must be isotropic in lab or follow&
& the ACE file data")
end if
else
call list_iso_lab % append(.false.)

View file

@ -337,8 +337,8 @@ contains
if (micro_xs(i_nuclide) % index_sab /= NONE) then
if (materials(p % material) % p0(i_nuc_mat)) &
& call fatal_error("thermal scattering law data and isotropic lab&
& scattering specified for the same nuclide")
call fatal_error("thermal scattering law data and isotropic lab&
& scattering specified for the same nuclide")
! S(a,b) scattering
call sab_scatter(i_nuclide, micro_xs(i_nuclide) % index_sab, &
@ -351,7 +351,7 @@ contains
! Perform collision physics for elastic scattering
call elastic_scatter(i_nuclide, rxn, &
p % E, p % coord0 % uvw, p % mu, p % wgt, &
& materials(p % material) % p0(i_nuc_mat))
materials(p % material) % p0(i_nuc_mat))
end if
p % event_MT = ELASTIC