clean up

examples/Makefile

@@ -22,3 +22,11 @@ mms3dpkp0: pre
 mms2dbary: pre
 	$(exec) mms.py --dim 2 --nref 6 --k 2 --discretisation sv   --solver-type almg --mh bary --patch macro --gamma 1e4 --stabilisation-type burman --stabilisation-weight 5e-3 2>&1 | tee logs/mms2dbarysv.log
 	$(exec) mms.py --dim 2 --nref 6 --k 2 --discretisation pkp0 --solver-type almg --mh bary --patch star  --gamma 1e4 --stabilisation-type burman --stabilisation-weight 5e-3 2>&1 | tee logs/mms2dbarypkp0.log
+
+idealal:
+	$(exec) iters.py --baseN 16 --nref-start 2 --nref-end 2 --problem ldc2d --k 2 --solver-type allu --discretisation pkp0 --mh uniform --stabilisation-type supg --smoothing 6 --restriction --time --re-max 10000 --gamma 0 2>&1 | tee logs/idealalgamma0.log || 1
+	$(exec) iters.py --baseN 16 --nref-start 2 --nref-end 2 --problem ldc2d --k 2 --solver-type allu --discretisation pkp0 --mh uniform --stabilisation-type supg --smoothing 6 --restriction --time --re-max 10000 --gamma 1 2>&1 | tee logs/idealalgamma1.log || 1
+	$(exec) iters.py --baseN 16 --nref-start 2 --nref-end 2 --problem ldc2d --k 2 --solver-type allu --discretisation pkp0 --mh uniform --stabilisation-type supg --smoothing 6 --restriction --time --re-max 10000 --gamma 1e1 2>&1 | tee logs/idealalgamma1e1.log || 1
+	$(exec) iters.py --baseN 16 --nref-start 2 --nref-end 2 --problem ldc2d --k 2 --solver-type allu --discretisation pkp0 --mh uniform --stabilisation-type supg --smoothing 6 --restriction --time --re-max 10000 --gamma 1e2 2>&1 | tee logs/idealalgamma1e2.log || 1
+	$(exec) iters.py --baseN 16 --nref-start 2 --nref-end 2 --problem ldc2d --k 2 --solver-type allu --discretisation pkp0 --mh uniform --stabilisation-type supg --smoothing 6 --restriction --time --re-max 10000 --gamma 1e3 2>&1 | tee logs/idealalgamma1e3.log || 1
+	$(exec) iters.py --baseN 16 --nref-start 2 --nref-end 2 --problem ldc2d --k 2 --solver-type allu --discretisation pkp0 --mh uniform --stabilisation-type supg --smoothing 6 --restriction --time --re-max 10000 --gamma 1e4 2>&1 | tee logs/idealalgamma1e4.log || 1

examples/bfs2d/bfs2d.py

@@ -35,8 +35,10 @@ def relaxation_direction(self): return "0+:1-"
 
 
     parser = get_default_parser()
-    parser.add_argument("--mesh", type=str, default="coarseA",
-                        choices=["coarseA.msh", "coarseB.msh"])
+    parser.add_argument("--mesh", type=str, default="coarse09.msh",
+                        choices=["coarse03.msh", "coarse04.msh",
+                                 "coarse06.msh", "coarse09.msh",
+                                 "coarse12.msh"])
     args, _ = parser.parse_known_args()
     problem = TwoDimBackwardsFacingStepProblem(args.mesh)
     solver = get_solver(args, problem)

examples/bfs3d/Makefile

@@ -3,8 +3,14 @@ all: mesh13 mesh45 mesh60
 mesh13:
 	gmsh -3 -format msh2 -clscale 0.13 backwards-facing-step-3d.geo -algo front3d -o coarse13.msh -optimize_netgen -smooth 3
 
+mesh30:
+	gmsh -3 -format msh2 -clscale 0.30 backwards-facing-step-3d.geo -algo front3d -o coarse30.msh -optimize_netgen -smooth 3
+
 mesh45:
 	gmsh -3 -format msh2 -clscale 0.45 backwards-facing-step-3d.geo -algo front3d -o coarse45.msh -optimize_netgen -smooth 3
 
+mesh55:
+	gmsh -3 -format msh2 -clscale 0.55 backwards-facing-step-3d.geo -algo front3d -o coarse55.msh -optimize_netgen -smooth 3
+
 mesh60:
 	gmsh -3 -format msh2 -clscale 0.60 backwards-facing-step-3d.geo -algo front3d -o coarse60.msh -optimize_netgen -smooth 3

examples/bfs3d/bfs3d.py

@@ -36,7 +36,7 @@ def relaxation_direction(self): return "0+:1-"
 
     parser = get_default_parser()
     parser.add_argument("--mesh", type=str, default="coarse09.msh",
-                        choices=["coarse%i.msh" % i for i in [13, 35, 45]])
+                        choices=["coarse%i.msh" % i for i in [13, 30, 45, 55, 60]])
     args, _ = parser.parse_known_args()
     problem = ThreeDimBackwardsFacingStepProblem(args.mesh)
     solver = get_solver(args, problem)

examples/graddiv/Makefile

@@ -1,6 +1,7 @@
 exec=mpiexec -n 6 python3
 
 pkp02dcomparison:
+	mkdir -p logs
 	$(exec) graddiv.py --baseN 4 --nref 1 --discretisation pkp0 --k 2 --dim 2 --smoother amg 2>&1 | tee    logs/pkp02dcomparison-amg.log
 	$(exec) graddiv.py --baseN 4 --nref 2 --discretisation pkp0 --k 2 --dim 2 --smoother amg 2>&1 | tee -a logs/pkp02dcomparison-amg.log
 	$(exec) graddiv.py --baseN 4 --nref 3 --discretisation pkp0 --k 2 --dim 2 --smoother amg 2>&1 | tee -a logs/pkp02dcomparison-amg.log
@@ -23,6 +24,7 @@ pkp02dcomparison:
 	$(exec) graddiv.py --baseN 4 --nref 4 --discretisation pkp0 --k 2 --dim 2 --smoother jacobi 2>&1 | tee -a logs/pkp02dcomparison-jacobi-notransfer.log
 
 pkp03dcomparison:
+	mkdir -p logs
 	$(exec) graddiv.py --baseN 4 --nref 1 --discretisation pkp0 --k 1 --dim 3 --smoother amg 2>&1 | tee    logs/pkp03dcomparison-amg.log
 	$(exec) graddiv.py --baseN 4 --nref 2 --discretisation pkp0 --k 1 --dim 3 --smoother amg 2>&1 | tee -a logs/pkp03dcomparison-amg.log
 	$(exec) graddiv.py --baseN 4 --nref 3 --discretisation pkp0 --k 1 --dim 3 --smoother amg 2>&1 | tee -a logs/pkp03dcomparison-amg.log
@@ -40,6 +42,7 @@ pkp03dcomparison:
 	$(exec) graddiv.py --baseN 4 --nref 3 --discretisation pkp0 --k 1 --dim 3 --smoother jacobi 2>&1 | tee -a logs/pkp03dcomparison-jacobi-notransfer.log
 
 sv2dcomparison:
+	mkdir -p logs
 	$(exec) graddiv.py --baseN 4 --nref 1 --discretisation sv --k 2 --dim 2 --mh bary --patch macro --smoother amg 2>&1 | tee    logs/sv2dcomparison-amg.log
 	$(exec) graddiv.py --baseN 4 --nref 2 --discretisation sv --k 2 --dim 2 --mh bary --patch macro --smoother amg 2>&1 | tee -a logs/sv2dcomparison-amg.log
 	$(exec) graddiv.py --baseN 4 --nref 3 --discretisation sv --k 2 --dim 2 --mh bary --patch macro --smoother amg 2>&1 | tee -a logs/sv2dcomparison-amg.log
@@ -62,6 +65,7 @@ sv2dcomparison:
 	$(exec) graddiv.py --baseN 4 --nref 4 --discretisation sv --k 2 --dim 2 --mh bary --patch macro --smoother jacobi 2>&1 | tee -a logs/sv2dcomparison-jacobi-notransfer.log
 
 sv3dcomparison:
+	mkdir -p logs
 	$(exec) graddiv.py --baseN 2 --nref 1 --discretisation sv --k 3 --dim 3 --mh bary --patch macro --smoother amg 2>&1 | tee    logs/sv3dcomparison-amg.log
 	$(exec) graddiv.py --baseN 2 --nref 2 --discretisation sv --k 3 --dim 3 --mh bary --patch macro --smoother amg 2>&1 | tee -a logs/sv3dcomparison-amg.log
 	$(exec) graddiv.py --baseN 2 --nref 3 --discretisation sv --k 3 --dim 3 --mh bary --patch macro --smoother amg 2>&1 | tee -a logs/sv3dcomparison-amg.log