Skip to content

Commit 7748cf5

Browse files
authored
Make locally inlined functions static (#172)
1 parent 75cac07 commit 7748cf5

File tree

20 files changed

+96
-87
lines changed

20 files changed

+96
-87
lines changed

src/DirectSolver/DirectSolver-COO-MUMPS-Give/buildSolverMatrix.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55
#ifdef GMGPOLAR_USE_MUMPS
66

7-
inline void updateMatrixElement(SparseMatrixCOO<double>& matrix, int ptr, int offset, int row, int col, double val)
7+
static inline void updateMatrixElement(SparseMatrixCOO<double>& matrix, int ptr, int offset, int row, int col,
8+
double val)
89
{
910
matrix.row_index(ptr + offset) = row;
1011
matrix.col_index(ptr + offset) = col;

src/DirectSolver/DirectSolver-COO-MUMPS-Take/buildSolverMatrix.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
#ifdef GMGPOLAR_USE_MUMPS
44

5-
inline void updateMatrixElement(SparseMatrixCOO<double>& matrix, int ptr, int offset, int row, int col, double val)
5+
static inline void updateMatrixElement(SparseMatrixCOO<double>& matrix, int ptr, int offset, int row, int col,
6+
double val)
67
{
78
matrix.row_index(ptr + offset) = row;
89
matrix.col_index(ptr + offset) = col;

src/DirectSolver/DirectSolver-CSR-LU-Give/buildSolverMatrix.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

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

5-
inline void updateMatrixElement(SparseMatrixCSR<double>& matrix, int offset, int row, int col, double val)
5+
static inline void updateMatrixElement(SparseMatrixCSR<double>& matrix, int offset, int row, int col, double val)
66
{
77
matrix.row_nz_index(row, offset) = col;
88
matrix.row_nz_entry(row, offset) += val;

src/DirectSolver/DirectSolver-CSR-LU-Take/buildSolverMatrix.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "../../../include/DirectSolver/DirectSolver-CSR-LU-Take/directSolverTakeCustomLU.h"
22

3-
inline void updateMatrixElement(SparseMatrixCSR<double>& matrix, int offset, int row, int col, double val)
3+
static inline void updateMatrixElement(SparseMatrixCSR<double>& matrix, int offset, int row, int col, double val)
44
{
55
matrix.row_nz_index(row, offset) = col;
66
matrix.row_nz_entry(row, offset) = val;

src/ExtrapolatedSmoother/ExtrapolatedSmootherGive/buildAscMatrices.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
#include "../../../include/common/geometry_helper.h"
44

55
/* Tridiagonal matrices */
6-
inline void updateTridiagonalElement(SymmetricTridiagonalSolver<double>& matrix, int row, int column, double value)
6+
static inline void updateTridiagonalElement(SymmetricTridiagonalSolver<double>& matrix, int row, int column,
7+
double value)
78
{
89
if (row == column)
910
matrix.main_diagonal(row) += value;
@@ -14,23 +15,23 @@ inline void updateTridiagonalElement(SymmetricTridiagonalSolver<double>& matrix,
1415
}
1516

1617
/* Diagonal matrices */
17-
inline void updateDiagonalElement(DiagonalSolver<double>& matrix, int row, int column, double value)
18+
static inline void updateDiagonalElement(DiagonalSolver<double>& matrix, int row, int column, double value)
1819
{
1920
matrix.diagonal(row) += value;
2021
}
2122

2223
/* Inner Boundary COO/CSR matrix */
2324
#ifdef GMGPOLAR_USE_MUMPS
24-
inline void updateCOOCSRMatrixElement(SparseMatrixCOO<double>& matrix, int ptr, int offset, int row, int col,
25-
double val)
25+
static inline void updateCOOCSRMatrixElement(SparseMatrixCOO<double>& matrix, int ptr, int offset, int row, int col,
26+
double val)
2627
{
2728
matrix.row_index(ptr + offset) = row;
2829
matrix.col_index(ptr + offset) = col;
2930
matrix.value(ptr + offset) += val;
3031
}
3132
#else
32-
inline void updateCOOCSRMatrixElement(SparseMatrixCSR<double>& matrix, int ptr, int offset, int row, int col,
33-
double val)
33+
static inline void updateCOOCSRMatrixElement(SparseMatrixCSR<double>& matrix, int ptr, int offset, int row, int col,
34+
double val)
3435
{
3536
matrix.row_nz_index(row, offset) = col;
3637
matrix.row_nz_entry(row, offset) += val;

src/ExtrapolatedSmoother/ExtrapolatedSmootherGive/smootherSolver.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

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

5-
inline void nodeApplyAscOrthoCircleGive(int i_r, int i_theta, const PolarGrid& grid, bool DirBC_Interior,
6-
SmootherColor smoother_color, ConstVector<double>& x, ConstVector<double>& rhs,
7-
Vector<double>& result, double arr, double att, double art, double detDF,
8-
double coeff_beta)
5+
static inline void nodeApplyAscOrthoCircleGive(int i_r, int i_theta, const PolarGrid& grid, bool DirBC_Interior,
6+
SmootherColor smoother_color, ConstVector<double>& x,
7+
ConstVector<double>& rhs, Vector<double>& result, double arr, double att,
8+
double art, double detDF, double coeff_beta)
99
{
1010
assert(i_r >= 0 && i_r <= grid.numberSmootherCircles());
1111

@@ -394,10 +394,10 @@ inline void nodeApplyAscOrthoCircleGive(int i_r, int i_theta, const PolarGrid& g
394394
}
395395
}
396396

397-
inline void nodeApplyAscOrthoRadialGive(int i_r, int i_theta, const PolarGrid& grid, bool DirBC_Interior,
398-
SmootherColor smoother_color, ConstVector<double>& x, ConstVector<double>& rhs,
399-
Vector<double>& result, double arr, double att, double art, double detDF,
400-
double coeff_beta)
397+
static inline void nodeApplyAscOrthoRadialGive(int i_r, int i_theta, const PolarGrid& grid, bool DirBC_Interior,
398+
SmootherColor smoother_color, ConstVector<double>& x,
399+
ConstVector<double>& rhs, Vector<double>& result, double arr, double att,
400+
double art, double detDF, double coeff_beta)
401401
{
402402
assert(i_r >= grid.numberSmootherCircles() - 1 && i_r < grid.nr());
403403

src/ExtrapolatedSmoother/ExtrapolatedSmootherTake/buildAscMatrices.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#include "../../../include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/extrapolatedSmootherTake.h"
22

33
/* Tridiagonal matrices */
4-
inline void updateTridiagonalElement(SymmetricTridiagonalSolver<double>& matrix, int row, int column, double value)
4+
static inline void updateTridiagonalElement(SymmetricTridiagonalSolver<double>& matrix, int row, int column,
5+
double value)
56
{
67
if (row == column)
78
matrix.main_diagonal(row) = value;
@@ -12,23 +13,23 @@ inline void updateTridiagonalElement(SymmetricTridiagonalSolver<double>& matrix,
1213
}
1314

1415
/* Diagonal matrices */
15-
inline void updateDiagonalElement(DiagonalSolver<double>& matrix, int row, int column, double value)
16+
static inline void updateDiagonalElement(DiagonalSolver<double>& matrix, int row, int column, double value)
1617
{
1718
matrix.diagonal(row) = value;
1819
}
1920

2021
/* Inner Boundary COO/CSR matrix */
2122
#ifdef GMGPOLAR_USE_MUMPS
22-
inline void updateCOOCSRMatrixElement(SparseMatrixCOO<double>& matrix, int ptr, int offset, int row, int col,
23-
double val)
23+
static inline void updateCOOCSRMatrixElement(SparseMatrixCOO<double>& matrix, int ptr, int offset, int row, int col,
24+
double val)
2425
{
2526
matrix.row_index(ptr + offset) = row;
2627
matrix.col_index(ptr + offset) = col;
2728
matrix.value(ptr + offset) = val;
2829
}
2930
#else
30-
inline void updateCOOCSRMatrixElement(SparseMatrixCSR<double>& matrix, int ptr, int offset, int row, int col,
31-
double val)
31+
static inline void updateCOOCSRMatrixElement(SparseMatrixCSR<double>& matrix, int ptr, int offset, int row, int col,
32+
double val)
3233
{
3334
matrix.row_nz_index(row, offset) = col;
3435
matrix.row_nz_entry(row, offset) = val;

src/ExtrapolatedSmoother/ExtrapolatedSmootherTake/smootherSolver.cpp

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
#include "../../../include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/extrapolatedSmootherTake.h"
22

3-
inline void nodeApplyAscOrthoCircleTake(int i_r, int i_theta, const PolarGrid& grid, bool DirBC_Interior,
4-
SmootherColor smoother_color, ConstVector<double>& x, ConstVector<double>& rhs,
5-
Vector<double>& result, ConstVector<double>& arr, ConstVector<double>& att,
6-
ConstVector<double>& art, ConstVector<double>& detDF,
7-
ConstVector<double>& coeff_beta)
3+
static inline void nodeApplyAscOrthoCircleTake(int i_r, int i_theta, const PolarGrid& grid, bool DirBC_Interior,
4+
SmootherColor smoother_color, ConstVector<double>& x,
5+
ConstVector<double>& rhs, Vector<double>& result,
6+
ConstVector<double>& arr, ConstVector<double>& att,
7+
ConstVector<double>& art, ConstVector<double>& detDF,
8+
ConstVector<double>& coeff_beta)
89
{
910
assert(i_r >= 0 && i_r <= grid.numberSmootherCircles());
1011

@@ -182,11 +183,12 @@ inline void nodeApplyAscOrthoCircleTake(int i_r, int i_theta, const PolarGrid& g
182183
}
183184
}
184185

185-
inline void nodeApplyAscOrthoRadialTake(int i_r, int i_theta, const PolarGrid& grid, bool DirBC_Interior,
186-
SmootherColor smoother_color, ConstVector<double>& x, ConstVector<double>& rhs,
187-
Vector<double>& result, ConstVector<double>& arr,
188-
const ConstVector<double>& att, ConstVector<double>& art,
189-
const ConstVector<double>& detDF, ConstVector<double>& coeff_beta)
186+
static inline void nodeApplyAscOrthoRadialTake(int i_r, int i_theta, const PolarGrid& grid, bool DirBC_Interior,
187+
SmootherColor smoother_color, ConstVector<double>& x,
188+
ConstVector<double>& rhs, Vector<double>& result,
189+
ConstVector<double>& arr, const ConstVector<double>& att,
190+
ConstVector<double>& art, const ConstVector<double>& detDF,
191+
ConstVector<double>& coeff_beta)
190192
{
191193
assert(i_r >= grid.numberSmootherCircles() - 1 && i_r < grid.nr());
192194

src/Interpolation/extrapolated_prolongation.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@
4646
*
4747
*/
4848

49-
inline void fineNodeExtrapolatedProlongation(int i_r, int i_theta, int i_r_coarse, int i_theta_coarse,
50-
const PolarGrid& coarse_grid, const PolarGrid& fine_grid,
51-
Vector<double>& fine_result, ConstVector<double>& coarse_values)
49+
static inline void fineNodeExtrapolatedProlongation(int i_r, int i_theta, int i_r_coarse, int i_theta_coarse,
50+
const PolarGrid& coarse_grid, const PolarGrid& fine_grid,
51+
Vector<double>& fine_result, ConstVector<double>& coarse_values)
5252
{
5353
if (i_r & 1) {
5454
if (i_theta & 1) { /* (odd, odd) -> node in center of coarse cell */

src/Interpolation/extrapolated_restriction.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
* - Radial direction: check domain boundaries
2222
*/
2323

24-
inline void coarseNodeExtrapolatedRestriction(int i_r_coarse, int i_theta_coarse, const PolarGrid& fine_grid,
25-
const PolarGrid& coarse_grid, Vector<double>& coarse_result,
26-
ConstVector<double>& fine_values)
24+
static inline void coarseNodeExtrapolatedRestriction(int i_r_coarse, int i_theta_coarse, const PolarGrid& fine_grid,
25+
const PolarGrid& coarse_grid, Vector<double>& coarse_result,
26+
ConstVector<double>& fine_values)
2727
{
2828
int i_r = i_r_coarse * 2;
2929
int i_theta = i_theta_coarse * 2;

0 commit comments

Comments
 (0)