Skip to content
Snippets Groups Projects
Commit 8e443e64 authored by Timo Koch's avatar Timo Koch
Browse files

Merge branch 'feature/make-tensor-gridcreator-more-flexible' into 'master'

[io][gridcreator] Make construction of tensorgrid more flexible

See merge request !759
parents c93fda81 c19d5f00
No related branches found
No related tags found
1 merge request!759[io][gridcreator] Make construction of tensorgrid more flexible
...@@ -666,6 +666,20 @@ public: ...@@ -666,6 +666,20 @@ public:
grading[i] = getParamFromGroup<std::vector<ctype>>(modelParamGroup, "Grid.Grading" + std::to_string(i), grading[i]); grading[i] = getParamFromGroup<std::vector<ctype>>(modelParamGroup, "Grid.Grading" + std::to_string(i), grading[i]);
} }
// call the generic function
makeGrid(positions, cells, grading, modelParamGroup);
}
/*!
* \brief Make the grid using input data not read from the input file.
*/
static void makeGrid(const std::array<std::vector<ctype>, dim>& positions,
const std::array<std::vector<int>, dim>& cells,
const std::array<std::vector<ctype>, dim>& grading,
const std::string& modelParamGroup = "")
{
// Additional arameters (they have a default) // Additional arameters (they have a default)
const auto periodic = getParamFromGroup<std::bitset<dim>>(modelParamGroup, "Grid.Periodic", std::bitset<dim>()); const auto periodic = getParamFromGroup<std::bitset<dim>>(modelParamGroup, "Grid.Periodic", std::bitset<dim>());
const int overlap = YaspOverlapHelper<DiscMethod>::getOverlap(modelParamGroup); const int overlap = YaspOverlapHelper<DiscMethod>::getOverlap(modelParamGroup);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment