TOMS is now a project

pancetta · pancetta · commit 614f08238024 · 2018-06-18T09:53:53.000+02:00
diff --git a/pySDC/playgrounds/Allen_Cahn/contracting_circle.py b/pySDC/playgrounds/Allen_Cahn/contracting_circle.py
@@ -46,7 +46,7 @@ def main():
     sweeper_params = dict()
     sweeper_params['collocation_class'] = CollGaussLobatto
     sweeper_params['num_nodes'] = 3
-    sweeper_params['QI'] = ['LU', 'IEpar']
+    sweeper_params['QI'] = ['LU']
     sweeper_params['spread'] = False
     sweeper_params['do_coll_update'] = False
 
diff --git a/pySDC/playgrounds/TOMS/visualize_pySDC_with_PETSc.py b/pySDC/playgrounds/TOMS/visualize_pySDC_with_PETSc.py
diff --git a/pySDC/projects/TOMS/README_JURECA.txt b/pySDC/projects/TOMS/README_JURECA.txt
@@ -0,0 +1,12 @@
+Install pySDC on JURECA
+http://www.fz-juelich.de/ias/jsc/EN/Expertise/Supercomputers/JURECA/JURECA_node.html
+
+> module load Intel IntelMPI
+> module load petsc4py
+> module load SciPy-Stack
+> module load mpi4py
+
+> pip install --user dill
+
+> git clone https://github.com/Parallel-in-Time/pySDC.git
+
diff --git a/pySDC/projects/TOMS/__init__.py b/pySDC/projects/TOMS/__init__.py
diff --git a/pySDC/projects/TOMS/data/result_MLSDC.dat b/pySDC/projects/TOMS/data/result_MLSDC.dat
@@ -0,0 +1,9 @@
+result:
+nnodes | ntasks | space_size | timing_pat |  error_pat | niter_pat
+-------+--------+------------+------------+------------+----------
+     1 |      1 |          1 |    518.124 | 0.00019842 |     14.58
+     1 |      2 |          2 |   337.4485 | 0.00019842 |     14.58
+     1 |      4 |          4 |    159.902 | 0.00019842 |     14.58
+     1 |      6 |          6 |   118.1775 | 0.00019842 |     14.58
+     1 |     12 |         12 |    72.6939 | 0.00019842 |     14.58
+     1 |     24 |         24 |    50.5846 | 0.00019842 |     14.58
diff --git a/pySDC/projects/TOMS/data/result_PFASST_12.dat b/pySDC/projects/TOMS/data/result_PFASST_12.dat
@@ -0,0 +1,5 @@
+result:
+nnodes | ntasks | space_size | timing_pat |  error_pat | niter_pat
+-------+--------+------------+------------+------------+----------
+     1 |     12 |          1 |    84.5776 | 0.00019842 |      14.0
+     1 |     24 |          2 |    48.6976 | 0.00019842 |      14.0
diff --git a/pySDC/projects/TOMS/data/result_PFASST_2.dat b/pySDC/projects/TOMS/data/result_PFASST_2.dat
@@ -0,0 +1,8 @@
+result:
+nnodes | ntasks | space_size | timing_pat |  error_pat | niter_pat
+-------+--------+------------+------------+------------+----------
+     1 |      2 |          1 |   285.9574 | 0.00019842 |     14.67
+     1 |      4 |          2 |   166.7815 | 0.00019842 |     14.58
+     1 |      8 |          4 |    91.4402 | 0.00019842 |     14.58
+     1 |     12 |          6 |    70.9528 | 0.00019842 |     14.58
+     1 |     24 |         12 |    43.5992 | 0.00019842 |     14.58
diff --git a/pySDC/projects/TOMS/data/result_PFASST_24.dat b/pySDC/projects/TOMS/data/result_PFASST_24.dat
@@ -0,0 +1,4 @@
+result:
+nnodes | ntasks | space_size | timing_pat |  error_pat | niter_pat
+-------+--------+------------+------------+------------+----------
+     1 |     24 |          1 |      60.23 | 0.00019842 |      14.0
diff --git a/pySDC/projects/TOMS/data/result_PFASST_4.dat b/pySDC/projects/TOMS/data/result_PFASST_4.dat
@@ -0,0 +1,7 @@
+result:
+nnodes | ntasks | space_size | timing_pat |  error_pat | niter_pat
+-------+--------+------------+------------+------------+----------
+     1 |      4 |          1 |   178.1946 | 0.00019842 |     14.67
+     1 |      8 |          2 |   103.2252 | 0.00019842 |     13.83
+     1 |     16 |          4 |    50.9991 | 0.00019842 |      14.5
+     1 |     24 |          6 |    39.7261 | 0.00019842 |     13.83
diff --git a/pySDC/projects/TOMS/data/result_PFASST_6.dat b/pySDC/projects/TOMS/data/result_PFASST_6.dat
@@ -0,0 +1,6 @@
+result:
+nnodes | ntasks | space_size | timing_pat |  error_pat | niter_pat
+-------+--------+------------+------------+------------+----------
+     1 |      6 |          1 |   136.7693 | 0.00019842 |     13.75
+     1 |     12 |          2 |    66.9084 | 0.00019842 |      13.5
+     1 |     24 |          4 |    38.5683 | 0.00019842 |     13.75
diff --git a/pySDC/projects/TOMS/data/result_PFASST_multinode_24.dat b/pySDC/projects/TOMS/data/result_PFASST_multinode_24.dat
@@ -0,0 +1,10 @@
+result:
+nnodes | ntasks | space_size | timing_pat |  error_pat | niter_pat
+-------+--------+------------+------------+------------+----------
+     1 |     24 |         24 |    52.3123 | 0.00019842 |     14.58
+     2 |     24 |         24 |    28.6908 | 0.00019842 |     14.58
+     4 |     24 |         24 |      14.55 | 0.00019842 |      14.5
+     6 |     24 |         24 |    11.5699 | 0.00019842 |     13.75
+     8 |     24 |         24 |     9.4195 | 0.00019842 |      14.0
+    12 |     24 |         24 |      6.362 | 0.00019842 |      13.5
+    24 |     24 |         24 |      4.296 | 0.00019842 |      13.0
diff --git a/pySDC/projects/TOMS/jube_pySDC_with_PETSc.xml b/pySDC/projects/TOMS/jube_pySDC_with_PETSc.xml
diff --git a/pySDC/projects/TOMS/pySDC_with_PETSc.py b/pySDC/projects/TOMS/pySDC_with_PETSc.py
@@ -7,8 +7,6 @@
 from pySDC.implementations.collocation_classes.gauss_radau_right import CollGaussRadau_Right
 from pySDC.implementations.sweeper_classes.imex_1st_order import imex_1st_order
 from pySDC.implementations.transfer_classes.TransferPETScDMDA import mesh_to_mesh_petsc_dmda
-from pySDC.implementations.controller_classes.allinclusive_multigrid_MPI import allinclusive_multigrid_MPI
-from pySDC.implementations.controller_classes.allinclusive_multigrid_nonMPI import allinclusive_multigrid_nonMPI
 from pySDC.implementations.controller_classes.allinclusive_classic_MPI import allinclusive_classic_MPI
 
 from pySDC.helpers.stats_helper import filter_stats, sort_stats
@@ -101,11 +99,7 @@ def main():
     Tend = 3.0
 
     # instantiate controller
-    # controller = allinclusive_multigrid_MPI(controller_params=controller_params, description=description,
-    #                                         comm=time_comm)
-    controller = allinclusive_classic_MPI(controller_params=controller_params, description=description,
-                                            comm=time_comm)
-    # controller = allinclusive_multigrid_nonMPI(num_procs=16, controller_params=controller_params, description=description)
+    controller = allinclusive_classic_MPI(controller_params=controller_params, description=description, comm=time_comm)
 
     # get initial values on finest level
     P = controller.S.levels[0].prob
@@ -128,50 +122,32 @@ def main():
 
     # limit output to space-rank 0 (as before when setting the logger level)
     if space_rank == 0:
-        if len(sys.argv) == 3:
-            fname = str(sys.argv[2])
-        else:
-            fname = 'step_7_C_out.txt'
-        f = open(fname, 'a+')
 
         out = 'This is time-rank %i...' % time_rank
-        f.write(out + '\n')
         print(out)
 
         # compute and print statistics
         for item in iter_counts:
             out = 'Number of iterations for time %4.2f: %2i' % item
-            f.write(out + '\n')
             print(out)
 
         out = '   Mean number of iterations: %4.2f' % np.mean(niters)
-        f.write(out + '\n')
         print(out)
         out = '   Range of values for number of iterations: %2i ' % np.ptp(niters)
-        f.write(out + '\n')
         print(out)
         out = '   Position of max/min number of iterations: %2i -- %2i' % \
               (int(np.argmax(niters)), int(np.argmin(niters)))
-        f.write(out + '\n')
         print(out)
         out = '   Std and var for number of iterations: %4.2f -- %4.2f' % (float(np.std(niters)), float(np.var(niters)))
-        f.write(out + '\n')
         print(out)
 
         timing = sort_stats(filter_stats(stats, type='timing_run'), sortby='time')
 
         out = 'Time to solution: %6.4f sec.' % timing[0][1]
-        f.write(out + '\n')
         print(out)
         out = 'Error vs. PDE solution: %6.4e' % err
-        f.write(out + '\n')
         print(out)
 
-        f.close()
-
-    # assert err < 2E-04, 'ERROR: did not match error tolerance, got %s' % err
-    # assert np.mean(niters) <= 12, 'ERROR: number of iterations is too high, got %s' % np.mean(niters)
-
 
 if __name__ == "__main__":
     main()
diff --git a/pySDC/projects/TOMS/run_pySDC_with_PETSc.tmpl b/pySDC/projects/TOMS/run_pySDC_with_PETSc.tmpl
diff --git a/pySDC/projects/TOMS/visualize_pySDC_with_PETSc.py b/pySDC/projects/TOMS/visualize_pySDC_with_PETSc.py

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +result:
 +nnodes | ntasks | space_size | timing_pat |  error_pat | niter_pat
 +-------+--------+------------+------------+------------+----------
 +     1 |     24 |          1 |      60.23 | 0.00019842 |      14.0