fix in cpp template for allocating Jacobian

OpenModelica · Aug 25, 2015 · 52a9c93 · 52a9c93
1 parent e47e061
commit 52a9c93
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Compiler/Template/CodegenCpp.tpl b/Compiler/Template/CodegenCpp.tpl
@@ -12403,9 +12403,9 @@ template initialAnalyticJacobians(Integer indexJacobian, list<JacobianColumn> ja
           let type = getConfigString(MATRIX_FORMAT)
           let matrixinit =  match type
           case ("dense") then
-            'ublas::zero_matrix<double> (<%index_%>,<%indexColumn%>)'
+            'ublas::zero_matrix<double> (<%indexColumn%>,<%index_%>)'
           case ("sparse") then
-            '<%index_%>,<%indexColumn%>,<%sp_size_index%>'
+            '<%indexColumn%>,<%index_%>,<%sp_size_index%>'
           else "A matrix type is not supported"
           end match
           <<

diff --git a/SimulationRuntime/cpp/Solver/CVode/CVode.cpp b/SimulationRuntime/cpp/Solver/CVode/CVode.cpp
@@ -585,6 +585,8 @@ void Cvode::CVodeCore()
       // Der Eventzeitpunkt kann auf der Endzeit liegen (Time-Events). In diesem Fall wird der Solver beendet, da CVode sonst eine interne Warnung schmeißt
       if (_tCurrent == _tEnd)
         _cv_rt = CV_TSTOP_RETURN;
+      if(_continuous_system->stepCompleted(_tCurrent))
+        _solverStatus = DONE;
     }
 
     // ZÃ¤hler fÃ¼r die Anzahl der ausgegebenen Schritte erhÃ¶hen