fix multithreading bug in test

diff --git a/tests/codim_one/error_estimator_02.cc b/tests/codim_one/error_estimator_02.cc
index 79d4a457b969358b9e41c485e469e17f4120e3e8..d4cfb46f98df6e81b92b19694d184d087b45f760 100644 (file)
--- a/tests/codim_one/error_estimator_02.cc
+++ b/tests/codim_one/error_estimator_02.cc
@@ -187,6 +187,10 @@ check ()
 
 int main ()
 {
+  // do not run multithreaded estimate() because that would break the order of the
+  // function evaluations that we log above
+  MultithreadInfo::set_thread_limit(1);
+
   initlog(true);
 
   deallog.push ("<1,2>");

diff --git a/tests/codim_one/error_estimator_02.output b/tests/codim_one/error_estimator_02.output
index 0216fa5f85a13f4c1095d60594d144a0c4aba8a9..5c415cb3ad0c0b615d5a90af7877ef3db81978b5 100644 (file)
--- a/tests/codim_one/error_estimator_02.output
+++ b/tests/codim_one/error_estimator_02.output
@@ -21,18 +21,78 @@ DEAL:<2,3>::evaluate normal derivative at 1.00000 0.0173580 0.00000 with value 0
 DEAL:<2,3>::evaluate normal derivative at 1.00000 0.0825024 0.00000 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 1.00000 0.167498 0.00000 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 1.00000 0.232642 0.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 0.00867898 0.00000 0.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 0.267358 0.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 0.332502 0.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 0.417498 0.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 0.482642 0.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 0.0173580 1.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 0.0825024 1.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 0.167498 1.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 0.232642 1.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 0.267358 1.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 0.332502 1.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 0.417498 1.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 0.482642 1.00000 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 1.00000 0.517358 0.00000 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 1.00000 0.582502 0.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 0.667498 0.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 0.732642 0.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 0.767358 0.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 0.832502 0.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 0.917498 0.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 0.982642 0.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 1.00000 0.0173580 with value 2.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 1.00000 0.0825024 with value 2.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 1.00000 0.167498 with value 2.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 1.00000 0.232642 with value 2.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 1.00000 0.267358 with value 2.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 1.00000 0.332502 with value 2.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 1.00000 0.417498 with value 2.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 1.00000 0.482642 with value 2.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 0.517358 1.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 0.582502 1.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 0.667498 1.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 0.732642 1.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 1.00000 0.517358 with value 2.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 1.00000 0.582502 with value 2.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 1.00000 0.667498 with value 2.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 1.00000 0.732642 with value 2.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 0.767358 1.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 0.832502 1.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 0.917498 1.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 0.982642 1.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 1.00000 0.767358 with value 2.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 1.00000 0.832502 with value 2.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 1.00000 0.917498 with value 2.00000
+DEAL:<2,3>::evaluate normal derivative at 1.00000 1.00000 0.982642 with value 2.00000
+DEAL:<2,3>::evaluate normal derivative at 0.00000 0.00000 0.517358 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.00000 0.00000 0.582502 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.00000 0.00000 0.667498 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.00000 0.00000 0.732642 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.0173580 0.00000 1.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.0825024 0.00000 1.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.167498 0.00000 1.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.232642 0.00000 1.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.00000 0.00000 0.767358 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.00000 0.00000 0.832502 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.00000 0.00000 0.917498 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.00000 0.00000 0.982642 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.267358 0.00000 1.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.332502 0.00000 1.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.417498 0.00000 1.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.482642 0.00000 1.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.517358 0.00000 1.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.582502 0.00000 1.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.667498 0.00000 1.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.732642 0.00000 1.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.767358 0.00000 1.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.832502 0.00000 1.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.917498 0.00000 1.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.982642 0.00000 1.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.00867898 0.00000 0.00000 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 0.0412512 0.00000 0.00000 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 0.0837488 0.00000 0.00000 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 0.116321 0.00000 0.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 0.258679 0.00000 0.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 0.667498 0.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 0.291251 0.00000 0.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 0.732642 0.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 0.333749 0.00000 0.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 0.366321 0.00000 0.00000 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 0.00000 0.00000 0.00867898 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 0.00000 0.00000 0.0412512 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 0.00000 0.00000 0.0837488 with value 0.00000
@@ -41,102 +101,42 @@ DEAL:<2,3>::evaluate normal derivative at 0.00000 0.00000 0.133679 with value 0.
 DEAL:<2,3>::evaluate normal derivative at 0.00000 0.00000 0.166251 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 0.00000 0.00000 0.208749 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 0.00000 0.00000 0.241321 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 0.00000 0.00000 0.517358 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 0.133679 0.00000 0.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 0.00000 0.00000 0.582502 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 0.383679 0.00000 0.00000 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 0.166251 0.00000 0.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 0.416251 0.00000 0.00000 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 0.208749 0.00000 0.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 0.00000 0.00000 0.667498 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 0.241321 0.00000 0.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 0.00000 0.00000 0.732642 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 0.458749 0.00000 0.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 0.267358 0.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 0.767358 0.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 0.832502 0.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 0.917498 0.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 0.332502 0.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 0.982642 0.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 0.417498 0.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 0.491321 0.00000 0.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 0.0173580 0.00000 1.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 0.482642 0.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 0.0825024 0.00000 1.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 0.167498 0.00000 1.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 0.232642 0.00000 1.00000 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 0.00000 0.00000 0.258679 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 0.00000 0.00000 0.767358 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 0.00000 0.00000 0.291251 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 0.00000 0.00000 0.832502 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 0.00000 0.00000 0.333749 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 0.00000 0.00000 0.917498 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 0.00000 0.00000 0.366321 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 0.00000 0.00000 0.982642 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 1.00000 0.0173580 with value 2.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 1.00000 0.0825024 with value 2.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 1.00000 0.167498 with value 2.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 1.00000 0.232642 with value 2.00000
 DEAL:<2,3>::evaluate normal derivative at 0.00000 0.00000 0.383679 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 0.00000 0.00000 0.416251 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 0.00000 0.00000 0.458749 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 0.00000 0.00000 0.491321 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 0.0173580 1.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 0.0825024 1.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 0.167498 1.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 0.232642 1.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 1.00000 0.267358 with value 2.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 1.00000 0.332502 with value 2.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 1.00000 0.417498 with value 2.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 1.00000 0.482642 with value 2.00000
+DEAL:<2,3>::evaluate normal derivative at 0.258679 0.00000 0.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.291251 0.00000 0.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.333749 0.00000 0.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.366321 0.00000 0.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.383679 0.00000 0.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.416251 0.00000 0.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.458749 0.00000 0.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.491321 0.00000 0.00000 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 0.508679 0.00000 0.00000 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 0.541251 0.00000 0.00000 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 0.583749 0.00000 0.00000 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 0.616321 0.00000 0.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 0.758679 0.00000 0.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 0.791251 0.00000 0.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 0.833749 0.00000 0.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 0.866321 0.00000 0.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 0.267358 1.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 0.332502 1.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 0.267358 0.00000 1.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 0.417498 1.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 0.332502 0.00000 1.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 0.482642 1.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 0.417498 0.00000 1.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 0.517358 1.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 0.482642 0.00000 1.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 0.582502 1.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 0.667498 1.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 0.732642 1.00000 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 0.633679 0.00000 0.00000 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 0.666251 0.00000 0.00000 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 0.708749 0.00000 0.00000 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 0.741321 0.00000 0.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.758679 0.00000 0.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.791251 0.00000 0.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.833749 0.00000 0.00000 with value 0.00000
+DEAL:<2,3>::evaluate normal derivative at 0.866321 0.00000 0.00000 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 0.883679 0.00000 0.00000 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 0.916251 0.00000 0.00000 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 0.958749 0.00000 0.00000 with value 0.00000
 DEAL:<2,3>::evaluate normal derivative at 0.991321 0.00000 0.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 1.00000 0.517358 with value 2.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 1.00000 0.582502 with value 2.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 1.00000 0.667498 with value 2.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 1.00000 0.732642 with value 2.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 0.767358 1.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 0.832502 1.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 0.917498 1.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 0.982642 1.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 0.517358 0.00000 1.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 1.00000 0.767358 with value 2.00000
-DEAL:<2,3>::evaluate normal derivative at 0.582502 0.00000 1.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 1.00000 0.832502 with value 2.00000
-DEAL:<2,3>::evaluate normal derivative at 0.667498 0.00000 1.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 1.00000 0.917498 with value 2.00000
-DEAL:<2,3>::evaluate normal derivative at 0.732642 0.00000 1.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 1.00000 1.00000 0.982642 with value 2.00000
-DEAL:<2,3>::evaluate normal derivative at 0.767358 0.00000 1.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 0.832502 0.00000 1.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 0.917498 0.00000 1.00000 with value 0.00000
-DEAL:<2,3>::evaluate normal derivative at 0.982642 0.00000 1.00000 with value 0.00000
 DEAL:<2,3>::Estimated error indicators:
 DEAL:<2,3>::0
 DEAL:<2,3>::0