Required changes for stationary, semi-implicit simulations

This commit is contained in:
Arne Morten Kvarving
2020-04-21 13:36:57 +02:00
parent 94a2ad20eb
commit f62f7d15bc
6 changed files with 10 additions and 6 deletions

View File

@@ -43,8 +43,9 @@ public:
if (maxIter < 0)
maxIter = std::min(this->S1.getMaxit(),this->S2.getMaxit());
this->S1.getProcessAdm().cout <<"\n step="<< tp.step
<<" time="<< tp.time.t << std::endl;
if (tp.multiSteps())
this->S1.getProcessAdm().cout <<"\n step="<< tp.step
<<" time="<< tp.time.t << std::endl;
SIM::ConvStatus conv = SIM::OK;
for (tp.iter = 0; tp.iter <= maxIter && conv != SIM::CONVERGED; tp.iter++)

View File

@@ -370,6 +370,9 @@ public:
//! \brief Returns the number of bases in the model.
int getNoBasis() const { return m_planes.front()->getNoBasis(); }
//! \brief Returns the number of solution vectors.
size_t getNoSolutions() const { return m_planes.front()->getNoSolutions(); }
protected:
std::vector<PlaneSolver*> m_planes; //!< Planar solvers

View File

@@ -46,7 +46,7 @@ protected:
//! \brief Saves point results to output file for a given time step.
//! \param[in] time Load/time step parameter
//! \param[in] step Load/time step counter
//! \param[in] iStep Load/time step counter
bool savePoints(double time, int iStep) const override
{
return model.savePoints(time, iStep);

View File

@@ -211,7 +211,7 @@ public:
//! \brief Copy refinement to another surface.
//! \param basis Surface to copy refinement to
//! \param mult Wanted multiplicity
//! \param multiplicity Wanted multiplicity
void copyRefinement(LR::LRSplineSurface* basis, int multiplicity) const;
protected:

View File

@@ -176,7 +176,7 @@ public:
//! \brief Copy refinement to another volume.
//! \param basis Volume to copy refinement to
//! \param mult Wanted multiplicity
//! \param multiplicity Wanted multiplicity
void copyRefinement(LR::LRSplineVolume* basis, int multiplicity) const;
private:

View File

@@ -75,7 +75,7 @@ public:
//! \brief Saves point results to output file for a given time step.
//! \param[in] time Load/time step parameter
//! \param[in] step Load/time step counter
//! \param[in] Step Load/time step counter
//! \details By default it just forwards to the underlying model
virtual bool savePoints(double time, int iStep) const;