Skip to content

Commit c445446

Browse files
author
Dilawar Singh
committed
All tests passing locally with both GSL and BOOST.
1 parent 66bca57 commit c445446

File tree

2 files changed

+26
-22
lines changed

2 files changed

+26
-22
lines changed

builtins/Function.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -578,9 +578,9 @@ double Function::getDerivative() const
578578

579579
void Function::setNumVar(const unsigned int num)
580580
{
581+
//cerr << "Deprecated: numVar has no effect. MOOSE can infer number of variables "
582+
// " from the expression. " << endl;
581583
numVar_ = num;
582-
cerr << "Deprecated: numVar has no effect. MOOSE can infer number of variables "
583-
" from the expression. " << endl;
584584
}
585585

586586
unsigned int Function::getNumVar() const

tests/py_rdesigneur/test_72_CICR.py

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,26 @@
2222

2323
sdir_ = os.path.dirname(os.path.realpath(__file__))
2424

25-
E = (np.array([1.090e-07, 7.281e-13, 2.754e-08, 4.094e-01, 5.138e-04, 5.044e-04,
26-
5.185e-04, 5.203e-04, 5.203e-04, 5.203e-04, 5.203e-04, 5.203e-04,
27-
5.203e-04, 5.203e-04, 5.138e-04, 5.044e-04, 5.185e-04, 5.203e-04,
28-
5.203e-04, 5.203e-04, 5.203e-04, 5.203e-04, 5.203e-04, 5.203e-04,
29-
4.033e-01, 4.046e-01, 4.038e-01, 4.039e-01, 4.039e-01, 4.039e-01,
30-
4.039e-01, 4.039e-01, 4.039e-01, 4.039e-01, 1.081e-06, 1.037e-06,
31-
1.046e-06, 1.050e-06, 1.050e-06, 1.050e-06, 1.050e-06, 1.050e-06,
32-
1.050e-06, 1.050e-06]),
33-
np.array([2.648e-06, 3.539e-12, 1.063e-07, 2.596e-05, 1.508e-03, 1.444e-03,
34-
1.465e-03, 1.464e-03, 1.464e-03, 1.464e-03, 1.464e-03, 1.464e-03,
35-
1.464e-03, 1.464e-03, 1.508e-03, 1.444e-03, 1.465e-03, 1.464e-03,
36-
1.464e-03, 1.464e-03, 1.464e-03, 1.464e-03, 1.464e-03, 1.464e-03,
37-
1.268e-02, 1.160e-02, 1.193e-02, 1.201e-02, 1.201e-02, 1.201e-02,
38-
1.201e-02, 1.201e-02, 1.201e-02, 1.201e-02, 2.116e-06, 2.063e-06,
39-
2.081e-06, 2.086e-06, 2.086e-06, 2.086e-06, 2.086e-06, 2.086e-06,
40-
2.086e-06, 2.086e-06]))
41-
42-
25+
E = (np.array([
26+
1.090e-07, 7.281e-13, 2.754e-08, 4.094e-01, 1.733e-05, 1.733e-05,
27+
1.733e-05, 1.733e-05, 1.733e-05, 1.733e-05, 1.733e-05, 1.733e-05,
28+
1.733e-05, 1.733e-05, 1.733e-05, 1.733e-05, 1.733e-05, 1.733e-05,
29+
1.733e-05, 1.733e-05, 1.733e-05, 1.733e-05, 1.733e-05, 1.733e-05,
30+
4.089e-01, 4.089e-01, 4.089e-01, 4.089e-01, 4.089e-01, 4.089e-01,
31+
4.089e-01, 4.089e-01, 4.089e-01, 4.089e-01, 0.000e+00, 0.000e+00,
32+
0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00,
33+
0.000e+00, 0.000e+00
34+
]),
35+
np.array([
36+
2.648e-06, 3.539e-12, 1.063e-07, 2.596e-05, 2.022e-06, 2.024e-06,
37+
2.024e-06, 2.024e-06, 2.024e-06, 2.024e-06, 2.024e-06, 2.024e-06,
38+
2.024e-06, 2.024e-06, 2.022e-06, 2.024e-06, 2.024e-06, 2.024e-06,
39+
2.024e-06, 2.024e-06, 2.024e-06, 2.024e-06, 2.024e-06, 2.024e-06,
40+
2.403e-05, 2.292e-05, 2.291e-05, 2.291e-05, 2.291e-05, 2.291e-05,
41+
2.291e-05, 2.291e-05, 2.291e-05, 2.291e-05, 0.000e+00, 0.000e+00,
42+
0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00, 0.000e+00,
43+
0.000e+00, 0.000e+00
44+
]))
4345

4446

4547
def test():
@@ -76,10 +78,12 @@ def test():
7678
moose.start(20)
7779
data = [t.vector for t in moose.wildcardFind('/##[TYPE=Table2]')]
7880
m, s = np.mean(data, axis=1), np.std(data, axis=1)
81+
# print(np.array_repr(m))
82+
# print(np.array_repr(s))
7983
# In multithreaded mode, the numers are not exactly the same as in
8084
# expected.
81-
assert np.allclose(m, E[0], rtol=1e-3), (m, E[0])
82-
assert np.allclose(s, E[1], rtol=1e-3), (s, E[1])
85+
assert np.allclose(m, E[0], rtol=1e-3), (m, E[0])
86+
assert np.allclose(s, E[1], rtol=1e-3), (s, E[1])
8387
print('done')
8488

8589

0 commit comments

Comments
 (0)