Commit 91918e66 authored by David Moxey's avatar David Moxey
Browse files

Fix rest of code, adjust strategy slightly

parent 8644f360
......@@ -34,10 +34,14 @@
//
////////////////////////////////////////////////////////////////////////////////
#include <boost/geometry.hpp>
#include <FieldUtils/Interpolator.h>
using namespace std;
namespace bg = boost::geometry;
namespace bgi = boost::geometry::index;
namespace Nektar
{
namespace FieldUtils
......
......@@ -39,7 +39,6 @@
#include <vector>
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/box.hpp>
#include <boost/geometry/geometries/point.hpp>
#include <boost/geometry/index/rtree.hpp>
......@@ -56,9 +55,6 @@
#include "FieldUtilsDeclspec.h"
namespace bg = boost::geometry;
namespace bgi = boost::geometry::index;
namespace Nektar
{
namespace FieldUtils
......@@ -182,9 +178,9 @@ private:
/// dimension of this interpolator. Hardcoded to 3
static const int m_dim = 3;
typedef bg::model::point<NekDouble, m_dim, bg::cs::cartesian> BPoint;
typedef boost::geometry::model::point<NekDouble, m_dim, boost::geometry::cs::cartesian> BPoint;
typedef std::pair<BPoint, unsigned int> PtsPointPair;
typedef bgi::rtree<PtsPointPair, bgi::rstar<16> > PtsRtree;
typedef boost::geometry::index::rtree<PtsPointPair, boost::geometry::index::rstar<16> > PtsRtree;
/// input field
LibUtilities::PtsFieldSharedPtr m_ptsInField;
......
......@@ -36,13 +36,17 @@
#include <string>
using namespace std;
#include <boost/geometry.hpp>
#include "ProcessInterpField.h"
#include <FieldUtils/Interpolator.h>
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/Progressbar.hpp>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <boost/math/special_functions/fpclassify.hpp>
#include "ProcessInterpField.h"
namespace bg = boost::geometry;
namespace bgi = boost::geometry::index;
namespace Nektar
{
......
......@@ -38,13 +38,17 @@
using namespace std;
#include <boost/geometry.hpp>
#include "ProcessInterpPointDataToFld.h"
#include <FieldUtils/Interpolator.h>
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/PtsField.h>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <boost/math/special_functions/fpclassify.hpp>
#include "ProcessInterpPointDataToFld.h"
namespace bg = boost::geometry;
namespace bgi = boost::geometry::index;
namespace Nektar
{
......
......@@ -37,14 +37,19 @@
#include <string>
using namespace std;
#include <boost/geometry.hpp>
#include "ProcessInterpPoints.h"
#include <FieldUtils/Interpolator.h>
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/Progressbar.hpp>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/math/special_functions/fpclassify.hpp>
#include "ProcessInterpPoints.h"
namespace bg = boost::geometry;
namespace bgi = boost::geometry::index;
namespace Nektar
{
......
......@@ -35,6 +35,11 @@
#include <string>
#include <iostream>
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/point.hpp>
#include <boost/geometry/geometries/box.hpp>
#include <boost/geometry/index/rtree.hpp>
#include "ProcessIsoContour.h"
#include <LibUtilities/BasicUtils/SharedArray.hpp>
......@@ -42,11 +47,6 @@
#include <LibUtilities/BasicUtils/Progressbar.hpp>
#include <boost/math/special_functions/fpclassify.hpp>
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/point.hpp>
#include <boost/geometry/geometries/box.hpp>
#include <boost/geometry/index/rtree.hpp>
namespace bg = boost::geometry;
namespace bgi = boost::geometry::index;
......
......@@ -36,18 +36,9 @@
#ifndef FIELDUTILS_PROCESSISOCONTOUR
#define FIELDUTILS_PROCESSISOCONTOUR
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/point.hpp>
#include <boost/geometry/geometries/box.hpp>
#include <boost/geometry/index/rtree.hpp>
#include "../Module.h"
#include "ProcessEquiSpacedOutput.h"
namespace bg = boost::geometry;
namespace bgi = boost::geometry::index;
namespace Nektar
{
namespace FieldUtils
......
......@@ -32,14 +32,15 @@
// Description: cad object methods.
//
////////////////////////////////////////////////////////////////////////////////
#include "CADSurf.h"
#include "CADCurve.h"
#include <boost/geometry.hpp>
#include <boost/geometry/algorithms/assign.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/polygon.hpp>
#include "CADSurf.h"
#include "CADCurve.h"
namespace bg = boost::geometry;
typedef bg::model::d2::point_xy<double> point_xy;
......
......@@ -32,6 +32,12 @@
// Description: tet meshing methods
//
////////////////////////////////////////////////////////////////////////////////
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/box.hpp>
#include <boost/geometry/geometries/point.hpp>
#include <boost/geometry/index/rtree.hpp>
#include <LibUtilities/BasicUtils/Progressbar.hpp>
#include <NekMeshUtils/CADSystem/CADSurf.h>
......@@ -42,11 +48,6 @@
#include <algorithm>
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/box.hpp>
#include <boost/geometry/geometries/point.hpp>
#include <boost/geometry/index/rtree.hpp>
namespace bg = boost::geometry;
namespace bgi = boost::geometry::index;
......
......@@ -36,14 +36,14 @@
#ifndef SOLVERUTILS_DRIVER_H
#define SOLVERUTILS_DRIVER_H
#include <SolverUtils/EquationSystem.h>
#include <SolverUtils/SolverUtils.hpp>
#include <LibUtilities/Communication/Comm.h>
#include <LibUtilities/BasicUtils/SessionReader.h>
#include <LibUtilities/BasicUtils/NekFactory.hpp>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <SolverUtils/SolverUtils.hpp>
#include <SolverUtils/EquationSystem.h>
namespace Nektar
{
namespace SolverUtils
......
......@@ -33,7 +33,7 @@
//
///////////////////////////////////////////////////////////////////////////////
#include <FieldUtils/Interpolator.h>
#include <SolverUtils/EquationSystem.h>
#include <LocalRegions/MatrixKey.h>
......
......@@ -36,7 +36,6 @@
#ifndef NEKTAR_SOLVERUTILS_EQUATIONSYSTEM_H
#define NEKTAR_SOLVERUTILS_EQUATIONSYSTEM_H
#include <FieldUtils/Interpolator.h>
#include <LibUtilities/Communication/Comm.h>
#include <LibUtilities/BasicUtils/SessionReader.h>
#include <LibUtilities/BasicUtils/NekFactory.hpp>
......@@ -52,6 +51,9 @@
namespace Nektar
{
namespace FieldUtils {
class Interpolator;
}
namespace SolverUtils
{
class EquationSystem;
......
......@@ -36,12 +36,12 @@
#ifndef NEKTAR_SOLVERUTILS_FILTER_FILTER_H
#define NEKTAR_SOLVERUTILS_FILTER_FILTER_H
#include <SolverUtils/EquationSystem.h>
#include <SolverUtils/SolverUtilsDeclspec.h>
#include <LibUtilities/BasicUtils/NekFactory.hpp>
#include <LibUtilities/BasicUtils/SessionReader.h>
#include <MultiRegions/ExpList.h>
#include <SolverUtils/EquationSystem.h>
#include <SolverUtils/SolverUtilsDeclspec.h>
namespace Nektar
{
......
......@@ -33,7 +33,6 @@
//
///////////////////////////////////////////////////////////////////////////////
#include <SolverUtils/Filters/FilterAeroForces.h>
#include <LibUtilities/Memory/NekMemoryManager.hpp>
#include <iomanip>
#include <boost/algorithm/string.hpp>
......@@ -43,6 +42,7 @@
#include <MultiRegions/ExpList2D.h>
#include <MultiRegions/ExpList3D.h>
#include <MultiRegions/ExpList3DHomogeneous1D.h>
#include <SolverUtils/Filters/FilterAeroForces.h>
using namespace std;
......
......@@ -36,10 +36,10 @@
#include <iostream>
#include <iomanip>
#include <SolverUtils/UnsteadySystem.h>
#include <LibUtilities/TimeIntegration/TimeIntegrationWrapper.h>
#include <LibUtilities/BasicUtils/Timer.h>
#include <MultiRegions/AssemblyMap/AssemblyMapDG.h>
#include <SolverUtils/UnsteadySystem.h>
using namespace std;
......
......@@ -36,9 +36,9 @@
#ifndef NEKTAR_SOLVERUTILS_UNSTEADYSYSTEM_H
#define NEKTAR_SOLVERUTILS_UNSTEADYSYSTEM_H
#include <LibUtilities/TimeIntegration/TimeIntegrationWrapper.h>
#include <SolverUtils/EquationSystem.h>
#include <SolverUtils/Filters/Filter.h>
#include <LibUtilities/TimeIntegration/TimeIntegrationWrapper.h>
namespace Nektar
{
......
......@@ -33,6 +33,8 @@
//
////////////////////////////////////////////////////////////////////////////////
#include <FieldUtils/Interpolator.h>
#include <LocalRegions/SegExp.h>
#include <LocalRegions/QuadExp.h>
#include <LocalRegions/TriExp.h>
......@@ -41,8 +43,6 @@
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <LibUtilities/BasicUtils/PtsIO.h>
#include <FieldUtils/Interpolator.h>
#include <NekMeshUtils/MeshElements/Element.h>
#include "ProcessCurve.h"
......
......@@ -33,14 +33,14 @@
//
////////////////////////////////////////////////////////////////////////////////
#include <NekMeshUtils/MeshElements/Element.h>
#include "ProcessInsertSurface.h"
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/point.hpp>
#include <boost/geometry/geometries/box.hpp>
#include <boost/geometry/index/rtree.hpp>
#include <NekMeshUtils/MeshElements/Element.h>
#include "ProcessInsertSurface.h"
namespace bg = boost::geometry;
namespace bgi = boost::geometry::index;
......
......@@ -33,6 +33,11 @@
//
////////////////////////////////////////////////////////////////////////////////
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/point.hpp>
#include <boost/geometry/geometries/box.hpp>
#include <boost/geometry/index/rtree.hpp>
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <LibUtilities/BasicUtils/Progressbar.hpp>
......@@ -46,11 +51,6 @@
#include "ProcessSpherigon.h"
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/point.hpp>
#include <boost/geometry/geometries/box.hpp>
#include <boost/geometry/index/rtree.hpp>
namespace bg = boost::geometry;
namespace bgi = boost::geometry::index;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment