Merge branch 'master' into refactor

This commit is contained in:
Paul Romano 2013-07-07 21:56:12 -04:00
commit a6bda2c5a6
3 changed files with 6 additions and 3 deletions

View file

@ -560,7 +560,8 @@ contains
end select
! Set new particle direction
p % coord0 % uvw = (/ u, v, w /)
norm = sqrt(u*u + v*v + w*w)
p % coord0 % uvw = [u, v, w] / norm
! Reassign particle's cell and surface
p % coord0 % cell = last_cell

View file

@ -2552,7 +2552,9 @@ contains
! create dictionary entry for both name and alias
call xs_listing_dict % add_key(listing % name, i)
call xs_listing_dict % add_key(listing % alias, i)
if (listing % alias /= '') then
call xs_listing_dict % add_key(listing % alias, i)
end if
end do
end subroutine read_cross_sections_xml

View file

@ -7,7 +7,7 @@
<typedef name="ace_table_xml">
<component name="name" type="word" length="15" />
<component name="alias" type="word" length="15" />
<component name="alias" type="word" length="15" default="''" />
<component name="type" type="word" length="10" default="'neutron'" />
<component name="zaid" type="integer" default="0" />
<component name="metastable" type="integer" default="0" />