implement getCurrent for more components

Former-commit-id: 72c90bac

Source/Components/InterfacedInductor.cpp

@@ -57,3 +57,6 @@ void InterfacedInductor::postStep(SystemModel& system) {
 	mVoltageIm = vposi - vnegi;
 }
 
+Complex InterfacedInductor::getCurrent(SystemModel& system) {
+	return Complex(mCurrentRe, mCurrentIm);
+}

Source/Components/InterfacedInductor.h

@@ -24,6 +24,8 @@ namespace DPsim {
 		void applyRightSideVectorStamp(SystemModel& system) { }
 		void step(SystemModel& system, Real time);
 		void postStep(SystemModel& system);
+
+		Complex getCurrent(SystemModel& system);
 	};
 }
 #endif

Source/Components/RxLine.cpp

@@ -211,3 +211,7 @@ void RxLine::postStep(SystemModel& system) {
 	}
 }
 
+Complex RxLine::getCurrent(SystemModel& system) {
+	return Complex(mCurrRe, mCurrIm);
+}
+

Source/Components/RxLine.h

@@ -46,7 +46,8 @@ namespace DPsim {
 		void applyRightSideVectorStamp(SystemModel& system) { }
 		void step(SystemModel& system, Real time);
 		void postStep(SystemModel& system);
+		Complex getCurrent(SystemModel& system);
 	};
 }
 
-#endif
\ No newline at end of file
+#endif

Source/Components/VoltSourceRes.cpp

@@ -44,3 +44,17 @@ void VoltSourceRes::step(SystemModel& system, Real time) {
 		system.addCompToRightSideVector(mNode2, -mCurrentr, -mCurrenti);
 	}
 }
+
+Complex VoltSourceRes::getCurrent(SystemModel& system) {
+	Real real = mCurrentr;
+	Real imag = mCurrenti;
+	if (mNode1 >= 0) {
+		real += system.getRealFromLeftSideVector(mNode1)*mConductance;
+		imag += system.getImagFromLeftSideVector(mNode1)*mConductance;
+	}
+	if (mNode2 >= 0) {
+		real -= system.getRealFromLeftSideVector(mNode2)*mConductance;
+		imag -= system.getImagFromLeftSideVector(mNode2)*mConductance;
+	}
+	return Complex(real, imag);
+}

Source/Components/VoltSourceRes.h

@@ -48,6 +48,8 @@ namespace DPsim {
 		void step(SystemModel& system, Real time);
 		
 		void postStep(SystemModel& system) { }
+
+		Complex getCurrent(SystemModel& system);
 	};
 }
 #endif

Source/Components/VoltSourceResFreq.cpp

@@ -42,7 +42,6 @@ void VoltSourceResFreq::applyRightSideVectorStamp(SystemModel& system) {
 	}
 }
 
-
 void VoltSourceResFreq::step(SystemModel& system, Real time) {
 	if (time >= mSwitchTime && time < mSwitchTime + mRampTime) {
 		Real fadeInOut = 0.5 + 0.5 * sin((time - mSwitchTime) / mRampTime * PI + -PI / 2);
@@ -72,3 +71,17 @@ void VoltSourceResFreq::step(SystemModel& system, Real time) {
 		system.addCompToRightSideVector(mNode2, -mCurrentr, -mCurrenti);
 	}
 }
+
+Complex VoltSourceResFreq::getCurrent(SystemModel& system) {
+	Real real = mCurrentr;
+	Real imag = mCurrenti;
+	if (mNode1 >= 0) {
+		real += system.getRealFromLeftSideVector(mNode1)*mConductance;
+		imag += system.getImagFromLeftSideVector(mNode1)*mConductance;
+	}
+	if (mNode2 >= 0) {
+		real -= system.getRealFromLeftSideVector(mNode2)*mConductance;
+		imag -= system.getImagFromLeftSideVector(mNode2)*mConductance;
+	}
+	return Complex(real, imag);
+}

Source/Components/VoltSourceResFreq.h

@@ -32,6 +32,7 @@ namespace DPsim {
 		void applyRightSideVectorStamp(SystemModel& system);
 		void step(SystemModel& system, Real time);
 		void postStep(SystemModel& system) { }
+		Complex getCurrent(SystemModel& system);
 	};
 
 }