From eef806e608c880c8b77fd1b61a390587e37da97c Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Tue, 20 May 2014 06:16:49 -0400 Subject: [PATCH] Corrected ace reading to look for the existence of the same locator anywhere in the array instead of just after, and updated the tests. --- src/ace.F90 | 6 +++--- tests/test_source_file/results_true.dat | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ace.F90 b/src/ace.F90 index 0c1d519d3a..d414e21f89 100644 --- a/src/ace.F90 +++ b/src/ace.F90 @@ -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 diff --git a/tests/test_source_file/results_true.dat b/tests/test_source_file/results_true.dat index d714d0bd43..eb3139f582 100644 --- a/tests/test_source_file/results_true.dat +++ b/tests/test_source_file/results_true.dat @@ -1,2 +1,2 @@ k-combined: -3.013216E-01 2.768871E-03 +3.037843E-01 4.395619E-03