fixes for the paper

Author: pancetta

pySDC/projects/TOMS/AllenCahn_contracting_circle.py

@@ -211,7 +211,7 @@ def show_results(fname, cwd=''):
     ax1.set_ylabel('time (sec)')
 
     ax2 = ax1.twinx()
-    ax2.bar(xcoords, heights_niters, color='r', align='edge', width=0.3, label='iterations (right axis)')
+    ax2.bar(xcoords, heights_niters, color='lightcoral', align='edge', width=0.3, label='iterations (right axis)')
     ax2.set_ylabel('mean number of iterations')
 
     ax1.set_xticks(xcoords)

pySDC/projects/TOMS/visualize_pySDC_with_PETSc.py

@@ -127,7 +127,7 @@ def visualize_speedup(result=None):
         result: dictionary containing the runtimes
     """
     process_list_MLSDC = [1, 2, 4, 6, 12, 24]
-    process_list_PFASST = [24, 48, 96, 144, 288]
+    process_list_PFASST = [24, 48, 96, 144, 288, 576]
 
     timing_MLSDC = np.zeros(len(process_list_MLSDC))
     timing_PFASST = np.zeros((len(process_list_PFASST)))
@@ -177,10 +177,10 @@ def main(cwd=''):
     visualize_matrix(result=result)
 
     result = {}
-    files = ['data/result_MLSDC.dat', 'data/result_PFASST_multinode_24.dat']
+    files = ['data/result_MLSDC_NEW.dat', 'data/result_PFASST_multinode_24_NEW.dat']
     for file in files:
         result = join_timings(file=file, result=result, cwd=cwd)
-    result.pop((24, 24))
+    # result.pop((24, 24))
     visualize_speedup(result=result)
 
 

pySDC/tests/test_projects/test_parallelSDC/test_AllenCahn_parallel.py

@@ -1,4 +1,8 @@
 from pySDC.projects.parallelSDC.AllenCahn_parallel import main
 
 def test_main():
-    main()
+
+    # try to import MPI here, will fail if things go wrong (and not later on in the subprocess part)
+    import mpi4py
+
+    main()

pySDC/tests/test_tutorials/test_step_7.py

@@ -12,6 +12,9 @@ def test_B():
     main_B()
 
 def test_C_1x1():
+    # try to import MPI here, will fail if things go wrong (and not in the subprocess part)
+    import mpi4py
+
     # Set python path once
     my_env = os.environ.copy()
     my_env['PYTHONPATH'] = '../../..:.'
@@ -30,6 +33,9 @@ def test_C_1x1():
                               (p.returncode, num_procs)
 
 def test_C_1x2():
+    # try to import MPI here, will fail if things go wrong (and not in the subprocess part)
+    import mpi4py
+
     # Set python path once
     my_env = os.environ.copy()
     my_env['PYTHONPATH'] = '../../..:.'
@@ -47,6 +53,9 @@ def test_C_1x2():
                               (p.returncode, num_procs)
 
 def test_C_2x2():
+    # try to import MPI here, will fail if things go wrong (and not in the subprocess part)
+    import mpi4py
+
     # Set python path once
     my_env = os.environ.copy()
     my_env['PYTHONPATH'] = '../../..:.'

pySDC/tutorial/step_6/C_MPI_parallelization.py

@@ -9,6 +9,9 @@ def main(cwd):
         cwd: current working directory
     """
 
+    # try to import MPI here, will fail if things go wrong (and not in the subprocess part)
+    import mpi4py
+
     # Set python path once
     my_env = os.environ.copy()
     my_env['PYTHONPATH'] = '../../..:.'