From 3cd92c1acb9a6fed1067b49cb079e96d98ac35fa Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Thu, 28 Sep 2017 20:11:12 -0300 Subject: Some saturation bugs fixed --- Project/Electromechanical.h | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'Project/Electromechanical.h') diff --git a/Project/Electromechanical.h b/Project/Electromechanical.h index 4259c0b6..3dd239a 100644 --- a/Project/Electromechanical.h +++ b/Project/Electromechanical.h @@ -4,6 +4,7 @@ #include "ElectricCalculation.h" #include +#include class ControlElementSolver; @@ -78,7 +79,13 @@ class Electromechanical : public ElectricCalculation double& pe, double k = 1.0); void CalculateReferenceSpeed(); - bool CalculateSyncMachineSaturation(SyncGenerator* syncMachine, bool updateCurrents = true, double k = 1.0); + bool CalculateSyncMachineSaturation(SyncGenerator* syncMachine, + double& id, + double& iq, + double& sd, + double& sq, + bool updateCurrents = true, + double k = 1.0); void SaveData(); @@ -112,8 +119,8 @@ class Electromechanical : public ElectricCalculation // tests double m_wError = 0.0; - double m_sdC = 0.0; - double m_sqC = 0.0; + double m_sdC = 1.0; + double m_sqC = 1.0; double m_numIt = 0; }; -- cgit