From 2d937dfa5578ec88cf01e10e94ad2d4963364b9b Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Thu, 11 May 2017 10:28:45 +0200 Subject: [PATCH] add using statements to quell warnings --- Apps/Common/SIMNodalConstraint.h | 1 + src/ASM/ASMs1D.h | 1 + src/ASM/ASMs1DLag.h | 1 + src/ASM/ASMs1DSpec.h | 1 + src/ASM/ASMs2DLag.h | 2 ++ src/ASM/ASMs2DSpec.h | 1 + src/ASM/ASMs2DTri.h | 1 + src/ASM/ASMs2Dmx.h | 3 +++ src/ASM/ASMs2DmxLag.h | 2 ++ src/ASM/ASMs3DSpec.h | 1 + src/ASM/ASMs3Dmx.h | 1 + src/ASM/ASMs3DmxLag.h | 1 + src/ASM/GlbL2projector.h | 3 +++ src/ASM/LR/ASMu2D.h | 1 + src/ASM/LR/ASMu2Dmx.h | 2 ++ src/ASM/LR/ASMu3D.h | 1 + src/LinAlg/SPRMatrix.h | 2 ++ src/LinAlg/SparseMatrix.h | 1 + src/SIM/GenAlphaSIM.h | 1 + src/SIM/HHTSIM.h | 1 + src/SIM/NewmarkNLSIM.h | 1 + src/SIM/Test/TestSIM.C | 1 + 22 files changed, 30 insertions(+) diff --git a/Apps/Common/SIMNodalConstraint.h b/Apps/Common/SIMNodalConstraint.h index 421b7834..9b2fdb28 100644 --- a/Apps/Common/SIMNodalConstraint.h +++ b/Apps/Common/SIMNodalConstraint.h @@ -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) { diff --git a/src/ASM/ASMs1D.h b/src/ASM/ASMs1D.h index 0c278f0a..00860a0a 100644 --- a/src/ASM/ASMs1D.h +++ b/src/ASM/ASMs1D.h @@ -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 diff --git a/src/ASM/ASMs1DLag.h b/src/ASM/ASMs1DLag.h index ef3dea7a..3ec53000 100644 --- a/src/ASM/ASMs1DLag.h +++ b/src/ASM/ASMs1DLag.h @@ -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; } diff --git a/src/ASM/ASMs1DSpec.h b/src/ASM/ASMs1DSpec.h index 12049ca2..a3d108e3 100644 --- a/src/ASM/ASMs1DSpec.h +++ b/src/ASM/ASMs1DSpec.h @@ -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 diff --git a/src/ASM/ASMs2DLag.h b/src/ASM/ASMs2DLag.h index 8bd51c88..819b078d 100644 --- a/src/ASM/ASMs2DLag.h +++ b/src/ASM/ASMs2DLag.h @@ -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 diff --git a/src/ASM/ASMs2DSpec.h b/src/ASM/ASMs2DSpec.h index 96536b75..11688e27 100644 --- a/src/ASM/ASMs2DSpec.h +++ b/src/ASM/ASMs2DSpec.h @@ -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 diff --git a/src/ASM/ASMs2DTri.h b/src/ASM/ASMs2DTri.h index da730e59..79f60a57 100644 --- a/src/ASM/ASMs2DTri.h +++ b/src/ASM/ASMs2DTri.h @@ -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); }; diff --git a/src/ASM/ASMs2Dmx.h b/src/ASM/ASMs2Dmx.h index cccc6628..1638ed29 100644 --- a/src/ASM/ASMs2Dmx.h +++ b/src/ASM/ASMs2Dmx.h @@ -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 diff --git a/src/ASM/ASMs2DmxLag.h b/src/ASM/ASMs2DmxLag.h index db2749cf..f53e8a15 100644 --- a/src/ASM/ASMs2DmxLag.h +++ b/src/ASM/ASMs2DmxLag.h @@ -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 diff --git a/src/ASM/ASMs3DSpec.h b/src/ASM/ASMs3DSpec.h index 4a1def95..eedaa520 100644 --- a/src/ASM/ASMs3DSpec.h +++ b/src/ASM/ASMs3DSpec.h @@ -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 diff --git a/src/ASM/ASMs3Dmx.h b/src/ASM/ASMs3Dmx.h index 92e4cf00..039fa7d9 100644 --- a/src/ASM/ASMs3Dmx.h +++ b/src/ASM/ASMs3Dmx.h @@ -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 diff --git a/src/ASM/ASMs3DmxLag.h b/src/ASM/ASMs3DmxLag.h index 0d9f2203..ee6fd5c7 100644 --- a/src/ASM/ASMs3DmxLag.h +++ b/src/ASM/ASMs3DmxLag.h @@ -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 diff --git a/src/ASM/GlbL2projector.h b/src/ASM/GlbL2projector.h index 9d52cf17..04b5383e 100644 --- a/src/ASM/GlbL2projector.h +++ b/src/ASM/GlbL2projector.h @@ -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&, 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 diff --git a/src/ASM/LR/ASMu2D.h b/src/ASM/LR/ASMu2D.h index 69d6f634..ee759029 100644 --- a/src/ASM/LR/ASMu2D.h +++ b/src/ASM/LR/ASMu2D.h @@ -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 diff --git a/src/ASM/LR/ASMu2Dmx.h b/src/ASM/LR/ASMu2Dmx.h index f135ea4f..768875f0 100644 --- a/src/ASM/LR/ASMu2Dmx.h +++ b/src/ASM/LR/ASMu2Dmx.h @@ -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 diff --git a/src/ASM/LR/ASMu3D.h b/src/ASM/LR/ASMu3D.h index 588f6311..41929d66 100644 --- a/src/ASM/LR/ASMu3D.h +++ b/src/ASM/LR/ASMu3D.h @@ -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 diff --git a/src/LinAlg/SPRMatrix.h b/src/LinAlg/SPRMatrix.h index 307b784f..d303c78f 100644 --- a/src/LinAlg/SPRMatrix.h +++ b/src/LinAlg/SPRMatrix.h @@ -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*); diff --git a/src/LinAlg/SparseMatrix.h b/src/LinAlg/SparseMatrix.h index 96311c5f..a5a1be3c 100644 --- a/src/LinAlg/SparseMatrix.h +++ b/src/LinAlg/SparseMatrix.h @@ -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 diff --git a/src/SIM/GenAlphaSIM.h b/src/SIM/GenAlphaSIM.h index 15f5bba3..a2480d97 100644 --- a/src/SIM/GenAlphaSIM.h +++ b/src/SIM/GenAlphaSIM.h @@ -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); diff --git a/src/SIM/HHTSIM.h b/src/SIM/HHTSIM.h index 155c1ec0..c5d6791a 100644 --- a/src/SIM/HHTSIM.h +++ b/src/SIM/HHTSIM.h @@ -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); diff --git a/src/SIM/NewmarkNLSIM.h b/src/SIM/NewmarkNLSIM.h index 59d9722c..79085f3b 100644 --- a/src/SIM/NewmarkNLSIM.h +++ b/src/SIM/NewmarkNLSIM.h @@ -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); diff --git a/src/SIM/Test/TestSIM.C b/src/SIM/Test/TestSIM.C index 331ef067..274fe64d 100644 --- a/src/SIM/Test/TestSIM.C +++ b/src/SIM/Test/TestSIM.C @@ -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&) const {