- get rid of matrix.h

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

Compiler/Template/CodegenC.tpl

@@ -2586,7 +2586,7 @@ template equationNonlinear(SimEqSystem eq, Context context, Text &varDecls /*BUF
         <<
         data->simulationInfo.nonlinearSystemData[<%indexNonLinearSystem%>].nlsx[<%i0%>] = <%namestr%>;
         data->simulationInfo.nonlinearSystemData[<%indexNonLinearSystem%>].nlsxOld[<%i0%>] = _<%namestr%>(1) /*old*/;
-        data->simulationInfo.nonlinearSystemData[<%indexNonLinearSystem%>].nlsxExtrapolation[<%i0%>] = extraPolate(<%namestr%>, _<%namestr%>(1) /*old*/, _<%namestr%>(2) /*old2*/);
+        data->simulationInfo.nonlinearSystemData[<%indexNonLinearSystem%>].nlsxExtrapolation[<%i0%>] = extraPolate(data, _<%namestr%>(1) /*old*/, _<%namestr%>(2) /*old2*/);
         >>
       ;separator="\n"%>
       solve_nonlinear_system(data, <%indexNonLinearSystem%>);

SimulationRuntime/c/Makefile.common

@@ -15,7 +15,6 @@ FFLAGS  = -O -fexceptions
 RUNTIME_HEADERS = $(LIBF2CHEADER) \
 ./omc_inline.h \
 ./math-support/blaswrap.h \
-./math-support/matrix.h \
 ./meta/gc/common.h \
 ./meta/gc/mmc_gc.h \
 ./meta/gc/generational.h \

SimulationRuntime/c/math-support/CMakeLists.txt

@@ -8,7 +8,7 @@ SET(math_support_sources  bigden.c biglag.c dgesv_aux.c dogleg.c dpmpar.c
                           nelmead.c newuoa.c newuob.c  pivot.c qform.c  qrfac.c r1mpyq.c 
                           r1updt.c trsapp.c update.c)
 
-SET(math_support_headers blaswrap.h matrix.h) 
+SET(math_support_headers blaswrap.h) 
 
 # Library util
 ADD_LIBRARY(math-support ${math_support_sources} ${math_support_headers})

SimulationRuntime/c/math-support/pivot.c

@@ -6,7 +6,6 @@
 
 #include <math.h>
 #include <assert.h>
-//#include "matrix.h"
 
 /* Matrixes using column major order (as in Fortran) */
 #ifndef set_matrix_elt

SimulationRuntime/c/math-support/test/test_pivot.c

@@ -1,5 +1,4 @@
-#include <math.h>
-//#include "matrix.h"
+#include <math.h>
 
 /* Matrixes using column major order (as in Fortran) */
 #ifndef set_matrix_elt

SimulationRuntime/c/openmodelica_func.h

@@ -51,7 +51,6 @@ extern "C" {
 #include "real_array.h"
 #include "string_array.h"
 #include "modelica_string.h"
-#include "matrix.h"
 #include "division.h"
 #include "utility.h"
 

SimulationRuntime/c/simulation/solver/mixedSearchSolver.c

@@ -256,10 +256,11 @@ int solveMixedSearch(DATA *data, int sysNumber)
         /* debug output */
         if (ACTIVE_STREAM(LOG_NLS))
         {
+          const char * __name;
           for (i = 0; i < systemData->size; i++)
           {
             ix = (systemData->iterationVarsPtr[i]-data->localData[0]->booleanVars);
-            const char *__name = data->modelData.booleanVarsData[ix].info.name;
+            __name = data->modelData.booleanVarsData[ix].info.name;
             DEBUG3(LOG_NLS, "%s changed : %d -> %d", __name, solverData->iterationVars[i], *(systemData->iterationVarsPtr[i]));
           }
         }
@@ -285,10 +286,11 @@ int solveMixedSearch(DATA *data, int sysNumber)
       if (ACTIVE_STREAM(LOG_NLS))
       {
         DEBUG1(LOG_NLS, "#### SOLUTION FOUND! (system %d)", eqSystemNumber);
+        const char * __name;
         for (i = 0; i < systemData->size; i++)
         {
           ix = (systemData->iterationVarsPtr[i]-data->localData[0]->booleanVars);
-          const char *__name = data->modelData.booleanVarsData[ix].info.name;
+          __name = data->modelData.booleanVarsData[ix].info.name;
           DEBUG4(LOG_NLS, "%s = %d  pre(%s)= %d", __name, *systemData->iterationVarsPtr[i], __name,
               *systemData->iterationPreVarsPtr[i]);
         }

SimulationRuntime/c/simulation/solver/mixedSearchSolver.h

@@ -38,7 +38,6 @@
 #include "simulation_data.h"
 
 
-
 int allocateMixedSearchData(int size, void **data);
 int freeMixedSearchData(void **data);
 int solveMixedSearch(DATA *data, int sysNumber);

SimulationRuntime/c/simulation/solver/nonlinearSystem.c

@@ -233,3 +233,27 @@ int check_nonlinear_solutions(DATA *data)
 
   return returnValue;
 }
+
+/*! \fn extraPolate
+ *   This function extrapolates linear next value from
+ *   the both old values,
+ *
+ *  \param  [in]  [data]
+ *
+ *  \author wbraun
+ */
+double extraPolate(DATA *data, double old1, double old2)
+{
+  double retValue;
+
+  if (data->localData[1]->timeValue == data->localData[2]->timeValue)
+  {
+    retValue = old1;
+  }
+  else
+  {
+    retValue = old2 + ((data->localData[0]->timeValue - data->localData[2]->timeValue)/(data->localData[1]->timeValue - data->localData[2]->timeValue)) * (old1-old2);
+  }
+
+  return retValue;
+}

SimulationRuntime/c/simulation/solver/nonlinearSystem.h

@@ -70,5 +70,6 @@ int allocateNonlinearSystem(DATA *data);
 int freeNonlinearSystem(DATA *data);
 int solve_nonlinear_system(DATA *data, int sysNumber);
 int check_nonlinear_solutions(DATA *data);
+double extraPolate(DATA *data, double old1, double old2);
 
 #endif

SimulationRuntime/c/simulation/solver/stateset.c

@@ -30,7 +30,6 @@
  */
 
 #include "stateset.h"
-#include "matrix.h"
 #include "omc_error.h"
 
 #include <memory.h>
@@ -93,7 +92,7 @@ void initializeStateSetPivoting(DATA *data)
       set->colPivot[n] = set->nCandidates-n-1;
 
     for(n=0; n<set->nStates; n++)
-      set_matrix_elt(A, n, n, set->nStates, 1); /* set A[row, col] */
+      A[n + n *set->nStates] = 1;  /* set A[row, col] */
   }
 }
 
@@ -231,7 +230,7 @@ static void setAMatrix(modelica_integer* newEnable, modelica_integer nCandidates
       unsigned int sid = states[row]->id-firstrealid;
       INFO1(LOG_DSS, "select %s", statecandidates[col]->name);
       /* set A[row, col] */
-      set_matrix_elt(A, row, col, nStates, 1);
+      A[row + col * nStates] = 1;
       /* reinit state */
       data->localData[0]->realVars[sid] = data->localData[0]->realVars[id];
       row++;

SimulationRuntime/c/util/omc_error.h

@@ -64,7 +64,7 @@ void omc_throw_function();
 /* global JumpBuffer */
 extern jmp_buf globalJmpbuf;
 
-/* #define USE_DEBUG_OUTPUT */
+ #define USE_DEBUG_OUTPUT
 
 enum LOG_STREAM
 {