From 7918911ff89eb25035aab80bf522689f73dad2ec Mon Sep 17 00:00:00 2001 From: Gregory Wagner Date: Thu, 21 Aug 2025 09:01:36 -0800 Subject: [PATCH] Use CG as fallback solver for all cases --- .../NonhydrostaticModels/NonhydrostaticModels.jl | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/Models/NonhydrostaticModels/NonhydrostaticModels.jl b/src/Models/NonhydrostaticModels/NonhydrostaticModels.jl index 97c1ed81e0..a1c0a8955c 100644 --- a/src/Models/NonhydrostaticModels/NonhydrostaticModels.jl +++ b/src/Models/NonhydrostaticModels/NonhydrostaticModels.jl @@ -36,9 +36,8 @@ nonhydrostatic_pressure_solver(arch, grid::XYZRegularRG) = FFTBasedPoissonSolver nonhydrostatic_pressure_solver(arch, grid::GridWithFourierTridiagonalSolver) = FourierTridiagonalPoissonSolver(grid) -# A LatitudeLongitudeGrid cannot use an FFT-based solver, we use a conjugate gradient solver instead. -nonhydrostatic_pressure_solver(arch, grid::LatitudeLongitudeGrid) = - ConjugateGradientPoissonSolver(grid) +# fallback +nonhydrostatic_pressure_solver(arch, grid) = ConjugateGradientPoissonSolver(grid) const IBGWithFFTSolver = ImmersedBoundaryGrid{<:Any, <:Any, <:Any, <:Any, <:GridWithFFTSolver} @@ -58,11 +57,6 @@ function nonhydrostatic_pressure_solver(arch, ibg::IBGWithFFTSolver) return nonhydrostatic_pressure_solver(arch, ibg.underlying_grid) end -# fallback -nonhydrostatic_pressure_solver(arch, grid) = - error("None of the implemented pressure solvers for NonhydrostaticModel \ - are supported on $(summary(grid)).") - nonhydrostatic_pressure_solver(grid) = nonhydrostatic_pressure_solver(architecture(grid), grid) #####