- fix for CPP runtime

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@21166 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: Marcus Walther

Compiler/Template/CodegenCpp.tpl

@@ -1478,7 +1478,6 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
 match eq
     case SES_LINEAR(__)
     case SES_NONLINEAR(__) then
-
   <<
    #include "Modelica.h"
    #include "ModelicaDefine.h"
@@ -1494,23 +1493,40 @@ match eq
    ,_system(system)
    ,__z(z)
    ,__zDot(zDot)
+   ,__A(0)
+   ,__Asparse(0)
+   <%alocateLinearSystemConstructor(eq)%>
    ,_conditions(conditions)
    ,_event_handling(event_handling)
-   <%alocateLinearSystem(eq)%>
-
+   ,_useSparseFormat(false)
     {
-
       <%initAlgloopDimension(eq,varDecls)%>
 
     }
 
    <%modelname%>Algloop<%index%>::~<%modelname%>Algloop<%index%>()
     {
+       if(__Asparse != 0)
+          delete __Asparse;
+       if(__A != 0)
+          delete __A;
+    }
+
+    bool <%modelname%>Algloop<%index%>::getUseSparseFormat()
+    {
+       return _useSparseFormat;
+    }
 
+    void <%modelname%>Algloop<%index%>::setUseSparseFormat(bool value)
+    {
+       _useSparseFormat = value;
     }
+
    <%algloopRHSCode(simCode,eq)%>
    <%if Flags.isSet(Flags.WRITE_TO_BUFFER) then algloopResiduals(simCode,eq)%>
    <%initAlgloop(simCode,eq,context)%>
+   <%initAlgloopTemplate(simCode,eq,context)%>
+   <%updateAlgloop(simCode,eq,context)%>
    <%upateAlgloopNonLinear(simCode,eq,context)%>
    <%upateAlgloopLinear(simCode,eq,context)%>
    <%AlgloopDefaultImplementationCode(simCode,eq,context)%>
@@ -1521,6 +1537,47 @@ match eq
     >>
 end algloopCppFile;
 
+template updateAlgloop(SimCode simCode,SimEqSystem eqn,Context context)
+::=
+match simCode
+  case SIMCODE(modelInfo = MODELINFO(__)) then
+    let modelname = lastIdentOfPath(modelInfo.name)
+    match eqn
+      case eq as SES_NONLINEAR(__) then
+        <<
+        void <%modelname%>Algloop<%index%>::evaluate()
+        {
+           if(_useSparseFormat)
+             evaluate(__Asparse);
+           else
+             evaluate(__A);
+        }
+        >>
+      case eq as SES_LINEAR(__) then
+        <<
+        void <%modelname%>Algloop<%index%>::evaluate()
+        {
+           if(_useSparseFormat)
+           {
+             if(__Asparse == 0)
+             {
+               //sometimes initialize was not called before
+               <%alocateLinearSystem(eq)%>
+             }
+             evaluate(__Asparse);
+           }
+           else
+           {
+             if(__A == 0)
+             {
+               //sometimes initialize was not called before
+               <%alocateLinearSystem(eq)%>
+             }
+             evaluate(__A);
+           }
+        }
+        >>
+end updateAlgloop;
 
 template upateAlgloopNonLinear( SimCode simCode,SimEqSystem eqn,Context context)
   "Generates functions in simulation file."
@@ -1552,7 +1609,8 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
 
 
   <<
-  void <%modelname%>Algloop<%index%>::evaluate()
+  template <typename T>
+  void <%modelname%>Algloop<%index%>::evaluate(T *__A)
   {
         <%varDecls%>
 
@@ -1607,7 +1665,7 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
  let Amatrix=
     (simJac |> (row, col, eq as SES_RESIDUAL(__)) =>
       let expPart = daeExp(eq.exp, context, &preExp /*BUFC*/,  &varDecls /*BUFD*/,simCode)
-      '<%preExp%>__A[<%row%>][<%col%>]=<%expPart%>;'
+      '<%preExp%>(*__A)[<%row%>][<%col%>]=<%expPart%>;'
   ;separator="\n")
 
 
@@ -1620,7 +1678,8 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
 
 
  <<
-   void <%modelname%>Algloop<%index%>::evaluate()
+  template <typename T>
+  void <%modelname%>Algloop<%index%>::evaluate(T* __A)
   {
       <%varDecls%>
       <%Amatrix%>
@@ -3006,6 +3065,40 @@ end functionInitialEquations;
 template initAlgloop(SimCode simCode,SimEqSystem eq,Context context)
 ::=
 match simCode
+case SIMCODE(modelInfo = MODELINFO(__)) then
+  let modelname = lastIdentOfPath(modelInfo.name)
+
+  match eq
+  case SES_NONLINEAR(__) then
+   <<
+     void <%modelname%>Algloop<%index%>::initialize()
+     {  
+        
+        if(_useSparseFormat)
+          <%modelname%>Algloop<%index%>::initialize(__Asparse);
+        else
+          <%modelname%>Algloop<%index%>::initialize(__A);
+     }
+   >>
+ case SES_LINEAR(__) then
+   <<
+     void <%modelname%>Algloop<%index%>::initialize()
+     {
+        <%alocateLinearSystem(eq)%>
+        if(_useSparseFormat)
+          <%modelname%>Algloop<%index%>::initialize(__Asparse);
+        else
+        {
+          fill_array(*__A,0.0);
+          <%modelname%>Algloop<%index%>::initialize(__A);
+        }
+     }
+   >>
+end initAlgloop;
+
+template initAlgloopTemplate(SimCode simCode,SimEqSystem eq,Context context)
+::=
+match simCode
 case SIMCODE(modelInfo = MODELINFO(__)) then
   let modelname = lastIdentOfPath(modelInfo.name)
   let &varDecls = buffer ""
@@ -3015,10 +3108,10 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
   match eq
   case SES_NONLINEAR(__) then
   <<
-  void <%modelname%>Algloop<%index%>::initialize()
+  template <typename T>
+  void <%modelname%>Algloop<%index%>::initialize(T *__A)
   {
-
-         <%initAlgloopEquation(eq,varDecls,simCode,context)%>
+       <%initAlgloopEquation(eq,varDecls,simCode,context)%>
        AlgLoopDefaultImplementation::initialize();
 
     // Update the equations once before start of simulation
@@ -3027,16 +3120,15 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
   >>
  case SES_LINEAR(__) then
    <<
-     void <%modelname%>Algloop<%index%>::initialize()
+     template <typename T>
+     void <%modelname%>Algloop<%index%>::initialize(T *__A)
      {
-
-         <%initAlgloopEquation(eq,varDecls,simCode,context)%>
+        <%initAlgloopEquation(eq,varDecls,simCode,context)%>
         // Update the equations once before start of simulation
         evaluate();
      }
    >>
-
-end initAlgloop;
+end initAlgloopTemplate;
 
 
 template getAMatrixCode(SimCode simCode,SimEqSystem eq)
@@ -3060,7 +3152,7 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
    <<
      void <%modelname%>Algloop<%index%>::getSystemMatrix(double* A_matrix)
      {
-          memcpy(A_matrix,__A.data(),_dimAEq*_dimAEq*sizeof(double));
+          memcpy(A_matrix,__A->data(),_dimAEq*_dimAEq*sizeof(double));
      }
    >>
 
@@ -3111,7 +3203,7 @@ match eq
 
     void <%modelname%>Algloop<%index%>::getRHS(double* vars)
     {
-        ublas::matrix<double> A=toMatrix(_dimAEq,_dimAEq,__A.data());
+        ublas::matrix<double> A=toMatrix(_dimAEq,_dimAEq,__A->data());
         double* doubleUnknowns = new double[_dimAEq];
         getReal(doubleUnknowns);
         ublas::vector<double> x=toVector(_dimAEq,doubleUnknowns);
@@ -3216,7 +3308,7 @@ case SES_NONLINEAR(__) then
  let Amatrix=
     (simJac |> (row, col, eq as SES_RESIDUAL(__)) =>
       let expPart = daeExp(eq.exp, context, &preExp /*BUFC*/,  &varDecls /*BUFD*/,simCode)
-      '<%preExp%>__A[<%row%>][<%col%>]=<%expPart%>;'
+      '<%preExp%>(*__A)[<%row%>][<%col%>]=<%expPart%>;'
   ;separator="\n")
 
  let bvector =  (beqs |> exp hasindex i0 =>
@@ -3398,7 +3490,6 @@ case SES_NONLINEAR(__) then
   <<
     // Number of unknowns/equations according to type (0: double, 1: int, 2: bool)
     _dimAEq = <%size%>;
-    fill_array(__A,0.0);
     fill_array(__b,0.0);
   >>
 
@@ -3408,14 +3499,26 @@ template alocateLinearSystem(SimEqSystem eq)
  "Generates a non linear equation system."
 ::=
 match eq
+case SES_LINEAR(__) then
+   let size = listLength(vars)
+   <<
+    if(_useSparseFormat)
+      __Asparse = 0;
+    else
+      __A = new boost::multi_array<double,2>(boost::extents[<%size%>][<%size%>],boost::fortran_storage_order());
+   >>
+end alocateLinearSystem;
+
+template alocateLinearSystemConstructor(SimEqSystem eq)
+ "Generates a non linear equation system."
+::=
+match eq
 case SES_LINEAR(__) then
    let size = listLength(vars)
   <<
-    ,__A(boost::extents[<%size%>][<%size%>],boost::fortran_storage_order())
    ,__b(boost::extents[<%size%>])
   >>
-
-end alocateLinearSystem;
+end alocateLinearSystemConstructor;
 
 template Update(SimCode simCode)
 ::=
@@ -3764,21 +3867,34 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
 
        <%generateAlgloopMethodDeclarationCode(simCode)%>
 
+      bool getUseSparseFormat();
+      void setUseSparseFormat(bool value);
+
+  protected:
+    template <typename T>
+    void evaluate(T* __A);
+
   private:
     Functions _functions;
     //states
     double* __z;
     //state derivatives
     double* __zDot;
     // A matrix
-    boost::multi_array<double,2> __A;
+    boost::multi_array<double,2> *__A; //dense
+    
+    typedef double** sparseType;
+    sparseType *__Asparse; //sparse
+
     //b vector
     boost::multi_array<double,1> __b;
     bool* _conditions;
 
     EventHandling& _event_handling;
 
      <%systemname%>* _system;
+     
+     bool _useSparseFormat;
    };
   >>
 end generateAlgloopClassDeclarationCode;
@@ -4095,6 +4211,10 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
     virtual int getDimRHS() const    ;
      /// (Re-) initialize the system of equations
     virtual void initialize();
+    
+    template <typename T>
+    void initialize(T *__A);
+
     /// Provide variables with given index to the system
     virtual void getReal(double* vars)    ;
      /// Provide variables with given index to the system
@@ -5474,9 +5594,6 @@ template getAliasVarName(AliasVariable aliasvar, SimCode simCode,Context context
     else 'noAlias'
 end getAliasVarName;
 
-
-
-
 //template for write  variables for each time step
 template writeoutput2(ModelInfo modelInfo,SimCode simCode)