Skip to content

Commit

Permalink
header changes to satisfy iwyu
Browse files Browse the repository at this point in the history
  • Loading branch information
akva2 committed Oct 11, 2021
1 parent 8531e45 commit e62b9e8
Show file tree
Hide file tree
Showing 18 changed files with 187 additions and 30 deletions.
4 changes: 4 additions & 0 deletions AdvectionDiffusionArgs.C
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
#include "Utilities.h"
#include "tinyxml.h"

#include <cstring>
#include <string>
#include <strings.h>


bool AdvectionDiffusionArgs::parseArg (const char* argv)
{
Expand Down
3 changes: 3 additions & 0 deletions AdvectionDiffusionArgs.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
#include "TimeIntUtils.h"


class TiXmlElement;


/*!
\brief Class holding application parameters.
*/
Expand Down
17 changes: 16 additions & 1 deletion Common/AdvectionDiffusion/ADFluidProperties.C
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,20 @@
#include "ADFluidProperties.h"

#include "IFEM.h"
#include "tinyxml.h"
#include "Functions.h"
#include "LogStream.h"
#include "Function.h"
#include "Utilities.h"
#include "Vec3.h"

#include <cassert>
#include <map>
#include <ostream>
#include "tinyxml.h"
#include <utility>
#include <vector>


namespace AD {

FluidProperties::FluidProperties() :
Expand All @@ -27,6 +37,11 @@ FluidProperties::FluidProperties() :
}


FluidProperties::~FluidProperties()
{
}


void FluidProperties::parse(const TiXmlElement* elem)
{
// Type of scaling to use
Expand Down
5 changes: 4 additions & 1 deletion Common/AdvectionDiffusion/ADFluidProperties.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
#ifndef _AD_FLUID_PROPERTIES_H
#define _AD_FLUID_PROPERTIES_H

#include "Functions.h"
#include <memory>
#include <string>

class RealFunc;
class TiXmlElement;
class Vec3;

Expand All @@ -39,6 +39,9 @@ class FluidProperties
//! \brief Empty constructor.
FluidProperties();

//! \brief Destructor.
~FluidProperties();

//! \brief Parses material parementers from an XML element.
void parse(const TiXmlElement*);

Expand Down
14 changes: 12 additions & 2 deletions Common/AdvectionDiffusion/AdvectionDiffusion.C
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,23 @@
//==============================================================================

#include "AdvectionDiffusion.h"
#include "FiniteElement.h"
#include "ElmNorm.h"

#include "AnaSol.h"
#include "ElmNorm.h"
#include "FiniteElement.h"
#include "Function.h"
#include "Fields.h"
#include "Integrand.h"
#include "LocalIntegral.h"
#include "Vec3.h"
#include "Vec3Oper.h"

#include <algorithm>
#include <cmath>
#include <ext/alloc_traits.h>
#include <iostream>
#include <vector>


AdvectionDiffusion::AdvectionDiffusion (unsigned short int n,
AdvectionDiffusion::Stabilization s)
Expand Down
16 changes: 14 additions & 2 deletions Common/AdvectionDiffusion/AdvectionDiffusion.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,27 @@
#ifndef _ADVECTION_DIFFUSION_H
#define _ADVECTION_DIFFUSION_H

#include "IntegrandBase.h"
#include "ADFluidProperties.h"

#include "ElmMats.h"
#include "EqualOrderOperators.h"
#include "ADFluidProperties.h"
#include "IntegrandBase.h"
#include "MatVec.h"
#include "SIMenums.h"
#include "TimeIntUtils.h"

#include <array>
#include <cstddef>
#include <memory>
#include <string>


class AnaSol;
class Fields;
class FiniteElement;
class LocalIntegral;
class RealFunc;
class Vec3;
class VecFunc;


Expand Down
22 changes: 17 additions & 5 deletions Common/AdvectionDiffusion/AdvectionDiffusionBDF.C
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,26 @@
//==============================================================================

#include "AdvectionDiffusionBDF.h"
#include "ADFluidProperties.h"

#include "FiniteElement.h"
#include "TimeDomain.h"
#include "ElmNorm.h"
#include "AnaSol.h"
#include "Fields.h"
#include "Function.h"
#include "Vec3Oper.h"
#include "Utilities.h"
#include "LocalIntegral.h"
#include "StabilizationUtils.h"
#include "TimeDomain.h"
#include "Utilities.h"
#include "Vec3Oper.h"

#include <array>
#include <cstddef>
#include <ext/alloc_traits.h>
#include <iostream>
#include <memory>


class AnaSol;
class NormBase;


AdvectionDiffusionBDF::AdvectionDiffusionBDF (unsigned short int n,
Expand Down
17 changes: 13 additions & 4 deletions Common/AdvectionDiffusion/AdvectionDiffusionBDF.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,20 @@

#include "AdvectionDiffusion.h"
#include "BDF.h"
#include "Integrand.h"
#include "MatVec.h"
#include "SIMenums.h"
#include "TimeIntUtils.h"
#include "Fields.h"
#include "TimeIntUtils.h"
#include <array>
#include <memory>

#include <vector>


class AnaSol;
class FiniteElement;
class LocalIntegral;
class NormBase;
class Vec3;
struct TimeDomain;


/*!
Expand Down
15 changes: 14 additions & 1 deletion Common/AdvectionDiffusion/AdvectionDiffusionExplicit.C
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,21 @@
//==============================================================================

#include "AdvectionDiffusionExplicit.h"
#include "FiniteElement.h"
#include "ADFluidProperties.h"

#include "ElmMats.h"
#include "Function.h"
#include "MatVec.h"
#include "Vec3.h"

#include <ext/alloc_traits.h>
#include <memory>
#include <vector>


class FiniteElement;
class LocalIntegral;
class NormBase;


AdvectionDiffusionExplicit::AdvectionDiffusionExplicit (unsigned short int n,
Expand Down
12 changes: 12 additions & 0 deletions Common/AdvectionDiffusion/AdvectionDiffusionExplicit.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,20 @@
#define _ADVECTION_DIFFUSION_EXPLICIT_H

#include "AdvectionDiffusion.h"

#include "Integrand.h"
#include "SIMenums.h"
#include "TimeIntUtils.h"

#include <cstddef>


class AnaSol;
class FiniteElement;
class LocalIntegral;
class NormBase;
class Vec3;


/*!
\brief Class representing the integrand of a time-dependent
Expand Down
16 changes: 15 additions & 1 deletion Common/AdvectionDiffusion/AdvectionDiffusionImplicit.C
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,25 @@
//==============================================================================

#include "AdvectionDiffusionImplicit.h"
#include "ADFluidProperties.h"

#include "ElmMats.h"
#include "FiniteElement.h"
#include "Function.h"
#include "TimeDomain.h"
#include "MatVec.h"
#include "matrix.h"
#include "Vec3.h"
#include "Vec3Oper.h"

#include <cstddef>
#include <memory>
#include <vector>


class AnaSol;
class LocalIntegral;
class NormBase;


AdvectionDiffusionImplicit::AdvectionDiffusionImplicit (unsigned short int n,
TimeIntegration::Method method,
Expand Down
11 changes: 11 additions & 0 deletions Common/AdvectionDiffusion/AdvectionDiffusionImplicit.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,20 @@
#define _ADVECTION_DIFFUSION_IMPLICIT_H

#include "AdvectionDiffusion.h"

#include "Integrand.h"
#include "SIMenums.h"
#include "TimeIntUtils.h"


class AnaSol;
class FiniteElement;
class LocalIntegral;
class NormBase;
struct TimeDomain;
class Vec3;


/*!
\brief Class representing the integrand of Advection-Diffusion problem
with implicit time stepping.
Expand Down
10 changes: 7 additions & 3 deletions Common/AdvectionDiffusion/AdvectionDiffusionSource.C
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,17 @@
//==============================================================================

#include "AdvectionDiffusionSource.h"
#include "ExprFunctions.h"
#include "IFEM.h"
#include "ADFluidProperties.h"

#include "Functions.h"
#include "Vec3Oper.h"
#include "IFEM.h"
#include "LogStream.h"
#include "Utilities.h"
#include "Vec3Oper.h"

#include <ostream>
#include <string>
#include <vector>
#include <tinyxml.h>


Expand Down
2 changes: 2 additions & 0 deletions Common/AdvectionDiffusion/AdvectionDiffusionSource.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

#include <memory>


class Vec3;
class TiXmlElement;


Expand Down
12 changes: 11 additions & 1 deletion Common/AdvectionDiffusion/SIMAD.C
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,29 @@
#include "AdvectionDiffusionExplicit.h"
#include "AdvectionDiffusionImplicit.h"
#include "AdvectionDiffusionSource.h"

#include "AnaSol.h"
#include "ASMstruct.h"
#include "DataExporter.h"
#include "EqualOrderOperators.h"
#include "ExprFunctions.h"
#include "IFEM.h"
#include "IntegrandBase.h"
#include "LogStream.h"
#include "Profiler.h"
#include "SIM1D.h"
#include "SIM2D.h"
#include "SIM3D.h"
#include "TimeStep.h"
#include "tinyxml.h"
#include "Utilities.h"

#include <cmath>
#include <cstdlib>
#include <ostream>
#include "strings.h"
#include "tinyxml.h"
#include <utility>


template<class Dim, class Integrand>
SIMAD<Dim,Integrand>::SIMAD (Integrand& ad, bool alone) :
Expand Down
6 changes: 6 additions & 0 deletions Common/AdvectionDiffusion/SIMAD.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#ifndef _SIM_AD_H
#define _SIM_AD_H

#include "MatVec.h"
#include "SIMMultiPatchModelGen.h"
#include "SIMsolution.h"
#include "SIMconfigure.h"
Expand All @@ -22,10 +23,15 @@
#include "PETScSupport.h"
#endif

#include <cstddef>
#include <iosfwd>
#include <string>


class DataExporter;
class SIMoutput;
class TimeStep;
class TiXmlElement;


/*!
Expand Down
6 changes: 6 additions & 0 deletions Test/TestSIMAD.C
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,15 @@
//!
//==============================================================================

#include "AdvectionDiffusion.h"
#include "AdvectionDiffusionBDF.h"
#include "ADFluidProperties.h"
#include "SIMAD.h"

#include "SIM2D.h"
#include "TimeIntUtils.h"

#include <string>

#include "gtest/gtest.h"

Expand Down
Loading

0 comments on commit e62b9e8

Please sign in to comment.