Merge pull request #6057 from quangx/bfbt_tests

fix test for weighted BFBT preconditioner
geodynamics · Oct 13, 2024 · 8a393d0 · 8a393d0
2 parents 91264fd + bed7c11
commit 8a393d0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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