diff --git a/Apps/Common/SIMCoupled.h b/Apps/Common/SIMCoupled.h index b1c67c58..b247a431 100644 --- a/Apps/Common/SIMCoupled.h +++ b/Apps/Common/SIMCoupled.h @@ -67,12 +67,6 @@ public: return S2.solveStep(tp) && S1.solveStep(tp); } - //! \brief Postprocesses the solution of current time step. - bool postSolve(const TimeStep& tp, bool restart = false) - { - return S1.postSolve(tp,restart) && S2.postSolve(tp,restart); - } - //! \brief Saves the converged results to VTF-file of a given time step. virtual bool saveStep(const TimeStep& tp, int& nBlock) { diff --git a/Apps/Common/SIMSemi3D.h b/Apps/Common/SIMSemi3D.h index 3f27113a..57ed9f82 100644 --- a/Apps/Common/SIMSemi3D.h +++ b/Apps/Common/SIMSemi3D.h @@ -45,7 +45,9 @@ template class SIMSemi3D : public SIMadmin, public SIMdependency { public: - typedef typename PlaneSolver::SetupProps SetupProps; + typedef typename PlaneSolver::SetupProps SetupProps; //!< Convenience type + + //! \brief Enum announcing the dimensionality. enum { dimension = 2 }; //! \brief The constructor initializes the setup properties. @@ -122,7 +124,7 @@ public: } //! \brief Returns the name of this simulator (for use in the HDF5 export). - std::string getName() const { return "Semi3D"; } + virtual std::string getName() const { return "Semi3D"; } //! \brief Adds fields to a data exporter. void registerFields(DataExporter& exporter) @@ -171,11 +173,10 @@ public: return true; } - //! \brief No serialization support. - bool serialize(DataExporter::SerializeData& data) { return false; } - - //! \brief No deserialization support. - bool deSerialize(const DataExporter::SerializeData& data) { return false; } + //! \brief Dummy method, no serialization support. + bool serialize(DataExporter::SerializeData&) { return false; } + //! \brief Dummy method, no deserialization support. + bool deSerialize(const DataExporter::SerializeData&) { return false; } //! \brief Solves the nonlinear equations by Newton-Raphson iterations. bool solveStep(TimeStep& tp) @@ -189,16 +190,6 @@ public: return ok; } - //! \brief Extracts the velocity vector from the nonlinear solution vector. - bool postSolve(const TimeStep& tp, bool restart = false) - { - bool ok = true; - for (size_t i = 0; i < m_planes.size() && ok; i++) - ok = m_planes[i]->postSolve(tp,restart); - - return ok; - } - //! \brief Sets the initial conditions. bool setInitialConditions() { @@ -308,6 +299,7 @@ public: //! \param[in] nvc Number of components in field //! \param[in] patches The geometry the field is defined over //! \param[in] diffBasis Different basis for the SIM class and the field + //! \param[in] component Component to use from field template void registerDependency(SIMSemi3D* sim, const std::string& name, short int nvc, const PatchVec& patches, @@ -372,12 +364,12 @@ public: } //! \brief Dummy method. - int getLocalNode(int node) const { return -1; } + int getLocalNode(int) const { return -1; } //! \brief Dummy method. - int getGlobalNode(int node) const { return -1; } + int getGlobalNode(int) const { return -1; } //! \brief Returns the number of bases in the model. - int getNoBasis() const { return m_planes[0]->getNoBasis(); } + int getNoBasis() const { return m_planes.front()->getNoBasis(); } protected: std::vector m_planes; //!< Planar solvers diff --git a/Apps/Common/SIMSolver.h b/Apps/Common/SIMSolver.h index df4a3fb3..93773e21 100644 --- a/Apps/Common/SIMSolver.h +++ b/Apps/Common/SIMSolver.h @@ -72,11 +72,6 @@ public: //! \brief Advances the time step one step forward. bool advanceStep() { return tp.increment() && S1.advanceStep(tp); } - //! \brief Advances the time step \a n steps forward. - void fastForward(int n) { for (int i = 0; i < n; i++) this->advanceStep(); } - - //! \brief Postprocesses the solution of current time step. - void postSolve(const TimeStep& t, bool rst = false) { S1.postSolve(t,rst); } //! \brief Solves the problem up to the final time. virtual int solveProblem(char* infile, const char* heading = nullptr, diff --git a/Apps/Common/Test/TestSIMCoupled.C b/Apps/Common/Test/TestSIMCoupled.C index f0293c87..5750f795 100644 --- a/Apps/Common/Test/TestSIMCoupled.C +++ b/Apps/Common/Test/TestSIMCoupled.C @@ -26,7 +26,6 @@ public: preprocess_called(false), advancestep_called(false), solvestep_called(false), - postsolve_called(false), savestep_called(false), savemodel_called(false), init_called(false), @@ -46,7 +45,6 @@ public: bool preprocess() { return preprocess_called = true; } bool advanceStep(TimeStep& tp) { return advancestep_called = true; } bool solveStep(TimeStep& tp) { return solvestep_called = true; } - bool postSolve(const TimeStep&, bool) { return postsolve_called = true; } bool saveStep(const TimeStep&, int&) { return savestep_called = true; } bool saveModel(char*, int&, int&) { return savemodel_called = true; } bool init(const TimeStep&) { return init_called = true; } @@ -87,7 +85,6 @@ public: bool preprocess_called; bool advancestep_called; bool solvestep_called; - bool postsolve_called; bool savestep_called; bool savemodel_called; bool init_called; @@ -115,7 +112,6 @@ TEST(TestSIMCoupled, Override) sim.preprocess(); sim.advanceStep(tp); sim.solveStep(tp); - sim.postSolve(tp); sim.saveStep(tp, nBlock); sim.saveModel((char*)"", geoBlk, nBlock); sim.init(tp); @@ -136,8 +132,6 @@ TEST(TestSIMCoupled, Override) ASSERT_TRUE(ovr2.advancestep_called); ASSERT_TRUE(ovr1.solvestep_called); ASSERT_TRUE(ovr2.solvestep_called); - ASSERT_TRUE(ovr1.postsolve_called); - ASSERT_TRUE(ovr2.postsolve_called); ASSERT_TRUE(ovr1.savemodel_called); ASSERT_TRUE(ovr1.init_called); ASSERT_TRUE(ovr2.init_called);