portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-11-04 14:04:32 +00:00
Code Releases Activity

WilsonMG: Some minor refactoring

Browse Source
This commit is contained in:
Daniel Richtmann
2018-03-26 15:34:53 +02:00
parent 683a7d2ddd
commit 63ba33371f
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/solver/Test_wilsonclover_mg.cc
View File

@@ -70,14 +70,14 @@ public:
}; };
// clang-format off // clang-format off
struct MultigridParams : Serializable { struct MultiGridParams : Serializable {
public: public:
GRID_SERIALIZABLE_CLASS_MEMBERS(MultigridParams, GRID_SERIALIZABLE_CLASS_MEMBERS(MultiGridParams,
int, nLevels, int, nLevels,
std::vector<std::vector<int>>, blockSizes); std::vector<std::vector<int>>, blockSizes);
MultigridParams(){}; MultiGridParams(){};
}; };
MultigridParams mgParams; MultiGridParams mgParams;
// clang-format on // clang-format on
struct LevelInfo { struct LevelInfo {
@@ -86,11 +86,11 @@ public:
std::vector<GridCartesian *> Grids; std::vector<GridCartesian *> Grids;
std::vector<GridParallelRNG> PRNGs; std::vector<GridParallelRNG> PRNGs;
LevelInfo(GridCartesian *FineGrid, MultigridParams const &Params) { LevelInfo(GridCartesian *FineGrid, MultiGridParams const &mgParams) {
auto nCoarseLevels = Params.blockSizes.size(); auto nCoarseLevels = mgParams.blockSizes.size();
assert(nCoarseLevels == Params.nLevels - 1); assert(nCoarseLevels == mgParams.nLevels - 1);
// set up values for finest grid // set up values for finest grid
Grids.push_back(FineGrid); Grids.push_back(FineGrid);
@@ -99,7 +99,7 @@ public:
PRNGs.back().SeedFixedIntegers(Seeds.back()); PRNGs.back().SeedFixedIntegers(Seeds.back());
// set up values for coarser grids // set up values for coarser grids
for(int level = 1; level < Params.nLevels; ++level) { for(int level = 1; level < mgParams.nLevels; ++level) {
auto Nd = Grids[level - 1]->_ndimension; auto Nd = Grids[level - 1]->_ndimension;
auto tmp = Grids[level - 1]->_fdimensions; auto tmp = Grids[level - 1]->_fdimensions;
assert(tmp.size() == Nd); assert(tmp.size() == Nd);
@@ -107,7 +107,7 @@ public:
Seeds.push_back(std::vector<int>(Nd)); Seeds.push_back(std::vector<int>(Nd));
for(int d = 0; d < Nd; ++d) { for(int d = 0; d < Nd; ++d) {
tmp[d] /= Params.blockSizes[level - 1][d]; tmp[d] /= mgParams.blockSizes[level - 1][d];
Seeds[level][d] = (level)*Nd + d + 1; Seeds[level][d] = (level)*Nd + d + 1;
} }
@@ -117,7 +117,7 @@ public:
PRNGs[level].SeedFixedIntegers(Seeds[level]); PRNGs[level].SeedFixedIntegers(Seeds[level]);
} }
std::cout << GridLogMessage << "Constructed " << Params.nLevels << " levels" << std::endl; std::cout << GridLogMessage << "Constructed " << mgParams.nLevels << " levels" << std::endl;
// The construction above corresponds to the finest level having level == 0 // The construction above corresponds to the finest level having level == 0
// (simply because it's not as ugly to implement), but we need it the // (simply because it's not as ugly to implement), but we need it the
@@ -128,7 +128,7 @@ public:
std::reverse(Grids.begin(), Grids.end()); std::reverse(Grids.begin(), Grids.end());
std::reverse(PRNGs.begin(), PRNGs.end()); std::reverse(PRNGs.begin(), PRNGs.end());
for(int level = 0; level < Params.nLevels; ++level) { for(int level = 0; level < mgParams.nLevels; ++level) {
std::cout << GridLogMessage << "level = " << level << ":" << std::endl; std::cout << GridLogMessage << "level = " << level << ":" << std::endl;
Grids[level]->show_decomposition(); Grids[level]->show_decomposition();
} }