OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-04 11:00:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Replaced hardcoded constant with template

Browse Source
This commit is contained in:
T.D. (Tongdong) Qiu 2020-07-01 13:37:40 +02:00
parent 8913e1d057
commit 845563c37b
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/simulators/linalg/bda/BILU0.cpp
View File

@ -99,7 +99,7 @@ namespace bda
if (level_scheduling) {
rowsPerColor = findLevelScheduling(mat->colIndices, mat->rowPointers, CSCmat->colIndices, CSCmat->rowPointers, mat->Nb, &numColors, toOrder, fromOrder);
} else if (graph_coloring) {
rowsPerColor = findGraphColoring(mat->colIndices, mat->rowPointers, mat->Nb, mat->Nb, mat->Nb, &numColors, toOrder, fromOrder);
rowsPerColor = findGraphColoring<block_size>(mat->colIndices, mat->rowPointers, mat->Nb, mat->Nb, mat->Nb, &numColors, toOrder, fromOrder);
}
if (rowsPerColor == nullptr) {
return false;

28
opm/simulators/linalg/bda/Reorder.cpp
View File

@ -37,6 +37,7 @@ namespace bda
* form of row pointers and column indices arrays are in the input), a color
* in the colors array. Also return the amount of colors in the return integer. */
template <unsigned int block_size>
int colorBlockedNodes(int rows, const int *rowPointers, const int *colIndices, std::vector<int>& colors, int maxRowsPerColor, int maxColsPerColor)
{
int left, c;
@ -48,8 +49,8 @@ int colorBlockedNodes(int rows, const int *rowPointers, const int *colIndices, s
visitedColumns.resize(rows);
std::fill(visitedColumns.begin(), visitedColumns.end(), false);
int colsInColor;
int additionalColsInRow;
unsigned int colsInColor;
unsigned int additionalColsInRow;
for (unsigned int t = 0; t < max_tries; t++) {
// (re)initialize data for coloring process
@ -65,7 +66,7 @@ int colorBlockedNodes(int rows, const int *rowPointers, const int *colIndices, s
// actually perform coloring
for (c = 0; c < MAX_COLORS; c++) {
int rowsInColor = 0;
unsigned int rowsInColor = 0;
colsInColor = 0;
for (int i = 0; i < rows; i++)
{
@ -104,16 +105,16 @@ int colorBlockedNodes(int rows, const int *rowPointers, const int *colIndices, s
int j = colIndices[k];
if (!visitedColumns[j]) {
visitedColumns[j] = true;
additionalColsInRow += 3;
additionalColsInRow += block_size;
}
}
if ((colsInColor + additionalColsInRow) > maxColsPerColor) {
if ((colsInColor + additionalColsInRow) > static_cast<unsigned int>(maxColsPerColor)) {
break;
}
colsInColor += additionalColsInRow;
colors[i] = c;
rowsInColor += 3;
if ((rowsInColor + 2) >= maxRowsPerColor) {
rowsInColor += block_size;
if ((rowsInColor + block_size - 1) >= static_cast<unsigned int>(maxRowsPerColor)) {
break;
}
}
@ -298,12 +299,13 @@ int *findLevelScheduling(int *CSRColIndices, int *CSRRowPointers, int *CSCColInd
/* Perform the complete graph coloring algorithm on a matrix. Return an array with the amount of nodes per color.*/
template <unsigned int block_size>
int* findGraphColoring(int *colIndices, int *rowPointers, int Nb, int maxRowsPerColor, int maxColsPerColor, int *numColors, int *toOrder, int* fromOrder) {
std::vector<int> rowColor;
rowColor.resize(Nb);
int *rowsPerColor = new int[MAX_COLORS];
colorBlockedNodes(Nb, rowPointers, colIndices, rowColor, maxRowsPerColor, maxColsPerColor);
colorBlockedNodes<block_size>(Nb, rowPointers, colIndices, rowColor, maxRowsPerColor, maxColsPerColor);
colorsToReordering(Nb, rowColor, toOrder, fromOrder, rowsPerColor);
@ -357,10 +359,12 @@ void bcsr_to_bcsc(double *Avals, int *Acols, int *Arows, double *Bvals, int *Bco
}
#define INSTANTIATE_BDA_FUNCTIONS(n) \
template void blocked_reorder_matrix_by_pattern<n>(BlockedMatrix *, int *, int *, BlockedMatrix *); \
template void blocked_reorder_vector_by_pattern<n>(int, double*, int*, double*); \
template void bcsr_to_bcsc<n>(double *, int *, int *, double *, int *, int *, int ); \
#define INSTANTIATE_BDA_FUNCTIONS(n) \
template int colorBlockedNodes<n>(int, const int *, const int *, std::vector<int>&, int, int); \
template void blocked_reorder_matrix_by_pattern<n>(BlockedMatrix *, int *, int *, BlockedMatrix *); \
template void blocked_reorder_vector_by_pattern<n>(int, double*, int*, double*); \
template int* findGraphColoring<n>(int *, int *, int, int, int, int *, int *, int *); \
template void bcsr_to_bcsc<n>(double *, int *, int *, double *, int *, int *, int); \
INSTANTIATE_BDA_FUNCTIONS(1);
INSTANTIATE_BDA_FUNCTIONS(2);

2
opm/simulators/linalg/bda/Reorder.hpp
View File

@ -38,6 +38,7 @@ namespace bda
/// \param[in] maxRowsPerColor the maximum number of rows that are allowed in one color (so: the maximum number of nodes per color)
/// \param[in] maxColsPerColor the maximum number of columns that the rows in a color are allowed to share (so: the maximum number of nodes that the nodes in one color may be connected to)
/// \return the number of colors needed for the coloring
template <unsigned int block_size>
int colorBlockedNodes(int rows, const int *rowPointers, const int *colIndices, std::vector<int>& colors, int maxRowsPerColor, int maxColsPerColor);
/// Reorder the rows of the matrix according to the mapping in toOrder and fromOrder
@ -100,6 +101,7 @@ int* findLevelScheduling(int *CSRColIndices, int *CSRRowPointers, int *CSCColInd
/// \param[inout] toOrder the reorder pattern that was found, which lists for each index in the original order, to which index in the new order it should be moved
/// \param[inout] fromOrder the reorder pattern that was found, which lists for each index in the new order, from which index in the original order it was moved
/// \return a pointer to an array that contains for each color, the number of rows that that color contains
template <unsigned int block_size>
int* findGraphColoring(int *colIndices, int *rowPointers, int Nb, int maxRowsPerColor, int maxColsPerColor, int *numColors, int *toOrder, int* fromOrder);
/// Convert BCSR matrix to BCSC