Removing unnecessary includes in SpatialDomains

library/Demos/LocalRegions/LocPrismExpDemo.cpp

@@ -5,6 +5,8 @@
 #include "LibUtilities/Foundations/Foundations.hpp"
 #include "LibUtilities/Foundations/Basis.h"
 #include "SpatialDomains/MeshComponents.h"
+#include "SpatialDomains/TriGeom.h"
+#include "SpatialDomains/QuadGeom.h"
 #include "LibUtilities/BasicConst/NektarUnivTypeDefs.hpp"
 
 

library/Demos/LocalRegions/LocPyrExpDemo.cpp

@@ -6,6 +6,8 @@
 #include "LibUtilities/Foundations/Basis.h"
 
 #include "SpatialDomains/MeshComponents.h"
+#include "SpatialDomains/TriGeom.h"
+#include "SpatialDomains/QuadGeom.h"
 
 
 #include <algorithm>

library/Demos/LocalRegions/LocTetExpDemo.cpp

@@ -4,8 +4,10 @@
 
 #include "LibUtilities/Foundations/Foundations.hpp"
 #include "LibUtilities/Foundations/Basis.h"
-#include "SpatialDomains/MeshComponents.h"
 #include "LibUtilities/BasicConst/NektarUnivTypeDefs.hpp"
+#include "SpatialDomains/MeshComponents.h"
+#include "SpatialDomains/TriGeom.h"
+#include "SpatialDomains/QuadGeom.h"
 
 #include <algorithm>
 #include <iostream>

library/LocalRegions/Expansion2D.h

@@ -39,6 +39,7 @@
 #include <LocalRegions/Expansion.h>
 #include <LocalRegions/Expansion1D.h>
 #include <LocalRegions/LocalRegionsDeclspec.h>
+#include <StdRegions/StdExpansion2D.h>
 
 namespace Nektar
 {

library/LocalRegions/Expansion3D.h

@@ -38,6 +38,7 @@
 #include <LocalRegions/Expansion.h>
 #include <LocalRegions/Expansion2D.h>
 #include <LocalRegions/LocalRegionsDeclspec.h>
+#include <StdRegions/StdExpansion3D.h>
 
 namespace Nektar
 {

library/LocalRegions/TetExp.cpp

@@ -34,6 +34,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <LocalRegions/TetExp.h>
+#include <SpatialDomains/SegGeom.h>
+
 #include <LibUtilities/Foundations/Interp.h>
 
 

library/MultiRegions/ExpListHomogeneous1D.cpp

@@ -35,6 +35,7 @@
 
 #include <MultiRegions/ExpListHomogeneous1D.h>
 #include "LibUtilities/Foundations/ManagerAccess.h"  // for PointsManager, etc
+#include <StdRegions/StdSegExp.h>
 
 namespace Nektar
 {

library/MultiRegions/ExpListHomogeneous2D.cpp

@@ -35,6 +35,8 @@
 
 #include <MultiRegions/ExpListHomogeneous2D.h>
 #include "LibUtilities/Foundations/ManagerAccess.h"  // for PointsManager, etc
+#include <StdRegions/StdSegExp.h>
+#include <StdRegions/StdQuadExp.h>
 
 namespace Nektar
 {

library/SolverUtils/AdvectionFR.cpp

@@ -35,6 +35,7 @@
 
 #include <SolverUtils/AdvectionFR.h>
 #include "LibUtilities/Foundations/ManagerAccess.h"  // for PointsManager, etc
+#include <StdRegions/StdSegExp.h>
 
 namespace Nektar
 {

library/SpatialDomains/Conditions.cpp

@@ -34,14 +34,9 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <SpatialDomains/pchSpatialDomains.h>
-
 #include <LibUtilities/BasicUtils/Equation.h>
 #include <LibUtilities/BasicUtils/ParseUtils.hpp>
 #include <SpatialDomains/Conditions.h>
-#include <cctype>
-#include <algorithm>
-#include <string>
 
 namespace Nektar
 {

library/SpatialDomains/Conditions.h

@@ -38,23 +38,19 @@
 
 #include <string>
 #include <map>
-#include <iostream>
-#include <sstream>
+#include <tinyxml/tinyxml.h>
 
 #include <LibUtilities/BasicUtils/SessionReader.h>
-#include <LibUtilities/BasicConst/NektarUnivTypeDefs.hpp>
+#include <LibUtilities/BasicUtils/Equation.h>
 #include <SpatialDomains/MeshGraph.h>
-//#include <LibUtilities/BasicUtils/Equation.h>
-//#include <SpatialDomains/SpatialDomainsDeclspec.h>
 
-class TiXmlElement;
-class TiXmlDocument;
-
-class SpatialDomainsDeclspec;
-class Equation;
 
 namespace Nektar
 {
+    struct OneD;
+    class SpatialDomainsDeclspec;
+    class Equation;
+
     namespace SpatialDomains
     {
         enum BoundaryConditionType

library/SpatialDomains/GeomFactors.cpp

@@ -33,11 +33,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "pchSpatialDomains.h"
-
 #include <SpatialDomains/GeomFactors.h>
-#include <SpatialDomains/Geometry2D.h>
-#include <LibUtilities/Foundations/Interp.h>
 
 namespace Nektar
 {

library/SpatialDomains/GeomFactors.h

@@ -38,20 +38,25 @@
 
 #include <boost/unordered_set.hpp>
 
-#include <LibUtilities/Foundations/Points.h>
+#include <LibUtilities/Foundations/Basis.h>
 #include <SpatialDomains/SpatialDomains.hpp>
-#include <StdRegions/StdExpansion1D.h>
-#include <StdRegions/StdExpansion2D.h>
-#include <StdRegions/StdExpansion3D.h>
 #include <SpatialDomains/SpatialDomainsDeclspec.h>
+#include <StdRegions/StdExpansion.h>    // for StdExpansionSharedPtr
+#include <StdRegions/StdRegions.hpp>
+
 
 namespace Nektar
 {
+    namespace LibUtilities
+    {
+        class PointsKey;
+    }
+
     namespace SpatialDomains
     {
         // Forward declarations and useful typedefs
         class GeomFactors;
-        class GeomFactors2D;
+        class Geometry;
         typedef boost::shared_ptr<Geometry> GeometrySharedPtr;
 
         SPATIAL_DOMAINS_EXPORT bool operator==(const GeomFactors &lhs, const GeomFactors &rhs);

library/SpatialDomains/GeomFactors1D.cpp

@@ -33,7 +33,6 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-//#include <SpatialDomains/GeomFactors2D.h>
 #include <SpatialDomains/Geometry2D.h>
 
 #include <SpatialDomains/GeomFactors1D.h>

library/SpatialDomains/GeomFactors1D.h

@@ -37,8 +37,8 @@
 #define NEKTAR_SPATIALDOMAINS_GEOMFACTORS1D_H
 
 #include <SpatialDomains/GeomFactors.h>
-#include <StdRegions/StdExpansion2D.h>
 #include <SpatialDomains/SpatialDomainsDeclspec.h>
+#include "StdRegions/StdExpansion1D.h"  // for StdExpansion1DSharedPtr
 
 namespace Nektar
 {

library/SpatialDomains/GeomFactors2D.cpp

@@ -34,7 +34,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <SpatialDomains/GeomFactors2D.h>
-#include <SpatialDomains/Geometry.h>
 #include <LibUtilities/Foundations/Interp.h>
 
 namespace Nektar

library/SpatialDomains/GeomFactors2D.h

@@ -37,8 +37,8 @@
 #define NEKTAR_SPATIALDOMAINS_GEOMFACTORS2D_H
 
 #include <SpatialDomains/GeomFactors.h>
-#include <StdRegions/StdExpansion3D.h>
 #include <SpatialDomains/SpatialDomainsDeclspec.h>
+#include "StdRegions/StdExpansion2D.h"  // for StdExpansion2DSharedPtr
 
 namespace Nektar
 {

library/SpatialDomains/GeomFactors3D.cpp

@@ -33,10 +33,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include <boost/lexical_cast.hpp>
-
 #include <SpatialDomains/GeomFactors3D.h>
-#include <SpatialDomains/Geometry.h>
 #include <LibUtilities/Foundations/Interp.h>
 
 namespace Nektar

library/SpatialDomains/GeomFactors3D.h

@@ -38,13 +38,14 @@
 
 #include <SpatialDomains/GeomFactors.h>
 #include <SpatialDomains/SpatialDomainsDeclspec.h>
+#include <StdRegions/StdExpansion3D.h>
 
 namespace Nektar
 {
+
     namespace SpatialDomains
     {
         // Forward declarations
-        class GeomFactors3D;
 
         /// Geometric factors for a 3D expansions.
         class GeomFactors3D : public GeomFactors

library/SpatialDomains/Geometry.h

@@ -37,20 +37,18 @@
 #ifndef NEKTAR_SPATIALDOMAINS_GEOMETRY_H
 #define NEKTAR_SPATIALDOMAINS_GEOMETRY_H
 
-//#include <SpatialDomains/SpatialDomains.hpp>
 #include <SpatialDomains/GeomFactors.h>
 
 #include <boost/unordered_set.hpp>
 #include <boost/functional/hash.hpp>
 #include <boost/shared_ptr.hpp>
 #include <SpatialDomains/SpatialDomainsDeclspec.h>
+
 namespace Nektar
 {
     namespace SpatialDomains
     {
 
-        class Geometry1D;
-
         // Types of geometry types.
         enum GeomShapeType
         {