Skip to content

Commit b54285d

Browse files
author
Thomas Baumann
committed
Fixes
1 parent 76724ad commit b54285d

File tree

2 files changed

+24
-4
lines changed

2 files changed

+24
-4
lines changed

pySDC/projects/GPU/analysis_scripts/RBC3D_order.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,12 @@
99

1010
step_sizes = {
1111
'RBC3DG4R4Ra1e5': [8e-2, 4e-2, 2e-2, 1e-2, 5e-3],
12-
'RBC3DG4R4SDC23Ra1e5': [8e-2, 4e-2, 2e-2, 1e-2, 5e-3, 2.5e-3],
13-
'RBC3DG4R4SDC34Ra1e5': [8e-2, 4e-2, 2e-2, 1e-2, 5e-3],
12+
# 'RBC3DG4R4SDC23Ra1e5': [8e-2, 4e-2, 2e-2, 1e-2, 5e-3, 2.5e-3],
13+
# 'RBC3DG4R4SDC34Ra1e5': [8e-2, 4e-2, 2e-2, 1e-2, 5e-3],
14+
'RBC3DG4R4SDC23Ra1e5': [5e-3 * 2**i for i in range(5)],
15+
'RBC3DG4R4SDC44Ra1e5': [5e-3 * 2**i for i in range(5)],
16+
# 'RBC3DG4R4SDC44Ra1e5': [1e-3 * 2**i for i in range(8)],
17+
'RBC3DG4R4SDC34Ra1e5': [1e-3 * 2**i for i in range(10)],
1418
'RBC3DG4R4RKRa1e5': [8e-2, 4e-2, 2e-2, 1e-2, 5e-3, 2.5e-3],
1519
# 'RBC3DG4R4EulerRa1e5': [8e-2, 4e-2, 2e-2, 1e-2, 5e-3],
1620
'RBC3DG4R4EulerRa1e5': [1e-3 * 2**i for i in range(5)],
@@ -30,7 +34,7 @@ def get_path(args):
3034

3135
def compute_errors(args, dts, Tend):
3236
errors = {'u': [], 'v': [], 'w': [], 'T': [], 'p': [], 'dt': []}
33-
prob = RayleighBenard3D(nx=4, ny=4, nz=4)
37+
prob = RayleighBenard3D(nx=4, ny=4, nz=4, comm=MPI.COMM_SELF)
3438

3539
dts = np.sort(dts)[::-1]
3640
ref = run(args, dts[-1], Tend)
@@ -104,7 +108,7 @@ def run(args, dt, Tend):
104108
config.Tend = n_freefall_times.get(type(config).__name__, 3)
105109

106110
ic_config_name = type(config).__name__
107-
for name in ['RK', 'Euler', 'O3', 'O4', 'SDC23', 'SDC34']:
111+
for name in ['RK', 'Euler', 'O3', 'O4', 'SDC23', 'SDC34', 'SDC44']:
108112
ic_config_name = ic_config_name.replace(name, '')
109113
ic_config = get_config({**args, 'config': ic_config_name})
110114
config.ic_config['config'] = type(ic_config)

pySDC/projects/GPU/configs/RBC3D_configs.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,15 @@ def get_description(self, *args, **kwargs):
221221
return desc
222222

223223

224+
class RBC3DM4K4(RBC3Dverification):
225+
226+
def get_description(self, *args, **kwargs):
227+
desc = super().get_description(*args, **kwargs)
228+
desc['level_params']['nsweeps'] = 4
229+
desc['sweeper_params']['num_nodes'] = 4
230+
return desc
231+
232+
224233
class RBC3DverificationRK(RBC3Dverification):
225234

226235
def get_description(self, *args, res=-1, dt=-1, **kwargs):
@@ -268,6 +277,13 @@ class RBC3DG4R4SDC34Ra1e5(RBC3DM3K4):
268277
converged = 50
269278

270279

280+
class RBC3DG4R4SDC44Ra1e5(RBC3DM4K4):
281+
Tend = 200
282+
dt = 6e-2
283+
res = 32
284+
converged = 50
285+
286+
271287
class RBC3DG4R4RKRa1e5(RBC3DverificationRK):
272288
Tend = 200
273289
dt = 8e-2

0 commit comments

Comments
 (0)