Reorganize model evaluator implementations

examples/AdjointSensitivity/AdjointSensitivity.cpp

@@ -63,7 +63,7 @@
 
 #include <Model/PowerFlow/Bus/BusSlack.hpp>
 #include <Model/PowerFlow/Generator4/Generator4.hpp>
-#include <SystemModel.hpp>
+#include <Model/PowerFlow/SystemModel.hpp>
 #include <Solver/Dynamic/Ida.hpp>
 #include <Utilities/Testing.hpp>
 
@@ -142,9 +142,9 @@ int main()
     const double eps = 2e-3;
 
     // Compute gradient of the objective function numerically
-    std::vector<double> dGdp(model->size_opt());
+    std::vector<double> dGdp(model->sizeParams());
 
-    for (unsigned i=0; i<model->size_opt(); ++i)
+    for (unsigned i=0; i<model->sizeParams(); ++i)
     {
       model->param()[i] += eps;
       idas->getSavedInitialCondition();
@@ -185,7 +185,7 @@ int main()
     int retval = 0;
     std::cout << "\n\nComparison of numerical and adjoint results:\n\n";
     double* neg_dGdp = idas->getAdjointIntegral();
-    for (unsigned i=0; i<model->size_opt(); ++i)
+    for (unsigned i=0; i<model->sizeParams(); ++i)
     {
         std::cout << "dG/dp" << i << " (numerical) = " <<      dGdp[i] << "\n";
         std::cout << "dG/dp" << i << " (adjoint)   = " << -neg_dGdp[i] << "\n\n";

examples/DynamicConstrainedOpt/DynamicConstrainedOpt.cpp

@@ -63,7 +63,7 @@
 
 #include <Model/PowerFlow/Bus/BusSlack.hpp>
 #include <Model/PowerFlow/Generator2/Generator2.hpp>
-#include <SystemModel.hpp>
+#include <Model/PowerFlow/SystemModel.hpp>
 #include <Solver/Dynamic/Ida.hpp>
 
 #include <IpIpoptApplication.hpp>
@@ -165,8 +165,8 @@ int main()
     }
 
     // Store dynamic objective optimization results
-    double* results  = new double[model->size_opt()];
-    for(unsigned i=0; i <model->size_opt(); ++i)
+    double* results  = new double[model->sizeParams()];
+    for(unsigned i=0; i <model->sizeParams(); ++i)
     {
         results[i] = model->param()[i];
     }
@@ -193,7 +193,7 @@ int main()
 
     // Compare results of the two optimization methods
     int retval = 0;
-    for(unsigned i=0; i <model->size_opt(); ++i)
+    for(unsigned i=0; i <model->sizeParams(); ++i)
     {
         if(!isEqual(results[i], model->param()[i], 10*tol))
             --retval; 

examples/GenConstLoad/GenConstLoad.cpp

@@ -65,7 +65,7 @@
 #include <Model/PowerFlow/Load/Load.hpp>
 #include <Model/PowerFlow/Generator4Governor/Generator4Governor.hpp>
 #include <Solver/Dynamic/Ida.hpp>
-#include <SystemModel.hpp>
+#include <Model/PowerFlow/SystemModel.hpp>
 
 #include <IpIpoptApplication.hpp>
 #include <IpSolveStatistics.hpp>

examples/GenInfiniteBus/GenInfiniteBus.cpp

@@ -63,7 +63,7 @@
 
 #include <Model/PowerFlow/Bus/BusSlack.hpp>
 #include <Model/PowerFlow/Generator4/Generator4.hpp>
-#include <SystemModel.hpp>
+#include <Model/PowerFlow/SystemModel.hpp>
 #include <Solver/Dynamic/Ida.hpp>
 
 #include <IpIpoptApplication.hpp>
@@ -176,8 +176,8 @@ int main()
         new IpoptInterface::DynamicConstraint<double, size_t>(idas);
 
     // Store dynamic objective optimization results
-    double* results  = new double[model->size_opt()];
-    for(unsigned i=0; i <model->size_opt(); ++i)
+    double* results  = new double[model->sizeParams()];
+    for(unsigned i=0; i <model->sizeParams(); ++i)
     {
         results[i] = model->param()[i];
     }
@@ -202,7 +202,7 @@ int main()
 
     // Compare results of the two optimization methods
     int retval = 0;
-    for(unsigned i=0; i <model->size_opt(); ++i)
+    for(unsigned i=0; i <model->sizeParams(); ++i)
     {
         if(!isEqual(results[i], model->param()[i], 100*tol))
             --retval; 

examples/ParameterEstimation/ParameterEstimation.cpp

@@ -69,7 +69,7 @@
 #include <Solver/Optimization/DynamicConstraint.hpp>
 #include <Model/PowerFlow/Bus/BusSlack.hpp>
 #include <Model/PowerFlow/Generator4Param/Generator4Param.hpp>
-#include <SystemModel.hpp>
+#include <Model/PowerFlow/SystemModel.hpp>
 #include <Solver/Dynamic/Ida.hpp>
 
 #include <Utilities/FileIO.hpp>
@@ -178,8 +178,8 @@ int main()
     }
 
     // Store dynamic objective optimization results
-    double* results  = new double[model->size_opt()];
-    for(unsigned i=0; i <model->size_opt(); ++i)
+    double* results  = new double[model->sizeParams()];
+    for(unsigned i=0; i <model->sizeParams(); ++i)
     {
         results[i] = model->param()[i];
     }
@@ -207,7 +207,7 @@ int main()
 
     // Compare results of the two optimization methods
     int retval = 0;
-    for(unsigned i=0; i <model->size_opt(); ++i)
+    for(unsigned i=0; i <model->sizeParams(); ++i)
     {
         if(!isEqual(results[i], model->param()[i], 100*tol))
             --retval; 

src/Model/EvaluatorDynamics.hpp → src/Model/Evaluator.hpp

@@ -13,13 +13,13 @@ namespace Model
      *
      */
     template <class ScalarT, typename IdxT>
-    class EvaluatorDynamics
+    class Evaluator
     {
     public:
         typedef typename GridKit::ScalarTraits<ScalarT>::real_type real_type;
 
-        EvaluatorDynamics(){}
-        virtual ~EvaluatorDynamics(){}
+        Evaluator(){}
+        virtual ~Evaluator(){}
 
         virtual int allocate() = 0;
         virtual int initialize() = 0;

src/Model/PhasorDynamics/Branch/CMakeLists.txt

@@ -2,6 +2,7 @@
 # [[
 #  Author(s):
 #    - Cameron Rutherford <cameron.rutherford@pnnl.gov>
+#    - Slaven Peles <peless@ornl.gov>
 # ]]
 
 gridkit_add_library(phasor_dynamics_branch

src/Model/PhasorDynamics/BusBase.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <vector>
-#include <Model/EvaluatorDynamics.hpp>
+#include <Model/Evaluator.hpp>
 
 namespace GridKit
 {
@@ -12,10 +12,10 @@ namespace PhasorDynamics
      *
      */
     template <class ScalarT, typename IdxT>
-    class BusBase : public Model::EvaluatorDynamics<ScalarT, IdxT>
+    class BusBase : public Model::Evaluator<ScalarT, IdxT>
     {
     public:
-        using real_type = typename Model::EvaluatorDynamics<ScalarT, IdxT>::real_type;
+        using real_type = typename Model::Evaluator<ScalarT, IdxT>::real_type;
 
         enum BusType{DEFAULT=1, SLACK};
 

src/Model/PhasorDynamics/CMakeLists.txt

@@ -6,3 +6,4 @@
 add_subdirectory(Branch)
 add_subdirectory(Bus)
 add_subdirectory(Load)
+add_subdirectory(SynchronousMachine)

src/Model/PhasorDynamics/Component.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <vector>
-#include <Model/EvaluatorDynamics.hpp>
+#include <Model/Evaluator.hpp>
 
 namespace GridKit
 {
@@ -13,10 +13,10 @@ namespace PhasorDynamics
      *
      */
     template <class ScalarT, typename IdxT>
-    class Component : public Model::EvaluatorDynamics<ScalarT, IdxT>
+    class Component : public Model::Evaluator<ScalarT, IdxT>
     {
     public:
-        using real_type = typename Model::EvaluatorDynamics<ScalarT, IdxT>::real_type;
+        using real_type = typename Model::Evaluator<ScalarT, IdxT>::real_type;
 
         Component()
           : size_(0),
@@ -77,8 +77,8 @@ namespace PhasorDynamics
 
         virtual void setTolerances(real_type& rtol, real_type& atol) const
         {
-            rtol = rtol_;
-            atol = atol_;
+            rtol = rel_tol_;
+            atol = abs_tol_;
         }
 
         virtual void setMaxSteps(IdxT& msa) const
@@ -250,8 +250,8 @@ namespace PhasorDynamics
         real_type time_;
         real_type alpha_;
 
-        real_type rtol_;
-        real_type atol_;
+        real_type rel_tol_;
+        real_type abs_tol_;
 
         IdxT max_steps_;
 

src/Model/PhasorDynamics/SynchronousMachine/CMakeLists.txt

@@ -0,0 +1,13 @@
+
+# [[
+#  Author(s):
+#    - Cameron Rutherford <cameron.rutherford@pnnl.gov>
+#    - Slaven Peles <peless@ornl.gov>
+# ]]
+
+gridkit_add_library(phasor_dynamics_synchronous_machine
+  SOURCES
+    SynchronousMachine.cpp
+  OUTPUT_NAME
+    gridkit_phasor_dynamics_synchronous_machine)
+