Skip to content

Commit 9d4fda2

Browse files
committed
new figures for asymptotic convergence paper
1 parent 5bb0e06 commit 9d4fda2

File tree

5 files changed

+35
-34
lines changed

5 files changed

+35
-34
lines changed

pySDC/projects/AsympConv/PFASST_conv_Linf.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
from pySDC.implementations.sweeper_classes.generic_implicit import generic_implicit
1313
from pySDC.implementations.transfer_classes.TransferMesh import mesh_to_mesh
1414
from pySDC.projects.matrixPFASST.allinclusive_matrix_nonMPI import allinclusive_matrix_nonMPI
15+
from pySDC.implementations.controller_classes.allinclusive_multigrid_nonMPI import allinclusive_multigrid_nonMPI
1516

1617
from pySDC.helpers.stats_helper import filter_stats, sort_stats
1718

@@ -109,8 +110,8 @@ def run_diffusion(QI):
109110
print(out)
110111

111112
# instantiate controller
112-
controller = allinclusive_matrix_nonMPI(num_procs=num_proc, controller_params=controller_params,
113-
description=description)
113+
controller = allinclusive_multigrid_nonMPI(num_procs=num_proc, controller_params=controller_params,
114+
description=description)
114115

115116
# get initial values on finest level
116117
P = controller.MS[0].levels[0].prob
@@ -218,8 +219,8 @@ def run_advection(QI):
218219
print(out)
219220

220221
# instantiate controller
221-
controller = allinclusive_matrix_nonMPI(num_procs=num_proc, controller_params=controller_params,
222-
description=description)
222+
controller = allinclusive_multigrid_nonMPI(num_procs=num_proc, controller_params=controller_params,
223+
description=description)
223224

224225
# get initial values on finest level
225226
P = controller.MS[0].levels[0].prob
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
num_proc,niter
2-
1,5.0
3-
2,7.0
4-
4,8.0
5-
8,9.0
6-
16,11.0
7-
32,15.0
8-
64,25.0
2+
1,6.0
3+
2,8.0
4+
4,9.0
5+
8,10.0
6+
16,12.0
7+
32,17.0
8+
64,26.0
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
num_proc,niter
2-
1,21.0
3-
2,24.0
4-
4,27.0
5-
8,29.0
6-
16,30.0
7-
32,31.0
8-
64,39.0
2+
1,18.0
3+
2,23.0
4+
4,28.0
5+
8,30.0
6+
16,31.0
7+
32,32.0
8+
64,41.0

pySDC/projects/AsympConv/data/results_conv_diffusion_Linf_QILU.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
num_proc,niter
2-
1,2.0
3-
2,2.0
2+
1,3.0
3+
2,3.0
44
4,3.0
5-
8,3.0
6-
16,4.0
5+
8,4.0
6+
16,5.0
77
32,6.0
88
64,7.0
99
128,7.0
Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
num_proc,niter
2-
1,14.0
3-
2,13.0
4-
4,13.0
5-
8,13.0
6-
16,12.0
7-
32,12.0
8-
64,12.0
9-
128,12.0
10-
256,12.0
11-
512,12.0
2+
1,11.0
3+
2,11.0
4+
4,11.0
5+
8,11.0
6+
16,11.0
7+
32,11.0
8+
64,10.0
9+
128,10.0
10+
256,10.0
11+
512,11.0
1212
1024,12.0
13-
2048,12.0
14-
4096,14.0
13+
2048,13.0
14+
4096,15.0

0 commit comments

Comments
 (0)