Evaluate DAE as part of All in Cpp

This unifies the use and prepares support for clocked subsystems.
OpenModelica · Apr 21, 2023 · bffb081 · bffb081
1 parent 5d8d697
commit bffb081
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/OMCompiler/Compiler/Template/CodegenCppOld.tpl b/OMCompiler/Compiler/Template/CodegenCppOld.tpl
@@ -12424,6 +12424,8 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
     <%createTimeConditionTreatments(timeEventLength(simCode), clockedPartitions)%>
 
     // Evaluate Equations
+    if (_dimAE > 0)
+      evaluateDAE(command);
     <%equation_all_func_calls%>
 
     <%if createMeasureTime then generateMeasureTimeEndCode("measuredFunctionStartValues", "measuredFunctionEndValues", "(*measureTimeFunctionsArray)[1]", "evaluateAll", "MEASURETIME_MODELFUNCTIONS") else ""%>

diff --git a/OMCompiler/SimulationRuntime/cpp/Solver/DASSL/DASSL.cpp b/OMCompiler/SimulationRuntime/cpp/Solver/DASSL/DASSL.cpp
@@ -446,13 +446,11 @@ void DASSL::DASSLCore()
         if (_idid == 3)
           _time_system->setTime(_tEnd); // interpolated time point
         _continuous_system->setContinuousStates(_y);
-        if (_dimAE == 0)
-          _continuous_system->evaluateAll(IContinuous::CONTINUOUS);
-        else {
+        if (_dimAE > 0) {
           _mixed_system->setAlgebraicDAEVars(_y + _dimStates);
           _continuous_system->setStateDerivatives(_yPrime);
-          _continuous_system->evaluateDAE(IContinuous::CONTINUOUS);
         }
+        _continuous_system->evaluateAll(IContinuous::CONTINUOUS);
         writeToFile(_accStps, _tCurrent, _h);
       }
 
@@ -519,10 +517,7 @@ void DASSL::DASSLCore()
         {
           try
           {
-            if (_dimAE == 0)
-              _continuous_system->evaluateAll(IContinuous::CONTINUOUS);
-            else
-              _continuous_system->evaluateDAE(IContinuous::CONTINUOUS);
+            _continuous_system->evaluateAll(IContinuous::CONTINUOUS);
           }
           catch (std::exception& ex)
           {
@@ -549,10 +544,7 @@ void DASSL::DASSLCore()
         if (writeEventOutput)
         {
           // If we want to write the event-results, we should evaluate the whole system again
-          if (_dimAE == 0)
-            _continuous_system->evaluateAll(IContinuous::CONTINUOUS);
-          else
-            _continuous_system->evaluateDAE(IContinuous::CONTINUOUS);
+          _continuous_system->evaluateAll(IContinuous::CONTINUOUS);
           writeToFile(_accStps, _tCurrent, _h);
         }