add using statements to quell warnings

This commit is contained in:
Arne Morten Kvarving 2017-05-11 10:28:45 +02:00
parent f35429372c
commit 2d937dfa55
22 changed files with 30 additions and 0 deletions

View File

@ -96,6 +96,7 @@ public:
return true;
}
using Dim::parse;
//! \brief Parses a data section from an XML element.
virtual bool parse(const TiXmlElement* elem)
{

View File

@ -213,6 +213,7 @@ public:
const RealArray* gpar, bool = true,
int deriv = 0) const;
using ASMbase::evaluate;
//! \brief Evaluates and interpolates a function over a given geometry.
//! \param[in] func The function to evaluate
//! \param[out] vec The obtained coefficients after interpolation

View File

@ -135,6 +135,7 @@ public:
virtual bool evalSolution(Matrix& sField, const IntegrandBase& integrand,
const RealArray* gpar, bool = true) const;
using ASMs1D::getSize;
//! \brief Returns the number of nodal points in the patch.
virtual int getSize(int = 0) const { return nx; }

View File

@ -58,6 +58,7 @@ public:
// Post-processing methods
// =======================
using ASMs1DLag::evalSolution;
//! \brief Evaluates the secondary solution field at the given points.
//! \param[out] sField Solution field
//! \param[in] integrand Object with problem-specific data and methods

View File

@ -149,11 +149,13 @@ public:
virtual bool evalSolution(Matrix& sField, const IntegrandBase& integrand,
const RealArray* gpar, bool regular = true) const;
using ASMs2D::getSize;
//! \brief Returns the number of nodal points in each parameter direction.
//! \param[out] n1 Number of nodes in first (u) direction
//! \param[out] n2 Number of nodes in second (v) direction
virtual bool getSize(int& n1, int& n2, int = 0) const;
using ASMs2D::generateThreadGroups;
//! \brief Generates element groups for multi-threading of interior integrals.
//! \param[in] silence If \e true, suppress threading group outprint
//! \param[in] ignoreGlobalLM If \e true ignore global multipliers in sanity check

View File

@ -58,6 +58,7 @@ public:
// Post-processing methods
// =======================
using ASMs2DLag::evalSolution;
//! \brief Evaluates the secondary solution field at the given points.
//! \param[out] sField Solution field
//! \param[in] integrand Object with problem-specific data and methods

View File

@ -92,6 +92,7 @@ public:
virtual bool evalSolution(Matrix& sField, const IntegrandBase& integrand,
const RealArray* gpar, bool regular = true) const;
using ASMs2DLag::generateThreadGroups;
//! \brief Generates element groups for multi-threading of interior integrals.
virtual void generateThreadGroups(const Integrand&, bool, bool);
};

View File

@ -150,6 +150,7 @@ public:
virtual bool getSolution(Matrix& sField, const Vector& locSol,
const IntVec& nodes) const;
using ASMs2D::evalSolution;
//! \brief Evaluates the primary solution field at the given points.
//! \param[out] sField Solution field
//! \param[in] locSol Solution vector local to current patch
@ -196,6 +197,7 @@ public:
virtual bool injectNodeVec(const Vector& nodeVec, Vector& globVec,
unsigned char = 0, int basis = 0) const;
using ASMs2D::generateThreadGroups;
//! \brief Generates element groups for multi-threading of interior integrals.
//! \param[in] integrand Object with problem-specific data and methods
//! \param[in] silence If \e true, suppress threading group outprint
@ -203,6 +205,7 @@ public:
virtual void generateThreadGroups(const Integrand& integrand, bool silence,
bool ignoreGlobalLM);
using ASMs2D::getSize;
//! \brief Returns the number of nodal points in each parameter direction.
//! \param[out] n1 Number of nodes in first (u) direction
//! \param[out] n2 Number of nodes in second (v) direction

View File

@ -110,6 +110,7 @@ public:
virtual bool getSolution(Matrix& sField, const Vector& locSol,
const IntVec& nodes) const;
using ASMs2DLag::evalSolution;
//! \brief Evaluates the primary solution field at the given points.
//! \param[out] sField Solution field
//! \param[in] locSol Solution vector local to current patch
@ -139,6 +140,7 @@ protected:
// Internal utility methods
// ========================
using ASMs2DLag::getSize;
//! \brief Returns the number of nodal points in each parameter direction.
//! \param[out] n1 Number of nodes in first (u) direction
//! \param[out] n2 Number of nodes in second (v) direction

View File

@ -65,6 +65,7 @@ public:
// Post-processing methods
// =======================
using ASMs3DLag::evalSolution;
//! \brief Evaluates the secondary solution field at the given points.
//! \param[out] sField Solution field
//! \param[in] integrand Object with problem-specific data and methods

View File

@ -143,6 +143,7 @@ public:
virtual bool getSolution(Matrix& sField, const Vector& locSol,
const IntVec& nodes) const;
using ASMs3D::evalSolution;
//! \brief Evaluates the primary solution field at the given points.
//! \param[out] sField Solution field
//! \param[in] locSol Solution vector local to current patch

View File

@ -110,6 +110,7 @@ public:
virtual bool getSolution(Matrix& sField, const Vector& locSol,
const IntVec& nodes) const;
using ASMs3DLag::evalSolution;
//! \brief Evaluates the primary solution field at the given points.
//! \param[out] sField Solution field
//! \param[in] locSol Solution vector local to current patch

View File

@ -35,6 +35,7 @@ public:
//! \brief Defines which FE quantities are needed by the integrand.
virtual int getIntegrandType() const;
using Integrand::getLocalIntegral;
//! \brief Returns a local integral contribution object for the given element.
//! \param[in] nen Number of nodes on element
//! \param[in] iEl Global element number (1-based)
@ -71,6 +72,7 @@ public:
const std::vector<size_t>&,
LocalIntegral&) { return false; }
using Integrand::evalInt;
//! \brief Evaluates the integrand at an interior point.
//! \param elmInt The local integral object to receive the contributions
//! \param[in] fe Finite element data of current integration point
@ -78,6 +80,7 @@ public:
virtual bool evalInt(LocalIntegral& elmInt,
const FiniteElement& fe, const Vec3& X) const;
using Integrand::evalIntMx;
//! \brief Evaluates the integrand at an interior point.
//! \param elmInt The local integral object to receive the contributions
//! \param[in] fe Mixed finite element data of current integration point

View File

@ -474,6 +474,7 @@ protected:
//! of an element.
bool evaluateBasis(FiniteElement& el, int derivs = 0) const;
using ASMunstruct::generateThreadGroups;
//! \brief Generates element groups for multi-threading of interior integrals.
//! \param[in] integrand Object with problem-specific data and methods
//! \param[in] silence If \e true, suppress threading group outprint

View File

@ -109,6 +109,7 @@ public:
virtual bool getSolution(Matrix& sField, const Vector& locSol,
const IntVec& nodes) const;
using ASMu2D::evalSolution;
//! \brief Evaluates the primary solution field at the given points.
//! \param[out] sField Solution field
//! \param[in] locSol Solution vector local to current patch
@ -172,6 +173,7 @@ public:
const char* fName = nullptr);
protected:
using ASMu2D::generateThreadGroups;
//! \brief Generates element groups for multi-threading of interior integrals.
//! \param[in] integrand Object with problem-specific data and methods
//! \param[in] silence If \e true, suppress threading group outprint

View File

@ -361,6 +361,7 @@ public:
const IntegrandBase& integrand,
bool continuous = false) const;
using ASMunstruct::generateThreadGroups;
//! \brief Generates element groups for multi-threading of interior integrals.
//! \param[in] integrand Object with problem-specific data and methods
//! \param[in] silence If \e true, suppress threading group outprint

View File

@ -56,6 +56,7 @@ public:
//! \brief Initializes the matrix to zero assuming it is properly dimensioned.
virtual void init();
using SystemMatrix::assemble;
//! \brief Adds an element matrix into the associated system matrix.
//! \param[in] eM The element matrix
//! \param[in] sam Auxiliary data describing the FE model topology,
@ -86,6 +87,7 @@ public:
//! \brief Performs the matrix-vector multiplication \b C = \a *this * \b B.
virtual bool multiply(const SystemVector& B, SystemVector& C) const;
using SystemMatrix::solve;
//! \brief Solves the linear system of equations for a given right-hand-side.
//! \param B Right-hand-side vector on input, solution vector on output
virtual bool solve(SystemVector& B, bool, Real*);

View File

@ -199,6 +199,7 @@ public:
//! \brief Performs the matrix-vector multiplication \b C = \a *this * \b B.
virtual bool multiply(const SystemVector& B, SystemVector& C) const;
using SystemMatrix::solve;
//! \brief Solves the linear system of equations for a given right-hand-side.
//! \param B Right-hand-side vector on input, solution vector on output
//! \param[in] newLHS \e true if the left-hand-side matrix has been updated

View File

@ -29,6 +29,7 @@ public:
//! \brief Empty destructor.
virtual ~GenAlphaSIM() {}
using NewmarkSIM::parse;
//! \brief Parses a data section from an XML document.
virtual bool parse(const TiXmlElement* elem);

View File

@ -179,6 +179,7 @@ public:
//! \brief Empty destructor.
virtual ~HHTSIM() {}
using NewmarkSIM::parse;
//! \brief Parses a data section from an XML document.
virtual bool parse(const TiXmlElement* elem);

View File

@ -179,6 +179,7 @@ public:
//! \brief Empty destructor.
virtual ~NewmarkNLSIM() {}
using NewmarkSIM::parse;
//! \brief Parses a data section from an XML document.
virtual bool parse(const TiXmlElement* elem);

View File

@ -39,6 +39,7 @@ private:
public:
TestProjectIntegrand(int dim) : IntegrandBase(dim) {}
using IntegrandBase::evalSol;
virtual bool evalSol(Vector& s, const FiniteElement&, const Vec3& X,
const std::vector<int>&) const
{