diff --git a/src/PostprocessData/region/regionPoints/rectMeshRegionPoints/rectMeshRegionPoints.cpp b/src/PostprocessData/region/regionPoints/rectMeshRegionPoints/rectMeshRegionPoints.cpp index bc253d6d..ad78e18d 100644 --- a/src/PostprocessData/region/regionPoints/rectMeshRegionPoints/rectMeshRegionPoints.cpp +++ b/src/PostprocessData/region/regionPoints/rectMeshRegionPoints/rectMeshRegionPoints.cpp @@ -2,10 +2,8 @@ #include "fieldsDataBase.hpp" #include "numericConstants.hpp" -namespace pFlow::postprocessData -{ -rectMeshRegionPoints::rectMeshRegionPoints +pFlow::postprocessData::rectMeshRegionPoints::rectMeshRegionPoints ( const dictionary &dict, fieldsDataBase &fieldsDataBase @@ -13,16 +11,13 @@ rectMeshRegionPoints::rectMeshRegionPoints : regionPoints(dict, fieldsDataBase) { - const auto& rectMeshInfo = dict.subDict("rectMeshInfo"); - - auto minP = rectMeshInfo.getVal("min"); - auto maxP = rectMeshInfo.getVal("max"); - auto nx = rectMeshInfo.getValMax("nx", 1); - auto ny = rectMeshInfo.getValMax("ny", 1); - auto nz = rectMeshInfo.getValMax("nz", 1); + boxRegion_ = box(rectMeshInfo.subDict("boxInfo")); + nx = rectMeshInfo.getValMax("nx", 1); + ny = rectMeshInfo.getValMax("ny", 1); + nz = rectMeshInfo.getValMax("nz", 1); - boxRegion_ = box(minP, maxP); + // boxRegion_ = box(minP, maxP); cells_ = uint32x3(nx, ny, nz); uint32 nCells = nx * ny * nz; @@ -52,7 +47,7 @@ rectMeshRegionPoints::rectMeshRegionPoints } } -bool rectMeshRegionPoints::update() +bool pFlow::postprocessData::rectMeshRegionPoints::update() { const auto points = database().updatePoints(); for (auto& elem : selectedPoints_) @@ -78,21 +73,39 @@ bool rectMeshRegionPoints::update() return true; } -bool rectMeshRegionPoints::write(iOstream &os) const +bool pFlow::postprocessData::rectMeshRegionPoints::write(iOstream &os) const { - os << "# rect mesh region points\n"; - os <<"# min point: "<< boxRegion_.minPoint() << endl; - os <<"# max point: "<< boxRegion_.maxPoint() << endl; - os <<"# nx: "<< cells_.x() <