Merge branch 'develop' into python3

This commit is contained in:
Paul Romano 2014-08-05 23:02:24 -04:00
commit 3f0f68b4de

View file

@ -1644,8 +1644,8 @@ contains
! Check to make sure either all atom percents or all weight percents are
! given
if (.not. (all(mat % atom_density > ZERO) .or. &
all(mat % atom_density < ZERO))) then
if (.not. (all(mat % atom_density >= ZERO) .or. &
all(mat % atom_density <= ZERO))) then
message = "Cannot mix atom and weight percents in material " // &
to_str(mat % id)
call fatal_error()