From cf21eb1413e75d6fca2290447591e0823aa638e6 Mon Sep 17 00:00:00 2001 From: SteveMaas1978 <50155781+SteveMaas1978@users.noreply.github.com> Date: Fri, 24 Mar 2023 15:55:37 -0600 Subject: [PATCH] Now only printing PID values when print-parameters flag is on. --- FECore/FEModel.cpp | 7 +++++++ FECore/FEModel.h | 3 +++ FECore/FEPIDController.cpp | 11 +++++++---- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/FECore/FEModel.cpp b/FECore/FEModel.cpp index 3ffb67734..75c2b518b 100644 --- a/FECore/FEModel.cpp +++ b/FECore/FEModel.cpp @@ -1651,6 +1651,13 @@ void FEModel::SetPrintParametersFlag(bool b) m_imp->m_printParams = b; } +//----------------------------------------------------------------------------- +//! Get the print parameter flag +bool FEModel::GetPrintParametersFlag() const +{ + return m_imp->m_printParams; +} + //----------------------------------------------------------------------------- bool FEModel::EvaluateLoadParameters() { diff --git a/FECore/FEModel.h b/FECore/FEModel.h index 9ccc3c58b..f8d44ff2f 100644 --- a/FECore/FEModel.h +++ b/FECore/FEModel.h @@ -340,6 +340,9 @@ class FECORE_API FEModel : public FECoreBase, public CallbackHandler //! Set the print parameters flag void SetPrintParametersFlag(bool b); + //! Get the print parameter flag + bool GetPrintParametersFlag() const; + public: // --- Miscellaneous routines --- //! call the callback function diff --git a/FECore/FEPIDController.cpp b/FECore/FEPIDController.cpp index 21f9f7a08..f27e918ba 100644 --- a/FECore/FEPIDController.cpp +++ b/FECore/FEPIDController.cpp @@ -76,10 +76,13 @@ double FEPIDController::GetValue(double time) m_prev = error; m_prevTime = time; - feLog("PID controller %d:\n", GetID()); - feLog("\tparameter = %lg\n", val); - feLog("\terror = %lg\n", error); - feLog("\tvalue = %lg\n", newVal); + if (GetFEModel()->GetPrintParametersFlag()) + { + feLog("PID controller %d:\n", GetID()); + feLog("\tparameter = %lg\n", val); + feLog("\terror = %lg\n", error); + feLog("\tvalue = %lg\n", newVal); + } return newVal; }