diff options
Diffstat (limited to 'src/refinement/grid2D.hh')
| -rw-r--r-- | src/refinement/grid2D.hh | 16 |
1 files changed, 3 insertions, 13 deletions
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)); } } |