Skip to content

Commit f7151fe

Browse files
author
Thomas Baumann
committed
Stuff
#!!!!!! WARNING: FLAKEHEAVEN FAILED !!!!!!: #:
1 parent 8fa27af commit f7151fe

File tree

3 files changed

+87
-12
lines changed

3 files changed

+87
-12
lines changed

pySDC/implementations/problem_classes/RayleighBenard3D.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,10 @@ def __init__(
141141
U01 = self.get_basis_change_matrix(p_in=0, p_out=1)
142142
U12 = self.get_basis_change_matrix(p_in=1, p_out=2)
143143
U02 = self.get_basis_change_matrix(p_in=0, p_out=2)
144+
self.eliminate_zeros(S1)
145+
self.eliminate_zeros(S2)
146+
self.eliminate_zeros(Dz)
147+
self.eliminate_zeros(Dzz)
144148

145149
self.Dx = Dx
146150
self.Dxx = Dxx
@@ -158,13 +162,12 @@ def __init__(
158162

159163
# construct operators
160164
_D = U02 @ (Dxx + Dyy) + Dzz
161-
L_lhs = {
162-
'p': {'u': U01 @ Dx, 'v': U01 @ Dy, 'w': Dz}, # divergence free constraint
163-
'u': {'p': U02 @ Dx, 'u': -self.nu * _D},
164-
'v': {'p': U02 @ Dy, 'v': -self.nu * _D},
165-
'w': {'p': U12 @ Dz, 'w': -self.nu * _D, 'T': -U02 @ Id},
166-
'T': {'T': -self.kappa * _D},
167-
}
165+
L_lhs = {}
166+
L_lhs['p'] = {'u': U01 @ Dx, 'v': U01 @ Dy, 'w': Dz} # divergence free constraint
167+
L_lhs['u'] = {'p': U02 @ Dx, 'u': -self.nu * _D}
168+
L_lhs['v'] = {'p': U02 @ Dy, 'v': -self.nu * _D}
169+
L_lhs['w'] = {'p': U12 @ Dz, 'w': -self.nu * _D, 'T': -U02 @ Id}
170+
L_lhs['T'] = {'T': -self.kappa * _D}
168171
self.setup_L(L_lhs)
169172

170173
# mass matrix

pySDC/projects/GPU/analysis_scripts/RBC3d.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,15 @@
2222
config = get_config(args)
2323

2424
desc = config.get_description(**args)
25-
P = desc['problem_class'](**{**desc['problem_params'], 'spectral_space': False, 'comm': comm})
25+
P = desc['problem_class'](
26+
**{
27+
**desc['problem_params'],
28+
'spectral_space': False,
29+
'comm': comm,
30+
'Dirichlet_recombination': False,
31+
'left_preconditioner': False,
32+
}
33+
)
2634
P.setUpFieldsIO()
2735
xp = P.xp
2836

pySDC/projects/GPU/configs/RBC3D_configs.py

Lines changed: 68 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ class RayleighBenard3DRegular(Config):
1616
Tend = 50
1717
gamma = 1
1818
res_ratio = 1
19+
dealiasing = 3.0 / 2.0
1920

2021
def get_file_name(self):
2122
res = self.args['res']
@@ -78,6 +79,7 @@ def get_description(self, *args, MPIsweeper=False, res=-1, **kwargs):
7879
desc['problem_params']['Ly'] = self.gamma
7980
desc['problem_params']['Lz'] = 1
8081
desc['problem_params']['heterogeneous'] = True
82+
desc['problem_params']['dealiasing'] = self.dealiasing
8183

8284
desc['step_params']['maxiter'] = 3
8385

@@ -535,6 +537,15 @@ class RBC3DG4Ra1e5(RBC3DverificationGamma4):
535537
converged = 50
536538

537539

540+
class RBC3DG4R4Ra1e5(RBC3DverificationGamma4):
541+
res_ratio = 4
542+
Tend = 100
543+
dt = 8e-2
544+
ic_config = None
545+
res = 32
546+
converged = 50
547+
548+
538549
class RBC3DG4RKRa1e5(RBC3DverificationRKGamma4):
539550
Tend = 200
540551
dt = 7e-2
@@ -595,7 +606,34 @@ class RBC3DG4R4Ra1e7(RBC3DverificationGamma4):
595606
dt = 5e-3
596607
ic_config = RBC3DG4Ra1e6
597608
res = 64
598-
converged = 11
609+
# converged = 11
610+
611+
612+
class RBC3DG4R4D2Ra1e7(RBC3DverificationGamma4):
613+
res_ratio = 4
614+
Tend = 40
615+
dt = 5e-3
616+
ic_config = RBC3DG4Ra1e6
617+
res = 64
618+
dealiasing = 1
619+
620+
621+
class RBC3DG4R4D4Ra1e7(RBC3DverificationGamma4):
622+
res_ratio = 4
623+
Tend = 40
624+
dt = 5e-3
625+
ic_config = RBC3DG4Ra1e6
626+
res = 64
627+
dealiasing = 2
628+
629+
630+
class RBC3DG4R4D42Ra1e7(RBC3DverificationGamma4):
631+
res_ratio = 4
632+
Tend = 40
633+
dt = 5e-3
634+
ic_config = RBC3DG4R4Ra1e6
635+
res = 64
636+
dealiasing = 2
599637

600638

601639
class RBC3DG4RKRa1e7(RBC3DverificationRKGamma4):
@@ -606,6 +644,14 @@ class RBC3DG4RKRa1e7(RBC3DverificationRKGamma4):
606644
res = 96
607645

608646

647+
class RBC3DG4R4RKRa1e7(RBC3DverificationRKGamma4):
648+
res_ratio = 4
649+
Tend = 100
650+
dt = 2e-2
651+
ic_config = RBC3DG4Ra1e6
652+
res = 96
653+
654+
609655
class RBC3DG4Ra1e8(RBC3DverificationGamma4):
610656
# 8e-3 crashes at t=2
611657
Tend = 100
@@ -624,7 +670,7 @@ class RBC3DG4RKRa1e8(RBC3DverificationRKGamma4):
624670
converged = 20
625671

626672

627-
class RBC3DG4R4Ra1e8(RBC3DverificationGamma4):
673+
class RBC3DG4Ra1e8(RBC3DverificationGamma4):
628674
# nz=128: dt=5e-3 crash at t=0.9
629675
Tend = 60
630676
dt = 6e-3
@@ -633,13 +679,31 @@ class RBC3DG4R4Ra1e8(RBC3DverificationGamma4):
633679
# converged=20
634680

635681

682+
class RBC3DG4R42Ra1e8(RBC3DverificationGamma4):
683+
Tend = 60
684+
res_ratio = 4
685+
dt = 6e-3
686+
ic_config = None
687+
res = 96
688+
# converged=20
689+
690+
636691
class RBC3DG4R4Ra1e8(RBC3DverificationGamma4):
637692
res_ratio = 4
638693
Tend = 60
639-
dt = 6e-3
694+
dt = 5e-3
640695
ic_config = RBC3DG4R4Ra1e7
641696
res = 96
642-
# converged=20
697+
# converged=14
698+
699+
700+
class RBC3DG4R4RKRa1e8(RBC3DverificationRKGamma4):
701+
res_ratio = 4
702+
Tend = 40
703+
dt = 3e-3 # limit
704+
ic_config = RBC3DG4R4Ra1e7
705+
res = 256
706+
# converged = 20
643707

644708

645709
# class RBC3DG4Ra1e8(RBC3DverificationGamma4):

0 commit comments

Comments
 (0)