Fix rebasing issues.

Author: pelesh

examples/Gen2Example/Example/example.cpp

@@ -19,8 +19,8 @@
 #include "Model/PhasorDynamics/BusFault/BusFault.hpp"
 #include "Model/PhasorDynamics/Load/Load.cpp"
 #include "Model/PhasorDynamics/Load/Load.hpp"
-#include "Model/PhasorDynamics/SynchronousMachine/ClassicalGenerator/ClassicalGen.cpp"
-#include "Model/PhasorDynamics/SynchronousMachine/ClassicalGenerator/ClassicalGen.hpp"
+#include "Model/PhasorDynamics/SynchronousMachine/GenClassicalerator/GenClassical.cpp"
+#include "Model/PhasorDynamics/SynchronousMachine/GenClassicalerator/GenClassical.hpp"
 #include "Model/PhasorDynamics/SystemModel.hpp"
 #include "Solver/Dynamic/Ida.cpp"
 #include "Solver/Dynamic/Ida.hpp"
@@ -38,7 +38,7 @@ int main()
   Bus<double, size_t>          bus1(0.9949877346411762, 0.09999703952427966);
   BusInfinite<double, size_t>  bus2(1.0, 0.0);
   Branch<double, size_t>       branch(&bus1, &bus2, 0.0, 0.1, 0, 0);
-  ClassicalGen<double, size_t> gen(&bus1, 1, 1, 0.05013, 3.0, 0.0, 0.0, 0.2);
+  GenClassical<double, size_t> gen(&bus1, 1, 1, 0.05013, 3.0, 0.0, 0.0, 0.2);
 
   /* Connect everything together */
   sys.addBus(&bus1);
@@ -101,4 +101,4 @@ int main()
   fclose(f);
 
   return 0;
-}
+}

examples/PhasorDynamics/Gen2Example/example.cpp

@@ -54,17 +54,17 @@ int main(int argc, char* argv[])
 
 
 
-  std::stringstream buffer;
+  // std::stringstream buffer;
 
-/* Set up simulation */
+  /* Set up simulation */
   Ida<double, size_t> ida(&sys);
   ida.configureSimulation();
 
   /* Run simulation */
   double start = static_cast<double>(clock());
-  // ida.printOutputF(0, 0, buffer);
   ida.initializeSimulation(0.0, false);
-  ida.runSimulationFixed(0.0, dt, 1.0, buffer);
+  size_t nout = 200;
+  ida.runSimulation(1.0, nout);
 
   if(argc >= 1)
   {
@@ -85,20 +85,20 @@ int main(int argc, char* argv[])
     int    i = 1;
     double data;
     int    size = 2 * sys.size() + 2;
-    while (buffer >> data)
-    {
-
-      if (i % (size) == 0)
-      {
-        outfile << data << "\n";
-      }
-      else
-      {
-        outfile << data << ",";
-      }
-
-      i++;
-    }
+    // while (buffer >> data)
+    // {
+
+    //   if (i % (size) == 0)
+    //   {
+    //     outfile << data << "\n";
+    //   }
+    //   else
+    //   {
+    //     outfile << data << ",";
+    //   }
+
+    //   i++;
+    // }
     outfile.close();
   }
 

src/Model/PhasorDynamics/SynchronousMachine/GenClassical/GenClassical.cpp

@@ -6,7 +6,7 @@
  *
  */
 
-#include "ClassicalGen.hpp"
+#include "GenClassical.hpp"
 
 #include <cmath>
 #include <iostream>
@@ -29,7 +29,7 @@ namespace GridKit
      * - Number of optimization parameters = 0
      */
     template <class ScalarT, typename IdxT>
-    ClassicalGen<ScalarT, IdxT>::ClassicalGen(bus_type* bus, int unit_id)
+    GenClassical<ScalarT, IdxT>::GenClassical(bus_type* bus, int unit_id)
       : bus_(bus),
         busID_(0),
         unit_id_(unit_id),
@@ -58,7 +58,7 @@ namespace GridKit
      * - Number of optimization parameters = 0
      */
     template <class ScalarT, typename IdxT>
-    ClassicalGen<ScalarT, IdxT>::ClassicalGen(bus_type* bus,
+    GenClassical<ScalarT, IdxT>::GenClassical(bus_type* bus,
                                               int       unit_id,
                                               ScalarT   p0,
                                               ScalarT   q0,
@@ -85,7 +85,7 @@ namespace GridKit
      * @brief allocate method computes sparsity pattern of the Jacobian.
      */
     template <class ScalarT, typename IdxT>
-    int ClassicalGen<ScalarT, IdxT>::allocate()
+    int GenClassical<ScalarT, IdxT>::allocate()
     {
       f_.resize(size_);
       y_.resize(size_);
@@ -136,7 +136,7 @@ namespace GridKit
      * \brief Identify differential variables.
      */
     template <class ScalarT, typename IdxT>
-    int ClassicalGen<ScalarT, IdxT>::tagDifferentiable()
+    int GenClassical<ScalarT, IdxT>::tagDifferentiable()
     {
 
       return 0;
@@ -148,9 +148,11 @@ namespace GridKit
      *
      */
     template <class ScalarT, typename IdxT>
-    int ClassicalGen<ScalarT, IdxT>::evaluateResidual()
+    int GenClassical<ScalarT, IdxT>::evaluateResidual()
     {
       /* Read variables */
+      ScalarT delta_dot = yp_[0];
+      ScalarT omega_dot = yp_[1];
       ScalarT delta = y_[0];
       ScalarT omega = y_[1];
       ScalarT telec = y_[2];
@@ -169,8 +171,8 @@ namespace GridKit
        f_[3] = ir + G*Vr() - B * Vi()  - ep*(G*cos(delta) -B*sin(delta));
        f_[4] = ii + B*Vr() +  G * Vi() - ep*(B*cos(delta) + G*sin(delta));
 
-      /* 11 ClassicalGen algebraic equations */
-      f_[2] = telec - (1.0 / (1.0 + omega)) * (g * ep * ep - ep * (cos(delta) * (g * Vr() - b * Vi()) + sin(delta) * (b * Vr() + g * Vi())));
+      /* 11 GenClassical algebraic equations */
+      f_[2] = telec - (1.0 / (1.0 + omega)) * (G * ep * ep - ep * (cos(delta) * (G * Vr() - B * Vi()) + sin(delta) * (B * Vr() + G * Vi())));
 
        Ir() += - (G*Vr() - B * Vi()  - ep*(G*cos(delta) - B*sin(delta)));
        Ii() += - (B*Vr() +  G * Vi() - ep*(B*cos(delta) + G*sin(delta)));

src/Model/PhasorDynamics/SynchronousMachine/GenClassical/GenClassical.hpp

@@ -24,7 +24,7 @@ namespace GridKit
   {
 
     template <class ScalarT, typename IdxT>
-    class ClassicalGen : public Component<ScalarT, IdxT>
+    class GenClassical : public Component<ScalarT, IdxT>
     {
       using Component<ScalarT, IdxT>::alpha_;
       using Component<ScalarT, IdxT>::f_;
@@ -45,16 +45,16 @@ namespace GridKit
       using real_type = typename Component<ScalarT, IdxT>::real_type;
 
     public:
-      ClassicalGen(bus_type* bus, int unit_id);
-      ClassicalGen(bus_type* bus,
+      GenClassical(bus_type* bus, int unit_id);
+      GenClassical(bus_type* bus,
                    int       unit_id,
                    ScalarT   p0,
                    ScalarT   q0,
                    real_type H,
                    real_type D,
                    real_type Ra,
                    real_type Xdp);
-      ~ClassicalGen() = default;
+      ~GenClassical() = default;
 
       int allocate() override;
       int initialize() override;