Skip to content

Change default to PETSc for 3D metrics #3305

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

Merged
bendudson merged 3 commits into from
Mar 4, 2026
Merged

Change default to PETSc for 3D metrics #3305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4a0549
Change default to PETSc for 3D metrics
dschwoerer Feb 13, 2026
f2bc048
[bot] Apply format changes
dschwoerer Mar 4, 2026
e0dd204
[bot] Add last format changes commit to ignore file
dschwoerer Mar 4, 2026
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
1 change: 1 addition & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ a71cad2dd6ace5741a754e2ca7daacd4bb094e0e
2c2402ed59c91164eaff46dee0f79386b7347e9e
05b7c571544c3bcb153fce67d12b9ac48947fc2d
c8f38049359170a34c915e209276238ea66b9a1e
f2bc0488a298f136294c523bc5ab4086d090059b
4 changes: 4 additions & 0 deletions include/bout/invert_laplace.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,11 @@ public:
static constexpr auto type_name = "Laplacian";
static constexpr auto section_name = "laplace";
static constexpr auto option_name = "type";
#if BOUT_USE_METRIC_3D
static constexpr auto default_type = LAPLACE_PETSC;
#else
static constexpr auto default_type = LAPLACE_CYCLIC;
#endif

ReturnType create(Options* options = nullptr, CELL_LOC loc = CELL_CENTRE,
Mesh* mesh = nullptr, Solver* solver = nullptr) {
Expand Down
3 changes: 2 additions & 1 deletion src/invert/laplace/impls/naulin/naulin_laplace.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@
#include <bout/derivs.hxx>
#include <bout/difops.hxx>
#include <bout/globals.hxx>
#include <bout/invert_laplace.hxx>
#include <bout/mesh.hxx>
#include <bout/sys/timer.hxx>

Expand Down Expand Up @@ -207,7 +208,7 @@ LaplaceNaulin::LaplaceNaulin(Options* opt, const CELL_LOC loc, Mesh* mesh_in,
ASSERT0(underrelax_recovery >= 1.);
delp2solver = create(opt->getSection("delp2solver"), location, localmesh);
std::string delp2type;
opt->getSection("delp2solver")->get("type", delp2type, "cyclic");
opt->getSection("delp2solver")->get("type", delp2type, LaplaceFactory::default_type);
// Check delp2solver is using an FFT scheme, otherwise it will not exactly
// invert Delp2 and we will not converge
ASSERT0(delp2type == "cyclic" || delp2type == "spt" || delp2type == "tri");
Expand Down