Skip to content

Changed: Return type of virtual advanceStep() method #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kmokstad wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Changed: Return type of virtual advanceStep() method #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions HeatTransfer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ class HeatTransfer : public IntegrandBase
//! \param[in] n Number of spatial dimensions
//! \param[in] itg Main integrand instance
Robin(unsigned short int n, const HeatTransfer& itg);
//! \brief Empty destructor.
virtual ~Robin() {}

//! \brief Returns that this integrand has no interior contributions.
bool hasInteriorTerms() const override { return false; }
Expand Down Expand Up @@ -93,9 +91,6 @@ class HeatTransfer : public IntegrandBase
bool mass = true,
TimeIntegration::Method method = TimeIntegration::BE);

//! \brief Empty destructor.
virtual ~HeatTransfer() {}

using IntegrandBase::initElement;
//! \brief Initializes current element for numerical integration.
//! \param[in] MNPC Matrix of nodal point correspondance for current element
Expand Down Expand Up @@ -130,19 +125,18 @@ class HeatTransfer : public IntegrandBase
bool evalBou(LocalIntegral& elmInt, const FiniteElement& fe,
const Vec3& X, const Vec3& normal) const override;

//! \brief Returns a const ref to the problem properties.
//! \brief Returns a const reference to the problem properties.
const HMProperties& getProps() const { return props; }
//! \brief Returns a reference to the problem properties.
HMProperties& getProps() { return props; }

//! \brief Advance time stepping
void advanceStep() { bdf.advanceStep(); }
//! \brief Advance time stepping.
bool advanceStep() override { return bdf.advanceStep(); }

//! \brief True if mass terms are enabled.
//! \brief Returns \e true if mass terms are enabled.
bool enableMass() const { return withMass; }

//! \brief Returns the name of the primary solution field.
//! \param[in] prefix Name prefix
std::string getField1Name (size_t, const char* prefix) const override;

protected:
Expand Down
22 changes: 8 additions & 14 deletions MassTransfer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ class MassTransfer : public IntegrandBase
//! \param[in] n Number of spatial dimensions
//! \param[in] itg Main integrand instance
Robin(unsigned short int n, const MassTransfer& itg);
//! \brief Empty destructor.
virtual ~Robin() {}

//! \brief Returns that this integrand has no interior contributions.
bool hasInteriorTerms() const override { return false; }
Expand Down Expand Up @@ -91,9 +89,6 @@ class MassTransfer : public IntegrandBase
explicit MassTransfer(unsigned short int,
TimeIntegration::Method method = TimeIntegration::BE);

//! \brief Empty destructor.
virtual ~MassTransfer() {}

using IntegrandBase::initElement;
//! \brief Initializes current element for numerical integration.
//! \param[in] MNPC Matrix of nodal point correspondance for current element
Expand All @@ -109,17 +104,16 @@ class MassTransfer : public IntegrandBase
bool evalInt(LocalIntegral& elmInt, const FiniteElement& fe,
const TimeDomain& time, const Vec3& X) const override;

//! \brief Returns a const ref to the problem properties.
const HMProperties& getProps() const { return props; }
//! \brief Returns a reference to the problem properties.
HMProperties& getProps() { return props; }
//! \brief Returns a const reference to the problem properties.
const HMProperties& getProps() const { return props; }
//! \brief Returns a reference to the problem properties.
HMProperties& getProps() { return props; }

//! \brief Advance time stepping
void advanceStep() { bdf.advanceStep(); }
//! \brief Advance time stepping.
bool advanceStep() override { return bdf.advanceStep(); }

//! \brief Returns the name of the primary solution field.
//! \param[in] prefix Name prefix
std::string getField1Name (size_t, const char* prefix) const override;
//! \brief Returns the name of the primary solution field.
std::string getField1Name(size_t, const char* prefix) const override;

protected:
HMProperties props; //!< Material properties
Expand Down