summaryrefslogtreecommitdiff
path: root/src/refinement
diff options
context:
space:
mode:
authorAdrian Kummerlaender2019-01-14 15:42:21 +0100
committerAdrian Kummerlaender2019-06-24 15:17:09 +0200
commit9546a228faa725df3a1956995f5c247ac8c79f51 (patch)
tree623dcd1f37a98630ee6ca98e4fe18d993b27284a /src/refinement
parentdd658eec1f3d716fa18ceb990b924b38721ecdeb (diff)
downloadgrid_refinement_openlb-9546a228faa725df3a1956995f5c247ac8c79f51.tar
grid_refinement_openlb-9546a228faa725df3a1956995f5c247ac8c79f51.tar.gz
grid_refinement_openlb-9546a228faa725df3a1956995f5c247ac8c79f51.tar.bz2
grid_refinement_openlb-9546a228faa725df3a1956995f5c247ac8c79f51.tar.lz
grid_refinement_openlb-9546a228faa725df3a1956995f5c247ac8c79f51.tar.xz
grid_refinement_openlb-9546a228faa725df3a1956995f5c247ac8c79f51.tar.zst
grid_refinement_openlb-9546a228faa725df3a1956995f5c247ac8c79f51.zip
Remove unnecessary managed pointers
Diffstat (limited to 'src/refinement')
-rw-r--r--src/refinement/coupler2D.hh6
-rw-r--r--src/refinement/grid2D.h2
-rw-r--r--src/refinement/grid2D.hh16
3 files changed, 6 insertions, 18 deletions
diff --git a/src/refinement/coupler2D.hh b/src/refinement/coupler2D.hh
index 1d773f3..3bd2b2f 100644
--- a/src/refinement/coupler2D.hh
+++ b/src/refinement/coupler2D.hh
@@ -75,7 +75,7 @@ Coupler2D<T,DESCRIPTOR>::Coupler2D(Grid2D<T,DESCRIPTOR>& coarse, Grid2D<T,DESCRI
_physOrigin = coarseGeometry.getPhysR(tmpLatticeOrigin.toStdVector());
const T deltaX = _fine.getConverter().getPhysDeltaX();
- const Vector<T,2> stepPhysR = _vertical ? Vector<T,2>{0, deltaX} : Vector<T,2>{deltaX, 0};
+ const Vector<T,2> stepPhysR = _vertical ? Vector<T,2> {0, deltaX} : Vector<T,2> {deltaX, 0};
for (int i=0; i < _fineSize; ++i) {
if (i % 2 == 0) {
@@ -186,7 +186,7 @@ void FineCoupler2D<T,DESCRIPTOR>::couple()
Cell<T,DESCRIPTOR> cell;
fineLattice.get(finePos, cell);
for (int iPop=0; iPop < DESCRIPTOR<T>::q; ++iPop) {
- cell[iPop] = fEq[iPop] + this->getScalingFactor() * _c2f_fneq[y][iPop];
+ cell[iPop] = fEq[iPop] + this->getScalingFactor() * _c2f_fneq[y][iPop];
}
fineLattice.set(finePos, cell);
}
@@ -309,7 +309,7 @@ void computeRestrictedFneq(const SuperLattice2D<T,DESCRIPTOR>& lattice,
T restrictedFneq[DESCRIPTOR<T>::q])
{
for (int iPop=0; iPop < DESCRIPTOR<T>::q; ++iPop) {
- const auto neighbor = latticeR + Vector<int,3>{0, DESCRIPTOR<T>::c[iPop][0], DESCRIPTOR<T>::c[iPop][1]};
+ const auto neighbor = latticeR + Vector<int,3> {0, DESCRIPTOR<T>::c[iPop][0], DESCRIPTOR<T>::c[iPop][1]};
Cell<T,DESCRIPTOR> cell;
lattice.get(neighbor, cell);
diff --git a/src/refinement/grid2D.h b/src/refinement/grid2D.h
index d782651..9a20544 100644
--- a/src/refinement/grid2D.h
+++ b/src/refinement/grid2D.h
@@ -60,8 +60,6 @@ protected:
std::vector<std::unique_ptr<CoarseCoupler2D<T,DESCRIPTOR>>> _coarseCouplers;
public:
- static std::unique_ptr<Grid2D<T,DESCRIPTOR>> make(IndicatorF2D<T>& domainF, int resolution, T tau, int re);
-
Grid2D(FunctorPtr<IndicatorF2D<T>>&& domainF, int resolution, T tau, int re);
UnitConverter<T,DESCRIPTOR>& getConverter();
diff --git a/src/refinement/grid2D.hh b/src/refinement/grid2D.hh
index aa82240..02fe351 100644
--- a/src/refinement/grid2D.hh
+++ b/src/refinement/grid2D.hh
@@ -34,16 +34,6 @@ namespace olb {
template <typename T, template<typename> class DESCRIPTOR>
-std::unique_ptr<Grid2D<T,DESCRIPTOR>> Grid2D<T,DESCRIPTOR>::make(
- IndicatorF2D<T>& domainF,
- int resolution, T tau, int re)
-{
- return std::unique_ptr<Grid2D<T,DESCRIPTOR>>(
- new Grid2D<T,DESCRIPTOR>(domainF, resolution, tau, re)
- );
-}
-
-template <typename T, template<typename> class DESCRIPTOR>
Grid2D<T,DESCRIPTOR>::Grid2D(FunctorPtr<IndicatorF2D<T>>&& domainF, int resolution, T tau, int re):
_domainF(std::move(domainF)),
_converter(new UnitConverterFromResolutionAndRelaxationTime<T,DESCRIPTOR>(
@@ -62,7 +52,7 @@ Grid2D<T,DESCRIPTOR>::Grid2D(FunctorPtr<IndicatorF2D<T>>&& domainF, int resoluti
#else
1
#endif
- )),
+ )),
_balancer(new HeuristicLoadBalancer<T>(
*_cuboids)),
_geometry(new SuperGeometry2D<T>(
@@ -191,7 +181,7 @@ RefiningGrid2D<T,DESCRIPTOR>& Grid2D<T,DESCRIPTOR>::refine(
addFineCoupling(fineGrid, origin, extendX);
const T coarseDeltaX = getConverter().getPhysDeltaX();
- const Vector<T,2> innerOrigin = origin + coarseDeltaX;
+ const Vector<T,2> innerOrigin = origin + coarseDeltaX;
const Vector<T,2> innerExtendX = extendX - Vector<T,2> {2*coarseDeltaX,0};
const Vector<T,2> innerExtendY = extendY - Vector<T,2> {0,2*coarseDeltaX};
@@ -244,7 +234,7 @@ std::unique_ptr<IndicatorF2D<T>> RefiningGrid2D<T,DESCRIPTOR>::getRefinedOverlap
const T coarseDeltaX = _parentGrid.getConverter().getPhysDeltaX();
return std::unique_ptr<IndicatorF2D<T>>(
- new IndicatorCuboid2D<T>(_extend - 4*coarseDeltaX, _origin + 2*coarseDeltaX));
+ new IndicatorCuboid2D<T>(_extend - 4*coarseDeltaX, _origin + 2*coarseDeltaX));
}
}