diff --git a/Linear/DynamicSim.h b/Linear/DynamicSim.h index b8c5c79..a56f75b 100644 --- a/Linear/DynamicSim.h +++ b/Linear/DynamicSim.h @@ -35,7 +35,7 @@ class DataExporter; int modalSim (char* infile, size_t nM, bool dumpModes, bool qstatic, SIMoutput* model, DataExporter* exporter = nullptr, - double zero_tol = -1.0, std::streamsize outPrec = 6); + double zero_tol = 1.0e-8, std::streamsize outPrec = 6); /*! \brief Driver for direct simulation of linear dynamics problems. @@ -48,6 +48,6 @@ int modalSim (char* infile, size_t nM, bool dumpModes, bool qstatic, */ int dynamicSim (char* infile, SIMoutput* model, bool fixDup = false, - double zero_tol = -1.0, std::streamsize outPrec = 6); + double zero_tol = 1.0e-8, std::streamsize outPrec = 6); #endif diff --git a/NonlinearDriver.h b/NonlinearDriver.h index 96a2638..e27e88f 100644 --- a/NonlinearDriver.h +++ b/NonlinearDriver.h @@ -74,6 +74,18 @@ class NonlinearDriver : public NonLinSIM //! \brief Reads model data from the specified input file \a *fileName. virtual bool read(const char* fileName); + //! \brief Invokes the main pseudo-time stepping simulation loop. + //! \param writer HDF5 results exporter + //! \param restart HDF5 restart handler + //! \param[in] zero_tol Truncate norm values smaller than this to zero + //! \param[in] outPrec Number of digits after the decimal point in norm print + int solveProblem(DataExporter* writer = nullptr, + HDF5Restart* restart = nullptr, + double zero_tol = 1.0e-8, std::streamsize outPrec = 0) + { + return this->solveProblem(writer,restart,nullptr,0,0.0,zero_tol,outPrec); + } + //! \brief Invokes the main pseudo-time stepping simulation loop. //! \param writer HDF5 results exporter //! \param restart HDF5 restart handler @@ -84,7 +96,7 @@ class NonlinearDriver : public NonLinSIM //! \param[in] outPrec Number of digits after the decimal point in norm print int solveProblem(DataExporter* writer, HDF5Restart* restart, utl::LogStream* oss, bool printMax, double dtDump, - double zero_tol, std::streamsize outPrec); + double zero_tol = 1.0e-8, std::streamsize outPrec = 0); //! \brief Serialize solution state for restarting purposes. //! \param data Container for serialized data