Fixed IDA Interface Final Copy

ORNL · Dec 17, 2024 · b194106 · b194106
1 parent 9cdd63e
commit b194106
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/Examples/ScaleMicrogrid/ScaleMicrogrid.cpp b/Examples/ScaleMicrogrid/ScaleMicrogrid.cpp
@@ -66,7 +66,6 @@ int test(index_type Nsize, real_type error_tol, bool debug_output, bool use_DAE_
 {
     using namespace ModelLib;
 
-    index_type max_step_number = 3000;
     bool usejac = true;
 
     real_type t_init  = 0.0;
@@ -79,7 +78,7 @@ int test(index_type Nsize, real_type error_tol, bool debug_output, bool use_DAE_
     auto* sysmodel = new PowerElectronicsModel<real_type, index_type>(reltol,
                                                                       abstol,
                                                                       usejac,
-                                                                      max_step_number);
+                                                                      SCALE_MICROGRID_MAX_STEPS);
 
     const std::vector<real_type>* true_vec = use_DAE_keys ? &answer_key_N8_DAE : &answer_key_N8;
 

diff --git a/Examples/ScaleMicrogrid/SolutionKeys.hpp b/Examples/ScaleMicrogrid/SolutionKeys.hpp
@@ -29,10 +29,11 @@
  * 
  * ODE Keys gives similar results.
  */
-constexpr real_type SCALE_MICROGRID_ERROR_TOL = 8.0e-5;
-constexpr real_type SCALE_MICROGRID_REL_TOL = 1.0e-7;
-constexpr real_type SCALE_MICROGRID_ABS_TOL = 1.0e-7;
-const bool USE_DAE_KEYS = true;
+constexpr real_type SCALE_MICROGRID_ERROR_TOL = 1.0e-6;
+constexpr real_type SCALE_MICROGRID_REL_TOL = 1.0e-8;
+constexpr real_type SCALE_MICROGRID_ABS_TOL = 1.0e-8;
+constexpr index_type SCALE_MICROGRID_MAX_STEPS = 10000;
+const bool USE_DAE_KEYS = false;
 
 
 const std::vector<real_type> answer_key_N2 = {22975.4182636905,

diff --git a/Solver/Dynamic/Ida.cpp b/Solver/Dynamic/Ida.cpp
@@ -286,6 +286,11 @@ namespace Sundials
                 tout += dt;
             }
         }
+
+        model_->updateTime(tf, 0.0);
+        copyVec(yy_, model_->y());
+        copyVec(yp_, model_->yp());
+
         //std::cout << "\n";
         return retval;
     }