]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Multiply WALLTIME with the number of processors. Let's see if that gets the
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 14 Dec 2010 06:11:30 +0000 (06:11 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 14 Dec 2010 06:11:30 +0000 (06:11 +0000)
number of spurious failures back down.

git-svn-id: https://svn.dealii.org/trunk@22962 0785d39b-7218-0410-832d-ea1e28bc413d

tests/tests.h

index c77a5d6f7fa4fc96e5a01ed675f45feaff6b86f6..51ff270dd30b033bcf80343f6a4aaf444fc3632f 100644 (file)
@@ -22,6 +22,7 @@
 #include <base/exceptions.h>
 #include <base/utilities.h>
 #include <base/thread_management.h>
+#include <base/multithread_info.h>
 #include <cmath>
 #include <fstream>
 #include <sstream>
@@ -137,7 +138,7 @@ struct DeadlockKiller
            conv >> delay;
            if (conv)
              {
-               sleep (delay*4);
+               sleep (delay*multithread_info.n_cpus);
                std::cerr << "Time's up: Killing job because it overran its allowed walltime"
                          << std::endl;
                std::abort ();

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.