Merge branch 'develop' into feb4.1

febiosoftware · Mar 27, 2023 · 8620c4b · 8620c4b
2 parents 17ae329 + cf21eb1
commit 8620c4b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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;
 }