Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change default coarse grid solver for the geometric multigrid #1322

Merged
merged 6 commits into from
Oct 16, 2024
Merged

Change default coarse grid solver for the geometric multigrid #1322

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
565a378
Change default coarse grid solver
lpsaavedra Oct 15, 2024
fbc439e
Update all prm files
lpsaavedra Oct 15, 2024
efc1b86
Remove default parameters from tests
lpsaavedra Oct 15, 2024
746ffed
Update multigrid documentation
lpsaavedra Oct 15, 2024
f68bbf2
Add changelog entry
lpsaavedra Oct 16, 2024
b12038b
Merge branch 'master' into update_mf_tests
blaisb Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions applications_tests/lethe-fluid-matrix-free/couette_function_weak.prm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,5 @@ subsection linear solver
set eig estimation smoothing range = 5
set eig estimation cg n iterations = 5
set eig estimation verbosity = quiet

# Coarse-grid solver
set mg coarse grid solver = direct
end
end
16 changes: 1 addition & 15 deletions applications_tests/lethe-fluid-matrix-free/cylinder_kelly_estimator.prm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,7 @@ subsection linear solver
set max krylov vectors = 200

#MG parameters
set mg verbosity = quiet
set mg min level = -1
set mg level min cells = -1
set mg verbosity = quiet

#smoother
set mg smoother iterations = 10
Expand All @@ -175,17 +173,5 @@ subsection linear solver
set eig estimation smoothing range = 5
set eig estimation cg n iterations = 20
set eig estimation verbosity = quiet

#coarse-grid solver
set mg gmres preconditioner = ilu
set mg gmres max iterations = 500
set mg gmres tolerance = 1e-12
set mg gmres reduce = 1e-12
set mg gmres max krylov vectors = 500

#coarse-grid ILU preconditioner
set ilu preconditioner fill = 1
set ilu preconditioner absolute tolerance = 1e-5
set ilu preconditioner relative tolerance = 1
end
end
3 changes: 0 additions & 3 deletions applications_tests/lethe-fluid-matrix-free/cylinder_outlet_bc.prm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,5 @@ subsection linear solver
set eig estimation smoothing range = 5
set eig estimation cg n iterations = 20
set eig estimation verbosity = quiet

# Coarse-grid solver
set mg coarse grid solver = direct
end
end
8 changes: 4 additions & 4 deletions applications_tests/lethe-fluid-matrix-free/heat_transfer_high_pe_stab_gls.prm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,15 +137,15 @@ end
subsection boundary conditions heat transfer
set number = 2
subsection bc 0
set id = 0
set type = temperature
set id = 0
set type = temperature
subsection value
set Function expression = 0
end
end
subsection bc 1
set id = 1
set type = temperature
set id = 1
set type = temperature
subsection value
set Function expression = 1
end
Expand Down
3 changes: 0 additions & 3 deletions applications_tests/lethe-fluid-matrix-free/mms2d_fe2_weak.prm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,5 @@ subsection linear solver
set eig estimation smoothing range = 5
set eig estimation cg n iterations = 5
set eig estimation verbosity = quiet

# Coarse-grid solver
set mg coarse grid solver = direct
end
end
21 changes: 1 addition & 20 deletions applications_tests/lethe-fluid-matrix-free/mms3d_fe1_gcmg.prm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,29 +118,10 @@ subsection linear solver
set verbosity = quiet

#MG parameters
set mg verbosity = quiet
set mg min level = -1
set mg level min cells = -1
set mg verbosity = quiet

#smoother
set mg smoother iterations = 10
set mg smoother relaxation = 0.5

#coarse-grid solver
set mg gmres max iterations = 2000
set mg gmres tolerance = 1e-14
set mg gmres reduce = 1e-4
set mg gmres max krylov vectors = 30
set mg gmres preconditioner = amg

#coarse-grid AMG preconditioner
set amg aggregation threshold = 1e-14
set amg n cycles = 1
set amg w cycles = false
set amg smoother sweeps = 2
set amg smoother overlap = 1
set amg preconditioner ilu fill = 1
set amg preconditioner ilu absolute tolerance = 1e-10
set amg preconditioner ilu relative tolerance = 1.00
end
end
25 changes: 1 addition & 24 deletions applications_tests/lethe-fluid-matrix-free/mms3d_fe1_lsmg.prm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,29 +118,6 @@ subsection linear solver
set verbosity = quiet

#MG parameters
set mg verbosity = quiet
set mg min level = -1
set mg level min cells = -1

#smoother
set mg smoother iterations = 10
set mg smoother relaxation = 0.5

#coarse-grid solver
set mg gmres max iterations = 2000
set mg gmres tolerance = 1e-14
set mg gmres reduce = 1e-4
set mg gmres max krylov vectors = 30
set mg gmres preconditioner = amg

#coarse-grid AMG preconditioner
set amg aggregation threshold = 1e-14
set amg n cycles = 1
set amg w cycles = false
set amg smoother sweeps = 2
set amg smoother overlap = 1
set amg preconditioner ilu fill = 1
set amg preconditioner ilu absolute tolerance = 1e-10
set amg preconditioner ilu relative tolerance = 1.00
set mg verbosity = quiet
end
end
16 changes: 2 additions & 14 deletions applications_tests/lethe-fluid-matrix-free/taylor_couette_2d_local_ref.prm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ end

subsection forces
set verbosity = quiet # Output force and torques in log <quiet|verbose>
set calculate torque = false # Enable torque calculation
set calculate torque = false # Enable torque calculation
end

#---------------------------------------------------
Expand Down Expand Up @@ -140,9 +140,7 @@ subsection linear solver
set verbosity = quiet

# MG parameters
set mg verbosity = quiet
set mg min level = 0
set mg level min cells = -1
set mg verbosity = quiet

# Smoother
set mg smoother iterations = 10
Expand All @@ -152,15 +150,5 @@ subsection linear solver
set eig estimation smoothing range = 5
set eig estimation cg n iterations = 10
set eig estimation verbosity = quiet

# Coarse-grid solver
set mg gmres max iterations = 50
set mg gmres tolerance = 1e-7
set mg gmres reduce = 1e-4
set mg gmres max krylov vectors = 50
set mg gmres preconditioner = ilu
set ilu preconditioner fill = 0
set ilu preconditioner absolute tolerance = 1e-10
set ilu preconditioner relative tolerance = 1.00
end
end
4 changes: 0 additions & 4 deletions applications_tests/lethe-fluid-matrix-free/turbulent_taylor_couette_restart.prm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ subsection linear solver

# MG parameters
set mg verbosity = quiet
set mg min level = -1
set mg level min cells = 16

# Smoother
Expand All @@ -161,8 +160,5 @@ subsection linear solver
set eig estimation smoothing range = 5
set eig estimation cg n iterations = 20
set eig estimation verbosity = quiet

# Coarse-grid solver
set mg coarse grid solver = direct
end
end
6 changes: 3 additions & 3 deletions doc/source/parameters/cfd/linear_solver_control.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ Different parameters for the main components of the two geometric multigrid algo
.. code-block:: text

# General MG parameters
set mg verbosity = quiet
set mg verbosity = verbose
set mg min level = -1
set mg level min cells = -1
set mg int level = -1
Expand All @@ -220,10 +220,10 @@ Different parameters for the main components of the two geometric multigrid algo
# Eigenvalue estimation parameters
set eig estimation smoothing range = 10
set eig estimation cg n iterations = 10
set eig estimation verbosity = quiet
set eig estimation verbosity = verbose

# Coarse-grid solver parameters
set mg coarse grid solver = gmres
set mg coarse grid solver = direct
set mg coarse grid use fe q iso q1 = false

# Parameters for GMRES as coarse grid solver
Expand Down
2 changes: 1 addition & 1 deletion source/core/parameters.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2602,7 +2602,7 @@ namespace Parameters
"Choices are <quiet|verbose>.");

prm.declare_entry("mg coarse grid solver",
"gmres",
"direct",
Patterns::Selection("gmres|amg|ilu|direct"),
"The coarse grid solver for lsmg or gcmg"
"Choices are <gmres|amg|ilu|direct>.");
Expand Down
Loading