Slightly refactor power probe

to avoid using calcOperatingPoints(), which should be reserved
for non-linear circuits.

Author: in3otd

qucs-core/src/components/wprobe.cpp

@@ -60,29 +60,19 @@ void wprobe::saveOperatingPoints (void) {
   nr_double_t Vi = imag (getV (NODE_1) - getV (NODE_2));
   // operating points as for the vprobe
   setOperatingPoint ("Vr", Vr);
-  setOperatingPoint ("Vi", Vi); //This section works just like a voltmeter
-}
-
-//For specific information regarding The Power triangle and Power factor:
-//https://en.wikipedia.org/wiki/Power_factor#Definition_and_calculation
+  setOperatingPoint ("Vi", Vi);
 
-void wprobe::calcOperatingPoints (void) {
-//Reading the current and voltage values to calculate power values
+  // read current and voltage values to calculate power values
   nr_complex_t Vw = getV (NODE_1) - getV (NODE_2);
   nr_complex_t Iw = getJ (VSRC_1);
   nr_complex_t Sw = Vw * conj (Iw);
-  nr_double_t VAr = real (Sw);
-  nr_double_t VAi = imag (Sw);
-  setOperatingPoint ("VAr", VAr);
-  setOperatingPoint ("VAi", VAi);
-
-  nr_double_t P = VAr;
+  // save P and Q instead of just S since operating points cannot hold complex values
+  nr_double_t P = real (Sw);
+  nr_double_t Q = imag (Sw);
   setOperatingPoint ("P", P);
-
-  nr_double_t Q = VAi;
   setOperatingPoint ("Q", Q);
 //Power Factor calculation
-  setOperatingPoint ("PF", P/std::sqrt(P*P+VAi*VAi));
+  setOperatingPoint ("PF", P/std::sqrt(P*P+Q*Q));
 }
 
 void wprobe::initTR (void) {

qucs-core/src/components/wprobe.h

@@ -34,7 +34,6 @@ class wprobe : public qucs::circuit
   void initAC (void);
   void initTR (void);
   void saveOperatingPoints (void);
-  void calcOperatingPoints (void);
 };
 
 #endif /* __WPROBE_H__ */

qucs-core/src/nasolver.cpp

@@ -1355,16 +1355,22 @@ void nasolver<nr_type_t>::saveResults (const std::string &volts, const std::stri
         circuit * root = subnet->getRoot ();
         for (circuit * c = root; c != NULL; c = (circuit *) c->getNext ())
         {
+            // FIXME: operating points are (ab)used in probes to hold probes data
+            //   should be handled differently
+            // skip if not a probe
             if (!c->isProbe ()) continue;
+            // skip if saving subcircuit components data is not requested
             if (!c->getSubcircuit().empty() && !(saveOPs & SAVE_ALL)) continue;
+            // update probe internal values, if it's not a noise simulation
+            //   values for noise simulation are in acsolver::saveNoiseResults()
             if (volts != "vn")
                 c->saveOperatingPoints ();
 	    std::string n = createOP (c->getName (), volts);
             saveVariable (n, nr_complex_t (c->getOperatingPoint ("Vr"),
             c->getOperatingPoint ("Vi")), f);
 
 	    //add watt probe data
-	    c->calcOperatingPoints ();
+            // this is a big hack due to (ab)using the operating points
 	    for (auto ops: c->getOperatingPoints ())
             {
 		//It will only get values if none of the strings are 0