-fixed #3258: Missing AlgebraicModelJacobian::initializeColoredJacobi…

…anA() git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@25354 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Apr 1, 2015 · 4affa10 · 4affa10
1 parent 2f79736
commit 4affa10
Showing 1 changed file with 13 additions and 22 deletions.
diff --git a/Compiler/Template/CodegenCpp.tpl b/Compiler/Template/CodegenCpp.tpl
@@ -226,7 +226,8 @@ case SIMCODE(modelInfo=MODELINFO(__)) then
 
 
     /*testmaessig aus der Cruntime*/
-    <%functionAnalyticJacobiansHeader(jacobianMatrixes, modelNamePrefix(simCode))%>
+	void initializeColoredJacobianA();
+
     };
     >>
 end simulationJacobianHeaderFile;
@@ -718,7 +719,11 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
    //testmaessig aus der cruntime
    /* Jacobians */
 
+
+   void <%lastIdentOfPath(modelInfo.name)%>Jacobian::initializeColoredJacobianA()
+   {
    <%functionAnalyticJacobians2(jacobianMatrixes, lastIdentOfPath(modelInfo.name),simCode , &extraFuncs , &extraFuncsDecl,  extraFuncsNamespace, stateDerVectorName, useFlatArrayNotation)%>
+   }
    <%\n%>
    >>
 end simulationJacobianCppFile;
@@ -13594,19 +13599,18 @@ case _ then
       ;separator="\n")
       let index_ = listLength(seedVars)
       <<
-      void <%modelNamePrefix%>Jacobian::initializeColoredJacobian<%matrixname%>()
-      {
         if(_AColorOfColumn)
           delete [] _AColorOfColumn;
         _AColorOfColumn = new int[<%index_%>];
         _AMaxColors = <%maxColor%>;
 
         /* write color array */
         <%colorArray%>
-      }
       >>
    end match
    end match
+
+
 end match
 end initialAnalyticJacobians2;
 
@@ -13644,34 +13648,21 @@ case {} then
 <<
 >>
 case _ then
-  match sparsepattern
+let help =  match sparsepattern
 
   case _ then
   match matrixname
   case "A" then
-      let &eachCrefParts = buffer ""
-
-
-      let colorArray = (colorList |> (indexes) hasindex index0 =>
-        let colorCol = ( indexes |> i_index =>
-        '_<%matrixname%>ColorOfColumn[<%i_index%>] = <%intAdd(index0,1)%>; '
-        ;separator="\n")
-      '<%colorCol%>'
-      ;separator="\n")
-      let indexColumn = (jacobianColumn |> (eqs,vars,indxColumn) => indxColumn;separator="\n")
-      let index_ = listLength(seedVars)
-      let sp_size_index =  lengthListElements(unzipSecond(sparsepattern))
-      let sizeleadindex = listLength(sparsepattern)
-
-
       <<
       public:
-        <%eachCrefParts%>
         void initializeColoredJacobian<%matrixname%>();
       >>
    end match
    end match
-
+<<
+<%help%>
+>>
+   end match
 
 end initialAnalyticJacobiansHeader;