Corrected ace reading to look for the existence of the same locator anywhere in the array instead of just after, and updated the tests.

This commit is contained in:
Adam Nelson 2014-05-20 06:16:49 -04:00
parent 9b68d497a2
commit eef806e608
2 changed files with 4 additions and 4 deletions

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