Skip to content

Zero-initialize Matrix values by default #177

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
julianlitz merged 2 commits into from
Feb 17, 2026
Merged

Zero-initialize Matrix values by default #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba32b5d
Default init matrix
julianlitz Feb 13, 2026
be241e2
Update smoother.h
julianlitz Feb 13, 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
2 changes: 1 addition & 1 deletion include/ConfigParser/config_parser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <memory>

#include "../../include/ConfigParser/cmdline.h"
#include "../../include/common/global_definitions.h"
#include "../../include/Definitions/global_definitions.h"
#include "../../include/PolarGrid/polargrid.h"
#include "../../include/GMGPolar/test_cases.h"
#include "../../include/GMGPolar/igmgpolar.h"
Expand Down
2 changes: 2 additions & 0 deletions include/ConfigParser/test_selection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#pragma once

#include <variant>

#include "../../include/GMGPolar/test_cases.h"
#include "../../include/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CircularGeometry.h"
#include "../../include/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CzarnyGeometry.h"
Expand Down
0 include/common/equals.h → include/Definitions/equals.h
View file
Open in desktop
File renamed without changes.
0 include/common/geometry_helper.h → include/Definitions/geometry_helper.h
View file
Open in desktop
File renamed without changes.
0 include/common/global_definitions.h → include/Definitions/global_definitions.h
View file
Open in desktop
File renamed without changes.
3 changes: 0 additions & 3 deletions include/DirectSolver/DirectSolver-COO-MUMPS-Give/directSolverGive.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@

#ifdef GMGPOLAR_USE_MUMPS

#include "dmumps_c.h"
#include "mpi.h"

class DirectSolver_COO_MUMPS_Give : public DirectSolver
{
public:
Expand Down
3 changes: 0 additions & 3 deletions include/DirectSolver/DirectSolver-COO-MUMPS-Take/directSolverTake.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@

#ifdef GMGPOLAR_USE_MUMPS

#include "dmumps_c.h"
#include "mpi.h"

class DirectSolver_COO_MUMPS_Take : public DirectSolver
{
public:
Expand Down
1 change: 0 additions & 1 deletion include/DirectSolver/DirectSolver-CSR-LU-Give/directSolverGiveCustomLU.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#pragma once

#include "../directSolver.h"
#include <Kokkos_Core.hpp>

class DirectSolver_CSR_LU_Give : public DirectSolver
{
Expand Down
17 changes: 11 additions & 6 deletions include/DirectSolver/directSolver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,19 @@ class Level;
#include "../InputFunctions/densityProfileCoefficients.h"
#include "../Level/level.h"
#include "../PolarGrid/polargrid.h"
#include "../common/global_definitions.h"
#include "../LinearAlgebra/vector.h"
#include "../LinearAlgebra/vector_operations.h"
#include "../LinearAlgebra/coo_matrix.h"
#include "../LinearAlgebra/csr_matrix.h"
#include "../LinearAlgebra/sparseLUSolver.h"
#include "../Definitions/global_definitions.h"
#include "../LinearAlgebra/Vector/vector.h"
#include "../LinearAlgebra/Vector/vector_operations.h"
#include "../LinearAlgebra/Matrix/coo_matrix.h"
#include "../LinearAlgebra/Matrix/csr_matrix.h"
#include "../LinearAlgebra/Solvers/csr_lu_solver.h"
#include "../Stencil/stencil.h"

#ifdef GMGPOLAR_USE_MUMPS
#include "dmumps_c.h"
#include "mpi.h"
#endif

class DirectSolver
{
public:
Expand Down
5 changes: 0 additions & 5 deletions include/ExtrapolatedSmoother/ExtrapolatedSmootherGive/extrapolatedSmootherGive.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@

#include "../extrapolatedSmoother.h"

#ifdef GMGPOLAR_USE_MUMPS
#include "dmumps_c.h"
#include "mpi.h"
#endif

class ExtrapolatedSmootherGive : public ExtrapolatedSmoother
{
public:
Expand Down
5 changes: 0 additions & 5 deletions include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/extrapolatedSmootherTake.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@

#include "../extrapolatedSmoother.h"

#ifdef GMGPOLAR_USE_MUMPS
#include "dmumps_c.h"
#include "mpi.h"
#endif

class ExtrapolatedSmootherTake : public ExtrapolatedSmoother
{
public:
Expand Down
27 changes: 17 additions & 10 deletions include/ExtrapolatedSmoother/extrapolatedSmoother.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,25 @@ class Level;
#include <vector>

#include "../InputFunctions/domainGeometry.h"
#include "../LinearAlgebra/diagonalSolver.h"
#include "../LinearAlgebra/coo_matrix.h"
#include "../LinearAlgebra/csr_matrix.h"
#include "../LinearAlgebra/sparseLUSolver.h"
#include "../LinearAlgebra/symmetricTridiagonalSolver.h"
#include "../LinearAlgebra/vector.h"
#include "../LinearAlgebra/vector_operations.h"
#include "../PolarGrid/polargrid.h"

#include "../InputFunctions/densityProfileCoefficients.h"
#include "../Level/level.h"
#include "../PolarGrid/polargrid.h"
#include "../Definitions/global_definitions.h"
#include "../LinearAlgebra/Vector/vector.h"
#include "../LinearAlgebra/Vector/vector_operations.h"
#include "../LinearAlgebra/Solvers/tridiagonal_solver.h"
#include "../LinearAlgebra/Matrix/coo_matrix.h"
#include "../LinearAlgebra/Matrix/csr_matrix.h"
#include "../LinearAlgebra/Solvers/csr_lu_solver.h"
#include "../Stencil/stencil.h"
#include "../common/global_definitions.h"

#ifdef GMGPOLAR_USE_MUMPS
#include "dmumps_c.h"
#include "mpi.h"
#endif

#include "../LinearAlgebra/Solvers/diagonalSolver.h"
#include "../LinearAlgebra/Solvers/symmetricTridiagonalSolver.h"

class ExtrapolatedSmoother
{
Expand Down
6 changes: 3 additions & 3 deletions include/GMGPolar/igmgpolar.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ class LevelCache;
#include "../InputFunctions/sourceTerm.h"
#include "../Interpolation/interpolation.h"
#include "../Level/level.h"
#include "../LinearAlgebra/vector.h"
#include "../LinearAlgebra/vector_operations.h"
#include "../LinearAlgebra/Vector/vector.h"
#include "../LinearAlgebra/Vector/vector_operations.h"
#include "../PolarGrid/polargrid.h"
#include "../common/global_definitions.h"
#include "../Definitions/global_definitions.h"
#include "test_cases.h"

class IGMGPolar
Expand Down
1 change: 0 additions & 1 deletion include/GMGPolar/setup.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

template <concepts::DomainGeometry DomainGeometry, concepts::DensityProfileCoefficients DensityProfileCoefficients>
void GMGPolar<DomainGeometry, DensityProfileCoefficients>::setup()
{
Expand Down
1 change: 0 additions & 1 deletion include/GMGPolar/solver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

// =============================================================================
// Main Solver Routine
// =============================================================================
Expand Down
9 changes: 3 additions & 6 deletions include/Interpolation/interpolation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,12 @@
#include <vector>
#include <cassert>
#include <iostream>

#include <omp.h>

#include "../PolarGrid/polargrid.h"

#include "../LinearAlgebra/vector.h"
#include "../LinearAlgebra/vector_operations.h"

#include "../common/global_definitions.h"
#include "../LinearAlgebra/Vector/vector.h"
#include "../LinearAlgebra/Vector/vector_operations.h"
#include "../Definitions/global_definitions.h"

class Interpolation
{
Expand Down
2 changes: 1 addition & 1 deletion include/Level/level.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class ExtrapolatedSmoother;
#include "../Residual/residual.h"
#include "../Smoother/smoother.h"

#include "../common/geometry_helper.h"
#include "../Definitions/geometry_helper.h"

// The `Level` class represents a single level of a multigrid method.
// In multigrid solvers, the computational domain is divided into different levels, where each level corresponds to a grid with a different resolution.
Expand Down
7 changes: 6 additions & 1 deletion include/LinearAlgebra/coo_matrix.h → include/LinearAlgebra/Matrix/coo_matrix.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
#include <fstream>
#include <iostream>

#include "vector.h"
#include "../../LinearAlgebra/Vector/vector.h"
#include "../../LinearAlgebra/Vector/vector_operations.h"

template <typename T>
class SparseMatrixCOO
Expand Down Expand Up @@ -219,6 +220,10 @@ SparseMatrixCOO<T>::SparseMatrixCOO(int rows, int columns, int nnz)
assert(rows >= 0);
assert(columns >= 0);
assert(nnz >= 0);

assign(row_indices_, 0);
assign(column_indices_, 0);
assign(values_, T(0));
}

template <typename T>
Expand Down
6 changes: 5 additions & 1 deletion include/LinearAlgebra/csr_matrix.h → include/LinearAlgebra/Matrix/csr_matrix.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
#include <fstream>
#include <iostream>

#include "vector.h"
#include "../../LinearAlgebra/Vector/vector.h"
#include "../../LinearAlgebra/Vector/vector_operations.h"

// The CSR matrix format is used if a custom LU decomposition solver is choosen.
// MUMPS relies on the COO format.
Expand Down Expand Up @@ -191,6 +192,9 @@ SparseMatrixCSR<T>::SparseMatrixCSR(int rows, int columns, std::function<int(int
row_start_indices_(rows) = nnz_;
values_ = Vector<T>("CSR values", nnz_);
column_indices_ = Vector<int>("CSR column indices", nnz_);

assign(values_, T(0));
assign(column_indices_, 0);
}

template <typename T>
Expand Down
4 changes: 2 additions & 2 deletions include/LinearAlgebra/sparseLUSolver.h → ...ude/LinearAlgebra/Solvers/csr_lu_solver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#include <cmath>
#include <stack>

#include "csr_matrix.h"
#include "vector.h"
#include "../../LinearAlgebra/Matrix/csr_matrix.h"
#include "../../LinearAlgebra/Vector/vector.h"

/**
* @brief Sparse LU decomposition solver for symmetric positive definite matrices.
Expand Down
3 changes: 2 additions & 1 deletion include/LinearAlgebra/diagonalSolver.h → ...de/LinearAlgebra/Solvers/diagonalSolver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
#include <fstream>
#include <iostream>

#include "vector.h"
#include "../../LinearAlgebra/Vector/vector.h"
#include "../../Definitions/equals.h"

template <typename T>
class DiagonalSolver
Expand Down
3 changes: 2 additions & 1 deletion ...inearAlgebra/symmetricTridiagonalSolver.h → ...ebra/Solvers/symmetricTridiagonalSolver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
#include <unistd.h>
#include <vector>

#include "../common/equals.h"
#include "../../LinearAlgebra/Vector/vector.h"
#include "../../Definitions/equals.h"

/*
* SymmetricTridiagonalSolver is a class for solving symmetric tridiagonal systems of linear equations.
Expand Down
4 changes: 2 additions & 2 deletions include/LinearAlgebra/Solvers/tridiagonal_solver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#include <Kokkos_Core.hpp>

#include "../vector.h"
#include "../vector_operations.h"
#include "../../LinearAlgebra/Vector/vector.h"
#include "../../LinearAlgebra/Vector/vector_operations.h"

template <typename T>
class BatchedTridiagonalSolver
Expand Down
7 changes: 0 additions & 7 deletions include/LinearAlgebra/vector.h → include/LinearAlgebra/Vector/vector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
#pragma once

#include <algorithm>
#include <cassert>
#include <initializer_list>
#include <iostream>
#include <memory>
#include <sstream>
#include <vector>
#include <Kokkos_Core.hpp>

template <typename T>
Expand Down
5 changes: 3 additions & 2 deletions include/LinearAlgebra/vector_operations.h → .../LinearAlgebra/Vector/vector_operations.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
#include <omp.h>
#include <stdexcept>

#include "../common/equals.h"
#include "vector.h"
#include <Kokkos_Core.hpp>

#include "vector.h"
#include "../../Definitions/equals.h"

template <typename T>
bool equals(ConstVector<T> lhs, ConstVector<T> rhs)
{
Expand Down
2 changes: 1 addition & 1 deletion include/PolarGrid/polargrid.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include <omp.h>

#include "../common/equals.h"
#include "../Definitions/equals.h"

class PolarGrid
{
Expand Down
13 changes: 5 additions & 8 deletions include/Residual/residual.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,13 @@ class Level;
#include <iostream>
#include <vector>

#include "../PolarGrid/polargrid.h"

#include "../InputFunctions/boundaryConditions.h"
#include "../InputFunctions/densityProfileCoefficients.h"
#include "../InputFunctions/domainGeometry.h"
#include "../InputFunctions/sourceTerm.h"
#include "../InputFunctions/densityProfileCoefficients.h"
#include "../Level/level.h"
#include "../LinearAlgebra/vector.h"
#include "../LinearAlgebra/vector_operations.h"
#include "../common/global_definitions.h"
#include "../PolarGrid/polargrid.h"
#include "../Definitions/global_definitions.h"
#include "../LinearAlgebra/Vector/vector.h"
#include "../LinearAlgebra/Vector/vector_operations.h"

class Residual
{
Expand Down
5 changes: 0 additions & 5 deletions include/Smoother/SmootherGive/smootherGive.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@

#include "../smoother.h"

#ifdef GMGPOLAR_USE_MUMPS
#include "dmumps_c.h"
#include "mpi.h"
#endif

class SmootherGive : public Smoother
{
public:
Expand Down
5 changes: 0 additions & 5 deletions include/Smoother/SmootherTake/smootherTake.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@

#include "../smoother.h"

#ifdef GMGPOLAR_USE_MUMPS
#include "dmumps_c.h"
#include "mpi.h"
#endif

class SmootherTake : public Smoother
{
public:
Expand Down
25 changes: 15 additions & 10 deletions include/Smoother/smoother.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,25 @@ class Level;
#include <iostream>
#include <vector>

#include "../InputFunctions/boundaryConditions.h"
#include "../InputFunctions/densityProfileCoefficients.h"
#include "../InputFunctions/domainGeometry.h"
#include "../InputFunctions/sourceTerm.h"
#include "../InputFunctions/densityProfileCoefficients.h"
#include "../Level/level.h"
#include "../LinearAlgebra/coo_matrix.h"
#include "../LinearAlgebra/csr_matrix.h"
#include "../LinearAlgebra/sparseLUSolver.h"
#include "../LinearAlgebra/symmetricTridiagonalSolver.h"
#include "../LinearAlgebra/vector.h"
#include "../LinearAlgebra/vector_operations.h"
#include "../PolarGrid/polargrid.h"
#include "../Definitions/global_definitions.h"
#include "../LinearAlgebra/Vector/vector.h"
#include "../LinearAlgebra/Vector/vector_operations.h"
#include "../LinearAlgebra/Solvers/tridiagonal_solver.h"
#include "../LinearAlgebra/Matrix/coo_matrix.h"
#include "../LinearAlgebra/Matrix/csr_matrix.h"
#include "../LinearAlgebra/Solvers/csr_lu_solver.h"
#include "../Stencil/stencil.h"
#include "../common/global_definitions.h"

#ifdef GMGPOLAR_USE_MUMPS
#include "dmumps_c.h"
#include "mpi.h"
#endif

#include "../LinearAlgebra/Solvers/symmetricTridiagonalSolver.h"

class Smoother
{
Expand Down
2 changes: 1 addition & 1 deletion src/ConfigParser/select_test_case.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "../include/ConfigParser/config_parser.h"
#include "../../include/ConfigParser/config_parser.h"
#include "../../include/GMGPolar/gmgpolar.h"

std::unique_ptr<IGMGPolar> ConfigParser::solver() const
Expand Down
4 changes: 1 addition & 3 deletions src/DirectSolver/DirectSolver-COO-MUMPS-Give/applySymmetryShift.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#include "../../../include/DirectSolver/DirectSolver-COO-MUMPS-Give/directSolverGive.h"

#include "../../../include/common/geometry_helper.h"

#include <iterator>
#include "../../../include/Definitions/geometry_helper.h"

#ifdef GMGPOLAR_USE_MUMPS

Expand Down
Loading