Skip to content

Commit 99405de

Browse files
author
Thomas Baumann
committed
SDC22
1 parent ba362cd commit 99405de

File tree

6 files changed

+19
-6
lines changed

6 files changed

+19
-6
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module --force purge
2-
module load Stages/2024
2+
module load Stages/2025
33
module load GCC
44
module load ParaStationMPI
55
# module load NCCL
@@ -9,6 +9,6 @@ module load Python
99
# module load CuPy
1010
module load FFTW
1111
module load mpi4py
12-
module load FFmpeg/.6.0
12+
# module load FFmpeg/.6.0
1313
# module load SciPy-Stack
1414
module load texlive

pySDC/projects/GPU/etc/venv_jusuf/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ numpy
33
matplotlib>=3.0
44
dill>=0.2.6
55
scipy>=1.14
6+
tqdm

pySDC/projects/GPU/etc/venv_jusuf/setup.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ python3 -m venv --prompt "$ENV_NAME" --system-site-packages "${ENV_DIR}"
1212

1313
source "${ABSOLUTE_PATH}"/activate.sh
1414

15-
FFTW_LIBRARY_DIR="/p/software/jusuf/stages/2024/software/FFTW/3.3.10-GCC-12.3.0/lib64" python3 -m pip install -e /p/project/ccstma/baumann7/mpi4py-fft
15+
16+
FFTW_LIBRARY_DIR="/p/software/jusuf/stages/2025/software/FFTW/3.3.10-GCC-13.3.0/lib64/" python3 -m pip install -e /p/project1/ccstma/baumann7/mpi4py-fft
1617
python3 -m pip install -e /p/project1/ccstma/baumann7/qmat
1718
python3 -m pip install -r "${ABSOLUTE_PATH}"/requirements.txt
1819
python3 -m pip install -e /p/project1/ccstma/baumann7/pySDC/

pySDC/projects/RayleighBenard/RBC3D_configs.py

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,15 @@ def get_description(self, *args, **kwargs):
212212
return desc
213213

214214

215+
class RBC3DM2K2(RBC3Dverification):
216+
217+
def get_description(self, *args, **kwargs):
218+
desc = super().get_description(*args, **kwargs)
219+
desc['level_params']['nsweeps'] = 2
220+
desc['sweeper_params']['num_nodes'] = 2
221+
return desc
222+
223+
215224
class RBC3DM3K4(RBC3Dverification):
216225

217226
def get_description(self, *args, **kwargs):
@@ -256,9 +265,9 @@ def get_description(self, *args, res=-1, dt=-1, **kwargs):
256265
return desc
257266

258267

259-
class RBC3DG4R4Ra1e5(RBC3Dverification):
268+
class RBC3DG4R4SDC22Ra1e5(RBC3DM2K2):
260269
Tend = 200
261-
dt = 6e-2
270+
dt = 4e-2
262271
res = 32
263272
converged = 50
264273

pySDC/projects/RayleighBenard/analysis_scripts/RBC3D_order.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
from pySDC.projects.RayleighBenard.analysis_scripts.plotting_utils import get_plotting_style, savefig
1111

1212
step_sizes = {
13+
'RBC3DG4R4SDC22Ra1e5': [5e-3 * 2**i for i in range(8)],
1314
'RBC3DG4R4SDC23Ra1e5': [5e-3 * 2**i for i in range(8)],
1415
'RBC3DG4R4SDC34Ra1e5': [5e-3 * 2**i for i in range(8)],
1516
'RBC3DG4R4SDC44Ra1e5': [5e-3 * 2**i for i in range(8)],
@@ -115,7 +116,7 @@ def run(args, dt, Tend):
115116
prob = desc['problem_class'](**desc['problem_params'])
116117

117118
ic_config_name = type(config).__name__
118-
for name in ['RK', 'Euler', 'O3', 'O4', 'SDC23', 'SDC34', 'SDC44']:
119+
for name in ['RK', 'Euler', 'O3', 'O4', 'SDC23', 'SDC34', 'SDC44', 'SDC22']:
119120
ic_config_name = ic_config_name.replace(name, 'SDC34')
120121

121122
ic_config = get_config({**args, 'config': ic_config_name})

pySDC/projects/RayleighBenard/analysis_scripts/process_RBC3D_data.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ def process_RBC3D_data(base_path='./data/processed', plot=True, args=None, confi
1313
# prepare problem instance
1414
args = args if args else parse_args()
1515
comm = MPI.COMM_WORLD
16+
args['procs'] = [1, 1, comm.size]
1617
config = config if config else get_config(args)
1718
desc = config.get_description(**args)
1819
P = desc['problem_class'](

0 commit comments

Comments
 (0)