prune some unnecessary includes

Apps/Common/Test/TestSIMCoupled.C

@@ -11,10 +11,8 @@
 //==============================================================================
 
 #include "DataExporter.h"
-#include "Function.h"
 #include "Property.h"
 #include "TimeStep.h"
-#include "matrix.h"
 #include "SIMCoupled.h"
 
 #include "gtest/gtest.h"

src/ASM/ASMs1DSpec.C

@@ -20,7 +20,6 @@
 #include "LocalIntegral.h"
 #include "IntegrandBase.h"
 #include "CoordinateMapping.h"
-#include "Vec3Oper.h"
 #include "Legendre.h"
 #include "Lagrange.h"
 

src/ASM/ASMs2D.C

@@ -37,9 +37,6 @@
 #include "MPC.h"
 #include "IFEM.h"
 #include <array>
-#ifdef USE_OPENMP
-#include <omp.h>
-#endif
 
 
 ASMs2D::ASMs2D (unsigned char n_s, unsigned char n_f)

src/ASM/ASMs2DLag.C

@@ -24,7 +24,6 @@
 #include "GaussQuadrature.h"
 #include "ElementBlock.h"
 #include "Utilities.h"
-#include "Vec3Oper.h"
 #include <array>
 
 

src/ASM/ASMs2DSpec.C

@@ -20,7 +20,6 @@
 #include "LocalIntegral.h"
 #include "IntegrandBase.h"
 #include "CoordinateMapping.h"
-#include "Vec3Oper.h"
 #include "Legendre.h"
 #include <array>
 

src/ASM/ASMs2DTri.C

@@ -23,7 +23,6 @@
 #include "TriangleQuadrature.h"
 #include "GaussQuadrature.h"
 #include "ElementBlock.h"
-#include "Vec3Oper.h"
 #include <numeric>
 
 

src/ASM/ASMs2Dmx.C

@@ -12,7 +12,6 @@
 //==============================================================================
 
 #include "GoTools/geometry/SplineSurface.h"
-#include "GoTools/geometry/SurfaceInterpolator.h"
 
 #include "ASMs2Dmx.h"
 #include "TimeDomain.h"
@@ -22,17 +21,12 @@
 #include "IntegrandBase.h"
 #include "CoordinateMapping.h"
 #include "GaussQuadrature.h"
-#include "SplineFields2D.h"
 #include "SplineUtils.h"
 #include "Utilities.h"
 #include "Point.h"
 #include "Profiler.h"
-#include "Vec3Oper.h"
 #include <array>
 #include <numeric>
-#ifdef USE_OPENMP
-#include <omp.h>
-#endif
 
 
 ASMs2Dmx::ASMs2Dmx (unsigned char n_s, const CharVec& n_f)

src/ASM/ASMs2DmxLag.C

@@ -20,8 +20,6 @@
 #include "IntegrandBase.h"
 #include "CoordinateMapping.h"
 #include "GaussQuadrature.h"
-#include "Utilities.h"
-#include "Vec3Oper.h"
 #include <numeric>
 
 

src/ASM/ASMs2Drecovery.C

@@ -24,7 +24,6 @@
 #include "SparseMatrix.h"
 #include "DenseMatrix.h"
 #include "SplineUtils.h"
-#include "Utilities.h"
 #include "Profiler.h"
 #include <array>
 

src/ASM/ASMs3DSpec.C

@@ -20,7 +20,6 @@
 #include "LocalIntegral.h"
 #include "IntegrandBase.h"
 #include "CoordinateMapping.h"
-#include "Vec3Oper.h"
 #include "Legendre.h"
 #include <array>
 

src/ASM/ASMs3Dmx.C

@@ -12,7 +12,6 @@
 //==============================================================================
 
 #include "GoTools/trivariate/SplineVolume.h"
-#include "GoTools/trivariate/VolumeInterpolator.h"
 
 #include "ASMs3Dmx.h"
 #include "TimeDomain.h"
@@ -22,12 +21,10 @@
 #include "IntegrandBase.h"
 #include "CoordinateMapping.h"
 #include "GaussQuadrature.h"
-#include "SplineFields3D.h"
 #include "SplineUtils.h"
 #include "Utilities.h"
 #include "Point.h"
 #include "Profiler.h"
-#include "Vec3Oper.h"
 #include <array>
 #include <numeric>
 #ifdef USE_OPENMP

src/ASM/ASMs3DmxLag.C

@@ -20,8 +20,6 @@
 #include "IntegrandBase.h"
 #include "CoordinateMapping.h"
 #include "GaussQuadrature.h"
-#include "Utilities.h"
-#include "Vec3Oper.h"
 #include <numeric>
 
 

src/ASM/ASMs3Drecovery.C

@@ -22,7 +22,6 @@
 #include "GlbL2projector.h"
 #include "SparseMatrix.h"
 #include "SplineUtils.h"
-#include "Utilities.h"
 #include "Profiler.h"
 #include <array>
 

src/ASM/AlgEqSystem.h

@@ -15,7 +15,15 @@
 #define _ALG_EQ_SYSTEM_H
 
 #include "GlobalIntegral.h"
-#include "SystemMatrix.h"
+#include "LinAlgenums.h"
+#include "MatVec.h"
+
+
+class LinSolParams;
+class ProcessAdm;
+class SAM;
+class SystemMatrix;
+class SystemVector;
 
 
 /*!

src/ASM/LR/ASMLRSpline.C

@@ -11,17 +11,18 @@
 //!
 //==============================================================================
 
-#include "LRSpline/LRSplineSurface.h"
+#include "ASMLRSpline.h"
+
+#include "LRSpline/LRSpline.h"
 #include "LRSpline/Basisfunction.h"
+#include "LRSpline/Element.h"
 
-#include "ASMLRSpline.h"
 #include "Vec3.h"
 #include "Vec3Oper.h"
 #include "ThreadGroups.h"
 #include "Utilities.h"
 #include "Profiler.h"
 #include "IFEM.h"
-#include <fstream>
 
 #ifdef USE_OPENMP
 #include <omp.h>

src/ASM/LR/ASMu2D.h

@@ -28,7 +28,6 @@ namespace utl {
 }
 
 namespace Go {
-  class SplineCurve;
   class SplineSurface;
   struct BasisPtsSf;
   struct BasisDerivsSf;

src/ASM/LR/ASMu2Dmx.C

@@ -13,9 +13,7 @@
 
 #include "ASMu2Dmx.h"
 
-#include "GoTools/geometry/ObjectHeader.h"
 #include "GoTools/geometry/SplineSurface.h"
-#include "GoTools/geometry/SurfaceInterpolator.h"
 
 #include "LRSpline/LRSplineSurface.h"
 #include "LRSpline/Element.h"
@@ -29,12 +27,9 @@
 #include "IntegrandBase.h"
 #include "CoordinateMapping.h"
 #include "GaussQuadrature.h"
-#include "Fields.h"
 #include "SplineUtils.h"
-#include "Utilities.h"
 #include "Point.h"
 #include "Profiler.h"
-#include "Vec3Oper.h"
 #include "Vec3.h"
 
 #include <array>

src/ASM/LR/ASMu2Drecovery.C

@@ -17,6 +17,7 @@
 #include "ASMu2D.h"
 #include "IntegrandBase.h"
 #include "CoordinateMapping.h"
+#include "Function.h"
 #include "GaussQuadrature.h"
 #include "GlbL2projector.h"
 #include "SparseMatrix.h"

src/ASM/LR/ASMu3Dmx.C

@@ -13,7 +13,6 @@
 
 #include "ASMu3Dmx.h"
 
-#include "GoTools/geometry/ObjectHeader.h"
 #include "GoTools/trivariate/SplineVolume.h"
 
 #include "LRSpline/LRSplineVolume.h"
@@ -28,12 +27,9 @@
 #include "IntegrandBase.h"
 #include "CoordinateMapping.h"
 #include "GaussQuadrature.h"
-#include "Fields.h"
 #include "SplineUtils.h"
-#include "Utilities.h"
 #include "Point.h"
 #include "Profiler.h"
-#include "Vec3Oper.h"
 #include "Vec3.h"
 
 #include <array>

src/ASM/LR/ASMu3Drecovery.C

@@ -17,6 +17,7 @@
 #include "ASMu3D.h"
 #include "IntegrandBase.h"
 #include "CoordinateMapping.h"
+#include "Function.h"
 #include "GaussQuadrature.h"
 #include "GlbL2projector.h"
 #include "SparseMatrix.h"

src/ASM/LR/LRSplineField3D.C

@@ -15,8 +15,8 @@
 
 #include "LRSplineField3D.h"
 #include "ASMu3D.h"
-#include "FiniteElement.h"
 #include "CoordinateMapping.h"
+#include "ItgPoint.h"
 #include "Vec3.h"
 
 

src/ASM/LR/LRSplineFields2Dmx.h

@@ -19,10 +19,6 @@
 
 class ASMu2Dmx;
 
-namespace LR {
-  class LRSplineSurface;
-}
-
 
 /*!
   \brief Class for mixed LR spline-based finite element vector fields in 2D.

src/ASM/LR/LRSplineFields3Dmx.h

@@ -19,10 +19,6 @@
 
 class ASMu3Dmx;
 
-namespace LR {
-  class LRSplineVolume;
-}
-
 
 /*!
   \brief Class for LR spline-based finite element vector fields in 3D.

src/ASM/SplineFields2Dmx.h

@@ -19,10 +19,6 @@
 
 class ASMs2Dmx;
 
-namespace Go {
-  class SplineSurface;
-}
-
 
 /*!
   \brief Class for mixed spline-based finite element vector fields in 2D.

src/ASM/SplineFields3Dmx.h

@@ -19,10 +19,6 @@
 
 class ASMs3Dmx;
 
-namespace Go {
-  class SplineVolume;
-}
-
 
 /*!
   \brief Class for mixed spline-based finite element vector fields in 3D.

src/SIM/NewmarkSIM.C

@@ -17,6 +17,7 @@
 #include "TimeStep.h"
 #include "IFEM.h"
 #include "Profiler.h"
+#include "SystemMatrix.h"
 #include "Utilities.h"
 #include "tinyxml.h"
 

src/SIM/SIMbase.C

@@ -28,6 +28,7 @@
 #include "GlbL2projector.h"
 #include "ElmNorm.h"
 #include "AnaSol.h"
+#include "SystemMatrix.h"
 #include "TensorFunction.h"
 #include "Vec3Oper.h"
 #include "Utilities.h"

src/SIM/SIMdependency.h

@@ -14,12 +14,13 @@
 #ifndef _SIM_DEPENDENCY_H
 #define _SIM_DEPENDENCY_H
 
-#include "matrix.h"
-#include <string>
 #include <map>
+#include <string>
+#include <vector>
 
 class ASMbase;
 class IntegrandBase;
+namespace utl { template<class T> class vector; }
 
 
 /*!

src/SIM/SIMgeneric.C

@@ -14,6 +14,7 @@
 #include "SIMgeneric.h"
 #include "ModelGenerator.h"
 #include "ASMbase.h"
+#include "Function.h"
 #include "IntegrandBase.h"
 #include "Utilities.h"
 #include "Function.h"

src/Utility/ControlFIFO.C

@@ -15,7 +15,6 @@
 #include "tinyxml.h"
 
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
 

src/Utility/ExprFunctions.C

@@ -15,6 +15,9 @@
 #include "Vec3.h"
 #include "Tensor.h"
 #include "expreval.h"
+#ifdef USE_OPENMP
+#include <omp.h>
+#endif
 
 
 /*!

src/Utility/ExprFunctions.h

@@ -19,9 +19,7 @@
 #include <string>
 #include <vector>
 #include <array>
-#ifdef USE_OPENMP
-#include <omp.h>
-#endif
+
 
 namespace ExprEval {
   class Expression;

src/Utility/HDF5Base.C

@@ -15,7 +15,6 @@
 
 #ifdef HAS_HDF5
 #include <iostream>
-#include <unistd.h>
 #ifdef HAVE_MPI
 #include "ProcessAdm.h"
 #include <mpi.h>

src/Utility/HDF5Reader.C

@@ -18,8 +18,6 @@
 #include <sstream>
 
 #ifdef HAS_HDF5
-#include <numeric>
-#include <unistd.h>
 #ifdef HAVE_MPI
 #include <mpi.h>
 #endif

src/Utility/HDF5Restart.C

@@ -19,7 +19,6 @@
 #ifdef HAS_HDF5
 #include <numeric>
 #include <sys/stat.h>
-#include <unistd.h>
 #include <string.h>
 #ifdef HAVE_MPI
 #include <mpi.h>