From 255a4a9dae20f498ab582bf6f7c599f3e535f952 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Fri, 13 Aug 2021 10:40:24 +0200 Subject: [PATCH] prune some unnecessary includes --- Apps/Common/Test/TestSIMCoupled.C | 2 -- src/ASM/ASMs1DSpec.C | 1 - src/ASM/ASMs2D.C | 3 --- src/ASM/ASMs2DLag.C | 1 - src/ASM/ASMs2DSpec.C | 1 - src/ASM/ASMs2DTri.C | 1 - src/ASM/ASMs2Dmx.C | 6 ------ src/ASM/ASMs2DmxLag.C | 2 -- src/ASM/ASMs2Drecovery.C | 1 - src/ASM/ASMs3DSpec.C | 1 - src/ASM/ASMs3Dmx.C | 3 --- src/ASM/ASMs3DmxLag.C | 2 -- src/ASM/ASMs3Drecovery.C | 1 - src/ASM/AlgEqSystem.h | 10 +++++++++- src/ASM/LR/ASMLRSpline.C | 7 ++++--- src/ASM/LR/ASMu2D.h | 1 - src/ASM/LR/ASMu2Dmx.C | 5 ----- src/ASM/LR/ASMu2Drecovery.C | 1 + src/ASM/LR/ASMu3Dmx.C | 4 ---- src/ASM/LR/ASMu3Drecovery.C | 1 + src/ASM/LR/LRSplineField3D.C | 2 +- src/ASM/LR/LRSplineFields2Dmx.h | 4 ---- src/ASM/LR/LRSplineFields3Dmx.h | 4 ---- src/ASM/SplineFields2Dmx.h | 4 ---- src/ASM/SplineFields3Dmx.h | 4 ---- src/SIM/NewmarkSIM.C | 1 + src/SIM/SIMbase.C | 1 + src/SIM/SIMdependency.h | 5 +++-- src/SIM/SIMgeneric.C | 1 + src/Utility/ControlFIFO.C | 1 - src/Utility/ExprFunctions.C | 3 +++ src/Utility/ExprFunctions.h | 4 +--- src/Utility/HDF5Base.C | 1 - src/Utility/HDF5Reader.C | 2 -- src/Utility/HDF5Restart.C | 1 - src/Utility/Test/TestLegendre.C | 1 - src/Utility/Test/TestSplineUtils.C | 1 - src/Utility/Test/TestThreadGroups.C | 1 - 38 files changed, 26 insertions(+), 69 deletions(-) diff --git a/Apps/Common/Test/TestSIMCoupled.C b/Apps/Common/Test/TestSIMCoupled.C index 5750f7950..6748ab93e 100644 --- a/Apps/Common/Test/TestSIMCoupled.C +++ b/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" diff --git a/src/ASM/ASMs1DSpec.C b/src/ASM/ASMs1DSpec.C index 0def0680c..98649bead 100644 --- a/src/ASM/ASMs1DSpec.C +++ b/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" diff --git a/src/ASM/ASMs2D.C b/src/ASM/ASMs2D.C index a8c2923fa..92d8bb27f 100644 --- a/src/ASM/ASMs2D.C +++ b/src/ASM/ASMs2D.C @@ -37,9 +37,6 @@ #include "MPC.h" #include "IFEM.h" #include -#ifdef USE_OPENMP -#include -#endif ASMs2D::ASMs2D (unsigned char n_s, unsigned char n_f) diff --git a/src/ASM/ASMs2DLag.C b/src/ASM/ASMs2DLag.C index 85ee59e1e..3009b663e 100644 --- a/src/ASM/ASMs2DLag.C +++ b/src/ASM/ASMs2DLag.C @@ -24,7 +24,6 @@ #include "GaussQuadrature.h" #include "ElementBlock.h" #include "Utilities.h" -#include "Vec3Oper.h" #include diff --git a/src/ASM/ASMs2DSpec.C b/src/ASM/ASMs2DSpec.C index 13c20c136..3f49b1000 100644 --- a/src/ASM/ASMs2DSpec.C +++ b/src/ASM/ASMs2DSpec.C @@ -20,7 +20,6 @@ #include "LocalIntegral.h" #include "IntegrandBase.h" #include "CoordinateMapping.h" -#include "Vec3Oper.h" #include "Legendre.h" #include diff --git a/src/ASM/ASMs2DTri.C b/src/ASM/ASMs2DTri.C index 749de891c..f6bd6112d 100644 --- a/src/ASM/ASMs2DTri.C +++ b/src/ASM/ASMs2DTri.C @@ -23,7 +23,6 @@ #include "TriangleQuadrature.h" #include "GaussQuadrature.h" #include "ElementBlock.h" -#include "Vec3Oper.h" #include diff --git a/src/ASM/ASMs2Dmx.C b/src/ASM/ASMs2Dmx.C index bd61391c2..d30643507 100644 --- a/src/ASM/ASMs2Dmx.C +++ b/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 #include -#ifdef USE_OPENMP -#include -#endif ASMs2Dmx::ASMs2Dmx (unsigned char n_s, const CharVec& n_f) diff --git a/src/ASM/ASMs2DmxLag.C b/src/ASM/ASMs2DmxLag.C index c0cc7818f..7e1ce1f33 100644 --- a/src/ASM/ASMs2DmxLag.C +++ b/src/ASM/ASMs2DmxLag.C @@ -20,8 +20,6 @@ #include "IntegrandBase.h" #include "CoordinateMapping.h" #include "GaussQuadrature.h" -#include "Utilities.h" -#include "Vec3Oper.h" #include diff --git a/src/ASM/ASMs2Drecovery.C b/src/ASM/ASMs2Drecovery.C index 80025facc..f36c8d96c 100644 --- a/src/ASM/ASMs2Drecovery.C +++ b/src/ASM/ASMs2Drecovery.C @@ -24,7 +24,6 @@ #include "SparseMatrix.h" #include "DenseMatrix.h" #include "SplineUtils.h" -#include "Utilities.h" #include "Profiler.h" #include diff --git a/src/ASM/ASMs3DSpec.C b/src/ASM/ASMs3DSpec.C index eaca63d15..dbbe401de 100644 --- a/src/ASM/ASMs3DSpec.C +++ b/src/ASM/ASMs3DSpec.C @@ -20,7 +20,6 @@ #include "LocalIntegral.h" #include "IntegrandBase.h" #include "CoordinateMapping.h" -#include "Vec3Oper.h" #include "Legendre.h" #include diff --git a/src/ASM/ASMs3Dmx.C b/src/ASM/ASMs3Dmx.C index 555d09dd1..efe9b5440 100644 --- a/src/ASM/ASMs3Dmx.C +++ b/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 #include #ifdef USE_OPENMP diff --git a/src/ASM/ASMs3DmxLag.C b/src/ASM/ASMs3DmxLag.C index 5b51279b0..c0e8ff90f 100644 --- a/src/ASM/ASMs3DmxLag.C +++ b/src/ASM/ASMs3DmxLag.C @@ -20,8 +20,6 @@ #include "IntegrandBase.h" #include "CoordinateMapping.h" #include "GaussQuadrature.h" -#include "Utilities.h" -#include "Vec3Oper.h" #include diff --git a/src/ASM/ASMs3Drecovery.C b/src/ASM/ASMs3Drecovery.C index 3e8ec74ed..0046718f8 100644 --- a/src/ASM/ASMs3Drecovery.C +++ b/src/ASM/ASMs3Drecovery.C @@ -22,7 +22,6 @@ #include "GlbL2projector.h" #include "SparseMatrix.h" #include "SplineUtils.h" -#include "Utilities.h" #include "Profiler.h" #include diff --git a/src/ASM/AlgEqSystem.h b/src/ASM/AlgEqSystem.h index 7e97c33d0..d595d37c9 100644 --- a/src/ASM/AlgEqSystem.h +++ b/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; /*! diff --git a/src/ASM/LR/ASMLRSpline.C b/src/ASM/LR/ASMLRSpline.C index 94cc643d6..bbbfb0cef 100644 --- a/src/ASM/LR/ASMLRSpline.C +++ b/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 #ifdef USE_OPENMP #include diff --git a/src/ASM/LR/ASMu2D.h b/src/ASM/LR/ASMu2D.h index bc57f0ddb..85c2ba947 100644 --- a/src/ASM/LR/ASMu2D.h +++ b/src/ASM/LR/ASMu2D.h @@ -28,7 +28,6 @@ namespace utl { } namespace Go { - class SplineCurve; class SplineSurface; struct BasisPtsSf; struct BasisDerivsSf; diff --git a/src/ASM/LR/ASMu2Dmx.C b/src/ASM/LR/ASMu2Dmx.C index 9e4931543..5655deaf2 100644 --- a/src/ASM/LR/ASMu2Dmx.C +++ b/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 diff --git a/src/ASM/LR/ASMu2Drecovery.C b/src/ASM/LR/ASMu2Drecovery.C index eaeb3bc03..7fb458bbd 100644 --- a/src/ASM/LR/ASMu2Drecovery.C +++ b/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" diff --git a/src/ASM/LR/ASMu3Dmx.C b/src/ASM/LR/ASMu3Dmx.C index 28b13d69f..761894701 100644 --- a/src/ASM/LR/ASMu3Dmx.C +++ b/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 diff --git a/src/ASM/LR/ASMu3Drecovery.C b/src/ASM/LR/ASMu3Drecovery.C index 556640ce6..10a69686d 100644 --- a/src/ASM/LR/ASMu3Drecovery.C +++ b/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" diff --git a/src/ASM/LR/LRSplineField3D.C b/src/ASM/LR/LRSplineField3D.C index ba63ce335..bb78c9b39 100644 --- a/src/ASM/LR/LRSplineField3D.C +++ b/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" diff --git a/src/ASM/LR/LRSplineFields2Dmx.h b/src/ASM/LR/LRSplineFields2Dmx.h index a684fae42..5e0861e8f 100644 --- a/src/ASM/LR/LRSplineFields2Dmx.h +++ b/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. diff --git a/src/ASM/LR/LRSplineFields3Dmx.h b/src/ASM/LR/LRSplineFields3Dmx.h index f8731aa68..bfa72a987 100644 --- a/src/ASM/LR/LRSplineFields3Dmx.h +++ b/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. diff --git a/src/ASM/SplineFields2Dmx.h b/src/ASM/SplineFields2Dmx.h index 9aae32325..14636e4bf 100644 --- a/src/ASM/SplineFields2Dmx.h +++ b/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. diff --git a/src/ASM/SplineFields3Dmx.h b/src/ASM/SplineFields3Dmx.h index aefa89e0c..33f99159d 100644 --- a/src/ASM/SplineFields3Dmx.h +++ b/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. diff --git a/src/SIM/NewmarkSIM.C b/src/SIM/NewmarkSIM.C index 28f74ba01..d759928fe 100644 --- a/src/SIM/NewmarkSIM.C +++ b/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" diff --git a/src/SIM/SIMbase.C b/src/SIM/SIMbase.C index 0fe300ffb..762fc4535 100644 --- a/src/SIM/SIMbase.C +++ b/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" diff --git a/src/SIM/SIMdependency.h b/src/SIM/SIMdependency.h index 5f90cba14..4c2a30f49 100644 --- a/src/SIM/SIMdependency.h +++ b/src/SIM/SIMdependency.h @@ -14,12 +14,13 @@ #ifndef _SIM_DEPENDENCY_H #define _SIM_DEPENDENCY_H -#include "matrix.h" -#include #include +#include +#include class ASMbase; class IntegrandBase; +namespace utl { template class vector; } /*! diff --git a/src/SIM/SIMgeneric.C b/src/SIM/SIMgeneric.C index 4381963f0..15a123ab2 100644 --- a/src/SIM/SIMgeneric.C +++ b/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" diff --git a/src/Utility/ControlFIFO.C b/src/Utility/ControlFIFO.C index 38a7c2e6e..d4ce6db37 100644 --- a/src/Utility/ControlFIFO.C +++ b/src/Utility/ControlFIFO.C @@ -15,7 +15,6 @@ #include "tinyxml.h" #include -#include #include #include diff --git a/src/Utility/ExprFunctions.C b/src/Utility/ExprFunctions.C index 281fe8bed..9626fc700 100644 --- a/src/Utility/ExprFunctions.C +++ b/src/Utility/ExprFunctions.C @@ -15,6 +15,9 @@ #include "Vec3.h" #include "Tensor.h" #include "expreval.h" +#ifdef USE_OPENMP +#include +#endif /*! diff --git a/src/Utility/ExprFunctions.h b/src/Utility/ExprFunctions.h index da28359f7..97f3f2c67 100644 --- a/src/Utility/ExprFunctions.h +++ b/src/Utility/ExprFunctions.h @@ -19,9 +19,7 @@ #include #include #include -#ifdef USE_OPENMP -#include -#endif + namespace ExprEval { class Expression; diff --git a/src/Utility/HDF5Base.C b/src/Utility/HDF5Base.C index e0414363d..837ae8c51 100644 --- a/src/Utility/HDF5Base.C +++ b/src/Utility/HDF5Base.C @@ -15,7 +15,6 @@ #ifdef HAS_HDF5 #include -#include #ifdef HAVE_MPI #include "ProcessAdm.h" #include diff --git a/src/Utility/HDF5Reader.C b/src/Utility/HDF5Reader.C index 9d3b634b7..2beb0b571 100644 --- a/src/Utility/HDF5Reader.C +++ b/src/Utility/HDF5Reader.C @@ -18,8 +18,6 @@ #include #ifdef HAS_HDF5 -#include -#include #ifdef HAVE_MPI #include #endif diff --git a/src/Utility/HDF5Restart.C b/src/Utility/HDF5Restart.C index 4cfb3e184..67769d7e8 100644 --- a/src/Utility/HDF5Restart.C +++ b/src/Utility/HDF5Restart.C @@ -19,7 +19,6 @@ #ifdef HAS_HDF5 #include #include -#include #include #ifdef HAVE_MPI #include diff --git a/src/Utility/Test/TestLegendre.C b/src/Utility/Test/TestLegendre.C index 370c834e5..f3d531e24 100644 --- a/src/Utility/Test/TestLegendre.C +++ b/src/Utility/Test/TestLegendre.C @@ -11,7 +11,6 @@ //============================================================================== #include "Legendre.h" -#include #include "gtest/gtest.h" diff --git a/src/Utility/Test/TestSplineUtils.C b/src/Utility/Test/TestSplineUtils.C index 5fde637b9..71d308c96 100644 --- a/src/Utility/Test/TestSplineUtils.C +++ b/src/Utility/Test/TestSplineUtils.C @@ -19,7 +19,6 @@ #include "GoTools/trivariate/SphereVolume.h" #include "GoTools/trivariate/SplineVolume.h" #include "ExprFunctions.h" -#include #include "gtest/gtest.h" diff --git a/src/Utility/Test/TestThreadGroups.C b/src/Utility/Test/TestThreadGroups.C index 82e24dc50..39e924fc2 100644 --- a/src/Utility/Test/TestThreadGroups.C +++ b/src/Utility/Test/TestThreadGroups.C @@ -14,7 +14,6 @@ #ifdef USE_OPENMP #include #endif -#include #include "gtest/gtest.h"