Merge branch 'lc_fix' of github.com:nelsonag/openmc into lc_fix

This commit is contained in:
Adam Nelson 2014-05-21 19:40:12 -04:00
commit f766d07d58
3 changed files with 4 additions and 12 deletions

View file

@ -79,14 +79,6 @@ with the :envvar:`CROSS_SECTIONS` environment variable. It is recommended to add
a line in your ``.profile`` or ``.bash_profile`` setting the
:envvar:`CROSS_SECTIONS` environment variable.
ERROR: Invalid usage of L(I) in ACE data; Consider using more recent data set.
******************************************************************************
The cross-sections requested in ``materials.xml`` do not conform to the current
standard format. This typically happens with fissionable nuclides in a ``.6*c``
library as distributed with MCNP. Please try a newer library such as any from
the ``.7*c`` set.
Geometry Debugging
******************

View file

@ -982,7 +982,7 @@ contains
! If this is the case, we should skip incrementing length when it is
! not needed.
if (i < NE) then
if (L(i) == L(i + 1)) then
if (any(L(i) == L(i + 1: NE))) then
! adjust location for this block
j = lc + 2 + 2*NR + NE + i
XSS(j) = XSS(j) - LOCC - lid
@ -1040,7 +1040,7 @@ contains
! If this is the case, we should skip incrementing length when it is
! not needed.
if (i < NE) then
if (L(i) == L(i + 1)) then
if (any(L(i) == L(i + 1: NE))) then
! adjust location for this block
j = lc + 2 + 2*NR + NE + i
XSS(j) = XSS(j) - LOCC - lid
@ -1070,7 +1070,7 @@ contains
! If this is the case, we should skip incrementing length when it is
! not needed.
if (i < NE) then
if (L(i) == L(i + 1)) then
if (any(L(i) == L(i + 1: NE))) then
! adjust locators for energy distribution
j = lc + 2 + 2*NR + NE + i
XSS(j) = XSS(j) - LOCC - lid

View file

@ -1,2 +1,2 @@
k-combined:
3.013216E-01 2.768871E-03
3.037843E-01 4.395619E-03