Skip to content

Replace ExtrapolatedSmootherTake macros with type-safe functions #165

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

Open
julianlitz wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Replace ExtrapolatedSmootherTake macros with type-safe functions #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bdec90f
Remove macros
julianlitz Feb 3, 2026
2009a5c
grid_ -> grid
julianlitz Feb 3, 2026
a5a39cb
Update smootherSolver.cpp
julianlitz Feb 3, 2026
b9bd835
Update extrapolatedSmootherTake.h
julianlitz Feb 4, 2026
cf90e44
Remove template declaration from nodeBuildSmootherTake
julianlitz Feb 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
15 changes: 13 additions & 2 deletions include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/extrapolatedSmootherTake.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,14 @@ class ExtrapolatedSmootherTake : public ExtrapolatedSmoother
// - 'radial_tridiagonal_solver_[index] refers to the radial line i_theta = 2*index,
// - 'radial_diagonal_solver_[index] refers to the radial line i_theta = 2*index + 1.
#ifdef GMGPOLAR_USE_MUMPS
SparseMatrixCOO<double> inner_boundary_circle_matrix_;
using MatrixType = SparseMatrixCOO<double>;
DMUMPS_STRUC_C inner_boundary_mumps_solver_;
#else
SparseMatrixCSR<double> inner_boundary_circle_matrix_;
using MatrixType = SparseMatrixCSR<double>;
SparseLUSolver<double> inner_boundary_lu_solver_;
#endif
MatrixType inner_boundary_circle_matrix_;

std::vector<DiagonalSolver<double>> circle_diagonal_solver_;
std::vector<DiagonalSolver<double>> radial_diagonal_solver_;
std::vector<SymmetricTridiagonalSolver<double>> circle_tridiagonal_solver_;
Expand Down Expand Up @@ -79,4 +81,13 @@ class ExtrapolatedSmootherTake : public ExtrapolatedSmoother
void initializeMumpsSolver(DMUMPS_STRUC_C& mumps_solver, SparseMatrixCOO<double>& solver_matrix);
void finalizeMumpsSolver(DMUMPS_STRUC_C& mumps_solver);
#endif

void nodeBuildSmootherTake(int i_r, int i_theta, const PolarGrid& grid, bool DirBC_Interior,
MatrixType& inner_boundary_circle_matrix,
std::vector<DiagonalSolver<double>>& circle_diagonal_solver,
std::vector<DiagonalSolver<double>>& radial_diagonal_solver,
std::vector<SymmetricTridiagonalSolver<double>>& circle_tridiagonal_solver,
std::vector<SymmetricTridiagonalSolver<double>>& radial_tridiagonal_solver,
ConstVector<double>& arr, ConstVector<double>& att, ConstVector<double>& art,
ConstVector<double>& detDF, ConstVector<double>& coeff_beta);
};
Loading