Skip to content

Commit 79d59cf

Browse files
kmokstadakva2
authored andcommitted
Changed: AdaptiveSIM::savePoints does not need a time argument,
as this class is for static/stationary problems only. The iStep argument is not a time step counter, but a refinement step counter. Also, the method is made protected.
1 parent 27bec53 commit 79d59cf

File tree

3 files changed

+14
-15
lines changed

3 files changed

+14
-15
lines changed

Apps/Common/SIMSolverAdap.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,11 @@ class AdaptiveISolver : public AdaptiveSIM
4444
return true;
4545
}
4646

47-
//! \brief Saves point results to output file for a given time step.
48-
//! \param[in] time Load/time step parameter
49-
//! \param[in] iStep Load/time step counter
50-
bool savePoints(double time, int iStep) const override
47+
//! \brief Saves point results to output file for a given refinement step.
48+
//! \param[in] iStep Refinement step counter
49+
bool savePoints(int iStep) const override
5150
{
52-
return model.savePoints(time, iStep);
51+
return model.savePoints(0.0,iStep);
5352
}
5453

5554
T1& model; //!< Reference to the actual sim

src/SIM/AdaptiveSIM.C

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ bool AdaptiveSIM::solveStep (const char* inputfile, int iStep, bool withRF,
180180
model.getProcessAdm().cout,true,precision))
181181
return failure();
182182

183-
if (!this->savePoints(0.0, iStep))
183+
if (!this->savePoints(iStep))
184184
return failure();
185185

186186
return true;
@@ -267,7 +267,7 @@ bool AdaptiveSIM::writeGlv (const char* infile, int iStep)
267267
}
268268

269269

270-
bool AdaptiveSIM::savePoints(double time, int iStep) const
270+
bool AdaptiveSIM::savePoints (int iStep) const
271271
{
272-
return model.savePoints(solution.front(), time, iStep);
272+
return model.savePoints(solution.front(),0.0,iStep);
273273
}

src/SIM/AdaptiveSIM.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class AdaptiveSIM : public SIMadmin, public AdaptiveSetup
5353

5454
//! \brief Writes current mesh and results to the VTF-file.
5555
//! \param[in] infile File name used to construct the VTF-file name from
56-
//! \param[in] iStep Refinement step identifier
56+
//! \param[in] iStep Refinement step counter
5757
bool writeGlv(const char* infile, int iStep);
5858

5959
//! \brief Accesses the solution of the linear system.
@@ -78,16 +78,16 @@ class AdaptiveSIM : public SIMadmin, public AdaptiveSetup
7878
//! \param[in] fixDup Merge duplicated FE nodes on patch interfaces?
7979
virtual bool preprocess(const std::vector<int>& ignored, bool fixDup);
8080

81-
//! \brief Saves point results to output file for a given time step.
82-
//! \param[in] time Load/time step parameter
83-
//! \param[in] iStep Load/time step counter
84-
//! \details By default it just forwards to the underlying model
85-
virtual bool savePoints(double time, int iStep) const;
86-
8781
protected:
8882
//! \brief Assembles and solves the linear FE equation system.
8983
virtual bool assembleAndSolveSystem();
9084

85+
//! \brief Saves point results to output file for a given refinement step.
86+
//! \param[in] iStep Refinement step counter
87+
//!
88+
//! \details By default, this method just forwards to the underlying model.
89+
virtual bool savePoints(int iStep) const;
90+
9191
private:
9292
Vectors gNorm; //!< Global norms
9393
Vectors dNorm; //!< Dual global norms

0 commit comments

Comments
 (0)