From bed7c114f5d42582b02b0504d799c2f2773a6be5 Mon Sep 17 00:00:00 2001 From: Quang Hoang Date: Mon, 7 Oct 2024 19:32:15 -0400 Subject: [PATCH] make nsinker_bfbt test use bfbt add burnman bfbt test --- tests/nsinker_bfbt.prm | 15 +++++++++++++++ tests/nsinker_bfbt/screen-output | 2 +- tests/nsinker_bfbt/statistics | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/tests/nsinker_bfbt.prm b/tests/nsinker_bfbt.prm index 33822b2a947..c461bda7d0b 100644 --- a/tests/nsinker_bfbt.prm +++ b/tests/nsinker_bfbt.prm @@ -2,7 +2,22 @@ set Dimension = 3 include $ASPECT_SOURCE_DIR/benchmarks/nsinker/nsinker.prm +# Follow as closely as possible the parameters from Rudi et al. (2017) +subsection Solver parameters + subsection Stokes solver parameters + set Use full A block as preconditioner = true + set Number of cheap Stokes solver steps = 500 + set Maximum number of expensive Stokes solver steps = 1000 + set Linear solver tolerance = 1e-6 + set GMRES solver restart length = 100 + set Use weighted BFBT for Schur complement = true + set Krylov method for cheap solver steps = GMRES + end + subsection AMG parameters + set AMG aggregation threshold = 0.02 + end +end subsection Mesh refinement set Initial adaptive refinement = 0 set Initial global refinement = 1 diff --git a/tests/nsinker_bfbt/screen-output b/tests/nsinker_bfbt/screen-output index 6d63715aa8a..94b2682ec50 100644 --- a/tests/nsinker_bfbt/screen-output +++ b/tests/nsinker_bfbt/screen-output @@ -6,7 +6,7 @@ Number of degrees of freedom: 527 (375+27+125) *** Timestep 0: t=0 seconds, dt=0 seconds Rebuilding Stokes preconditioner... - Solving Stokes system (AMG)... 29+0 iterations. + Solving Stokes system (AMG-BFBT)... 31+0 iterations. Postprocessing: Writing graphical output: output-nsinker_bfbt/solution/solution-00000 diff --git a/tests/nsinker_bfbt/statistics b/tests/nsinker_bfbt/statistics index bb68e3e8a05..2e668df7066 100644 --- a/tests/nsinker_bfbt/statistics +++ b/tests/nsinker_bfbt/statistics @@ -9,4 +9,4 @@ # 9: Velocity iterations in Stokes preconditioner # 10: Schur complement iterations in Stokes preconditioner # 11: Visualization file name -0 0.000000000000e+00 0.000000000000e+00 8 402 125 1 28 30 145 output-nsinker_bfbt/solution/solution-00000 +0 0.000000000000e+00 0.000000000000e+00 8 402 125 1 30 32 631 output-nsinker_bfbt/solution/solution-00000