Cleanup jacobian index code (OpenModelica#13576)

phannebohm · web-flow · commit e33883cf4e63 · 2025-02-15T05:09:08.000+01:00
diff --git a/OMCompiler/Compiler/Template/CodegenC.tpl b/OMCompiler/Compiler/Template/CodegenC.tpl
diff --git a/OMCompiler/SimulationRuntime/c/simulation/solver/gbode_main.c b/OMCompiler/SimulationRuntime/c/simulation/solver/gbode_main.c
@@ -105,7 +105,6 @@ int gbodef_allocateData(DATA *data, threadData_t *threadData, SOLVER_INFO *solve
   gbData->gbfData = gbfData;
 
   ANALYTIC_JACOBIAN *jacobian = NULL;
-  analyticalJacobianColumn_func_ptr analyticalJacobianColumn = NULL;
   int i;
 
   gbfData->nStates = gbData->nStates;
@@ -315,7 +314,6 @@ int gbode_allocateData(DATA *data, threadData_t *threadData, SOLVER_INFO *solver
   gbData->nStates = data->modelData->nStates;
 
   ANALYTIC_JACOBIAN* jacobian = NULL;
-  analyticalJacobianColumn_func_ptr analyticalJacobianColumn = NULL;
 
   gbData->GM_method = getGB_method(FLAG_SR);
   gbData->tableau = initButcherTableau(gbData->GM_method, FLAG_SR_ERR);
diff --git a/OMCompiler/SimulationRuntime/c/simulation/solver/gbode_nls.c b/OMCompiler/SimulationRuntime/c/simulation/solver/gbode_nls.c
@@ -202,7 +202,6 @@ NONLINEAR_SYSTEM_DATA* initRK_NLS_DATA(DATA* data, threadData_t* threadData, DAT
   struct dataSolver *solverData = (struct dataSolver*) calloc(1,sizeof(struct dataSolver));
 
   NONLINEAR_SYSTEM_DATA* nlsData;
-  analyticalJacobianColumn_func_ptr analyticalJacobianColumn;
 
   nlsData = allocNlsDataGB(threadData, gbData->nlSystemSize);
   nlsData->equationIndex = -1;
@@ -310,7 +309,6 @@ NONLINEAR_SYSTEM_DATA* initRK_NLS_DATA_MR(DATA* data, threadData_t* threadData,
   struct dataSolver *solverData = (struct dataSolver*) calloc(1, sizeof(struct dataSolver));
 
   NONLINEAR_SYSTEM_DATA* nlsData;
-  analyticalJacobianColumn_func_ptr analyticalJacobianColumn;
 
   nlsData = allocNlsDataGB(threadData, gbfData->nStates);
   nlsData->equationIndex = -1;
diff --git a/OMCompiler/SimulationRuntime/c/simulation/solver/kinsolSolver.c b/OMCompiler/SimulationRuntime/c/simulation/solver/kinsolSolver.c
@@ -645,7 +645,7 @@ int nlsSparseSymJac(N_Vector vecX, N_Vector vecFX, SUNMatrix Jac,
       }
     }
     /* Evaluate Jacobian column */
-    ((nlsData->analyticalJacobianColumn))(data, threadData, analyticJacobian, NULL);
+    nlsData->analyticalJacobianColumn(data, threadData, analyticJacobian, NULL);
 
     /* Save column in Jac and unset seed variables */
     for (ii = 0; ii < kinsolData->size; ii++) {
diff --git a/OMCompiler/SimulationRuntime/c/simulation/solver/linearSolverKlu.c b/OMCompiler/SimulationRuntime/c/simulation/solver/linearSolverKlu.c
@@ -120,7 +120,7 @@ static int getAnalyticalJacobian(DATA* data, threadData_t *threadData,
 {
   int i,ii,j,k,l;
 
-  LINEAR_SYSTEM_DATA* systemData = &(((DATA*)data)->simulationInfo->linearSystemData[sysNumber]);
+  LINEAR_SYSTEM_DATA* systemData = &(data->simulationInfo->linearSystemData[sysNumber]);
 
   const int index = systemData->jacobianIndex;
   ANALYTIC_JACOBIAN* jacobian = systemData->parDynamicData[omc_get_thread_num()].jacobian;
@@ -144,7 +144,7 @@ static int getAnalyticalJacobian(DATA* data, threadData_t *threadData,
       }
     }
 
-    ((systemData->analyticalJacobianColumn))(data, threadData, jacobian, parentJacobian);
+    systemData->analyticalJacobianColumn(data, threadData, jacobian, parentJacobian);
 
     for(j = 0; j < jacobian->sizeCols; j++)
     {
diff --git a/OMCompiler/SimulationRuntime/c/simulation/solver/linearSolverLapack.c b/OMCompiler/SimulationRuntime/c/simulation/solver/linearSolverLapack.c
@@ -108,8 +108,8 @@ int freeLapackData(void **voiddata)
  */
 int getAnalyticalJacobianLapack(DATA* data, threadData_t *threadData, double* jac, int sysNumber)
 {
-  int i,j,k,l,ii,currentSys = sysNumber;
-  LINEAR_SYSTEM_DATA* systemData = &(((DATA*)data)->simulationInfo->linearSystemData[currentSys]);
+  int i,j,k,l,ii;
+  LINEAR_SYSTEM_DATA* systemData = &(data->simulationInfo->linearSystemData[sysNumber]);
 
   const int index = systemData->jacobianIndex;
   ANALYTIC_JACOBIAN* jacobian = systemData->parDynamicData[omc_get_thread_num()].jacobian;
@@ -128,7 +128,7 @@ int getAnalyticalJacobianLapack(DATA* data, threadData_t *threadData, double* ja
       if(jacobian->sparsePattern->colorCols[ii]-1 == i)
           jacobian->seedVars[ii] = 1;
 
-    ((systemData->analyticalJacobianColumn))(data, threadData, jacobian, parentJacobian);
+    systemData->analyticalJacobianColumn(data, threadData, jacobian, parentJacobian);
 
     for(j = 0; j < jacobian->sizeCols; j++) {
       if(jacobian->seedVars[j] == 1) {
@@ -155,9 +155,7 @@ int getAnalyticalJacobianLapack(DATA* data, threadData_t *threadData, double* ja
  */
 static int wrapper_fvec_lapack(_omc_vector* x, _omc_vector* f, int* iflag, RESIDUAL_USERDATA* resUserData, int sysNumber)
 {
-  int currentSys = sysNumber;
-
-  resUserData->data->simulationInfo->linearSystemData[currentSys].residualFunc(resUserData, x->data, f->data, iflag);
+  resUserData->data->simulationInfo->linearSystemData[sysNumber].residualFunc(resUserData, x->data, f->data, iflag);
   return 0;
 }
 
diff --git a/OMCompiler/SimulationRuntime/c/simulation/solver/linearSolverLis.c b/OMCompiler/SimulationRuntime/c/simulation/solver/linearSolverLis.c
@@ -149,7 +149,7 @@ void printLisMatrixCSR(LIS_MATRIX A, int n)
 int getAnalyticalJacobianLis(DATA* data, threadData_t *threadData, int sysNumber)
 {
   int i,j,k,l,ii;
-  LINEAR_SYSTEM_DATA* systemData = &(((DATA*)data)->simulationInfo->linearSystemData[sysNumber]);
+  LINEAR_SYSTEM_DATA* systemData = &(data->simulationInfo->linearSystemData[sysNumber]);
 
   const int index = systemData->jacobianIndex;
   ANALYTIC_JACOBIAN* jacobian = systemData->parDynamicData[omc_get_thread_num()].jacobian;
@@ -160,7 +160,7 @@ int getAnalyticalJacobianLis(DATA* data, threadData_t *threadData, int sysNumber
 
   for(i=0; i < jacobian->sizeRows; i++) {
     jacobian->seedVars[i] = 1;
-    ((systemData->analyticalJacobianColumn))(data, threadData, jacobian, parentJacobian);
+    systemData->analyticalJacobianColumn(data, threadData, jacobian, parentJacobian);
 
     for(j = 0; j < jacobian->sizeCols; j++) {
       if(jacobian->seedVars[j] == 1) {
diff --git a/OMCompiler/SimulationRuntime/c/simulation/solver/linearSolverTotalPivot.c b/OMCompiler/SimulationRuntime/c/simulation/solver/linearSolverTotalPivot.c
@@ -338,7 +338,7 @@ int freeTotalPivotData(void** voiddata)
 int getAnalyticalJacobianTotalPivot(DATA* data, threadData_t *threadData, double* jac, int sysNumber)
 {
   int i,j,k,l,ii;
-  LINEAR_SYSTEM_DATA* systemData = &(((DATA*)data)->simulationInfo->linearSystemData[sysNumber]);
+  LINEAR_SYSTEM_DATA* systemData = &(data->simulationInfo->linearSystemData[sysNumber]);
 
   const int index = systemData->jacobianIndex;
 
@@ -354,7 +354,7 @@ int getAnalyticalJacobianTotalPivot(DATA* data, threadData_t *threadData, double
       if(jacobian->sparsePattern->colorCols[ii]-1 == i)
         jacobian->seedVars[ii] = 1;
 
-    ((systemData->analyticalJacobianColumn))(data, threadData, jacobian, parentJacobian);
+    systemData->analyticalJacobianColumn(data, threadData, jacobian, parentJacobian);
 
     for(j = 0; j < jacobian->sizeCols; j++)
     {
diff --git a/OMCompiler/SimulationRuntime/c/simulation/solver/linearSolverUmfpack.c b/OMCompiler/SimulationRuntime/c/simulation/solver/linearSolverUmfpack.c
@@ -135,7 +135,7 @@ freeUmfPackData(void **voiddata)
 int getAnalyticalJacobianUmfPack(DATA* data, threadData_t *threadData, int sysNumber)
 {
   int i,ii,j,k,l;
-  LINEAR_SYSTEM_DATA* systemData = &(((DATA*)data)->simulationInfo->linearSystemData[sysNumber]);
+  LINEAR_SYSTEM_DATA* systemData = &(data->simulationInfo->linearSystemData[sysNumber]);
 
   const int index = systemData->jacobianIndex;
   ANALYTIC_JACOBIAN* jacobian = systemData->parDynamicData[omc_get_thread_num()].jacobian;
@@ -148,7 +148,7 @@ int getAnalyticalJacobianUmfPack(DATA* data, threadData_t *threadData, int sysNu
   {
     jacobian->seedVars[i] = 1;
 
-    ((systemData->analyticalJacobianColumn))(data, threadData, jacobian, parentJacobian);
+    systemData->analyticalJacobianColumn(data, threadData, jacobian, parentJacobian);
 
     for(j = 0; j < jacobian->sizeCols; j++)
     {
diff --git a/OMCompiler/SimulationRuntime/c/simulation/solver/newton_diagnostics.c b/OMCompiler/SimulationRuntime/c/simulation/solver/newton_diagnostics.c
@@ -110,13 +110,7 @@ double** MatMult( unsigned rA, unsigned cArB, unsigned cB, double** A, double**
 double** getJacobian( DATA* data, threadData_t *threadData, unsigned sysNumber, unsigned m)
 {
   NONLINEAR_SYSTEM_DATA* systemData = &(data->simulationInfo->nonlinearSystemData[sysNumber]);
-  ANALYTIC_JACOBIAN* jac = &(data->simulationInfo->analyticJacobians[systemData->jacobianIndex]);
-  assertStreamPrint(NULL, NULL != jac, "NEWTON_DIAGNOSTICS: invalid jac-pointer.");
-  assertStreamPrint(NULL, jac->availability != JACOBIAN_UNKNOWN, "NEWTON_DIAGNOSTICS: Jacobian availablity status is unknown.");
-  assertStreamPrint(NULL, NULL != jac->seedVars, "NEWTON_DIAGNOSTICS: invalid seedVars-pointer.");
-  assertStreamPrint(NULL, NULL != systemData, "NEWTON_DIAGNOSTICS: invalid systemData-pointer.");
-  assertStreamPrint(NULL, NULL != systemData->analyticalJacobianColumn, "NEWTON_DIAGNOSTICS: invalid analyticJacobianColumn-pointer.");
-
+  ANALYTIC_JACOBIAN* jac = NULL;
   unsigned i, j;
 
   // Allocate memory for fx (m * m matrix)
@@ -134,17 +128,23 @@ double** getJacobian( DATA* data, threadData_t *threadData, unsigned sysNumber,
   // ...
   // variable n:   df_n/dv_1, df_2/dv_2, .... df_n/dv_n
 
-  for (j = 0; j < m; j++) {
-    jac->seedVars[j] = 1.0;
+  if (systemData->jacobianIndex != -1) {
+    jac = &(data->simulationInfo->analyticJacobians[systemData->jacobianIndex]);
 
-    // Calculate values for one column of the Jacobian, output: df_1/dv_j, df_2/dv_j, .... df_n/dv_j
-    systemData->analyticalJacobianColumn(data, threadData, jac, NULL);
+    for (j = 0; j < m; j++) {
+      jac->seedVars[j] = 1.0;
 
-    // Store values in column of Jacobian
-    for (i = 0; i < m; i++)
-      fx[i][j] = jac->resultVars[i];
+      // Calculate values for one column of the Jacobian, output: df_1/dv_j, df_2/dv_j, .... df_n/dv_j
+      systemData->analyticalJacobianColumn(data, threadData, jac, NULL);
+
+      // Store values in column of Jacobian
+      for (i = 0; i < m; i++)
+        fx[i][j] = jac->resultVars[i];
 
-    jac->seedVars[j] = 0.0;
+      jac->seedVars[j] = 0.0;
+    }
+  } else {
+    assertStreamPrint(NULL, FALSE, "NEWTON_DIAGNOSTICS: numeric jacobian not yet supported.");
   }
 
   return fx;
diff --git a/OMCompiler/SimulationRuntime/c/simulation/solver/nonlinearSolverHomotopy.c b/OMCompiler/SimulationRuntime/c/simulation/solver/nonlinearSolverHomotopy.c
@@ -852,7 +852,7 @@ int getAnalyticalJacobianHomotopy(DATA_HOMOTOPY* solverData, double* jac)
       if(jacobian->sparsePattern->colorCols[ii]-1 == i)
         jacobian->seedVars[ii] = 1;
 
-    ((systemData->analyticalJacobianColumn))(data, threadData, jacobian, NULL);
+    systemData->analyticalJacobianColumn(data, threadData, jacobian, NULL);
 
     for(j = 0; j < jacobian->sizeCols; j++)
     {
@@ -863,7 +863,6 @@ int getAnalyticalJacobianHomotopy(DATA_HOMOTOPY* solverData, double* jac)
         {
           l  = jacobian->sparsePattern->index[ii];
           k  = j*jacobian->sizeRows + l;
-          /* Calculate scaled difference quotient */
           jac[k] = jacobian->resultVars[l] * solverData->xScaling[j];
           ii++;
         };
@@ -975,14 +974,12 @@ int wrapper_fvec_constraints(DATA_HOMOTOPY* solverData, double* x, double* f)
 static int wrapper_fvec_der(DATA_HOMOTOPY* solverData, double* x, double* fJac)
 {
   NONLINEAR_SYSTEM_DATA* nlsData = solverData->userData->nlsData;
-  int jacobianIndex = nlsData->jacobianIndex;
-  int i;
 
   /* performance measurement */
   rt_ext_tp_tick(&nlsData->jacobianTimeClock);
 
   /* calculate jacobian */
-  if(jacobianIndex != -1)
+  if(nlsData->jacobianIndex != -1)
   {
     /* !!!!!!!!!!! Be sure that actual x is used !!!!!!!!!!! */
     getAnalyticalJacobianHomotopy(solverData, fJac);
@@ -2244,7 +2241,7 @@ NLS_SOLVER_STATUS solveHomotopy(DATA *data, threadData_t *threadData, NONLINEAR_
       /* evaluate with discontinuities */
       if(data->simulationInfo->discreteCall)
       {
-        ((DATA*)data)->simulationInfo->solveContinuous = 0;
+        data->simulationInfo->solveContinuous = 0;
       }
       /* evaluate with discontinuities */
 #ifndef OMC_EMCC
@@ -2310,7 +2307,7 @@ NLS_SOLVER_STATUS solveHomotopy(DATA *data, threadData_t *threadData, NONLINEAR_
           homotopyData->x0[i] = homotopyData->xStart[i] + homotopyData->xScaling[i]*i/homotopyData->n*0.1;
       }
     }
-    ((DATA*)data)->simulationInfo->solveContinuous = 1;
+    data->simulationInfo->solveContinuous = 1;
     vecCopy(homotopyData->n, homotopyData->x0, homotopyData->x);
     vecCopy(homotopyData->n, homotopyData->f1, homotopyData->fx0);
   }
@@ -2356,9 +2353,9 @@ NLS_SOLVER_STATUS solveHomotopy(DATA *data, threadData_t *threadData, NONLINEAR_
       /* This case may be switched off, because of event chattering!!!*/
       if(mixedSystem && data->simulationInfo->discreteCall && (alreadyTested<1))
       {
-        debugVectorBool(OMC_LOG_NLS_V,"Relations Pre vector", ((DATA*)data)->simulationInfo->relationsPre, ((DATA*)data)->modelData->nRelations);
-        debugVectorBool(OMC_LOG_NLS_V,"Relations Backup vector", relationsPreBackup, ((DATA*)data)->modelData->nRelations);
-        ((DATA*)data)->simulationInfo->solveContinuous = 0;
+        debugVectorBool(OMC_LOG_NLS_V,"Relations Pre vector", data->simulationInfo->relationsPre, data->modelData->nRelations);
+        debugVectorBool(OMC_LOG_NLS_V,"Relations Backup vector", relationsPreBackup, data->modelData->nRelations);
+        data->simulationInfo->solveContinuous = 0;
 
         if (homotopyData->casualTearingSet){
           constraintViolated = homotopyData->f_con(homotopyData, homotopyData->x, homotopyData->f1);
@@ -2370,8 +2367,8 @@ NLS_SOLVER_STATUS solveHomotopy(DATA *data, threadData_t *threadData, NONLINEAR_
         else
           homotopyData->f(homotopyData, homotopyData->x, homotopyData->f1);
 
-        debugVectorBool(OMC_LOG_NLS_V,"Relations vector", ((DATA*)data)->simulationInfo->relations, ((DATA*)data)->modelData->nRelations);
-        if (isNotEqualVectorInt(((DATA*)data)->modelData->nRelations, ((DATA*)data)->simulationInfo->relations, relationsPreBackup)>0)
+        debugVectorBool(OMC_LOG_NLS_V,"Relations vector", data->simulationInfo->relations, data->modelData->nRelations);
+        if (isNotEqualVectorInt(data->modelData->nRelations, data->simulationInfo->relations, relationsPreBackup)>0)
         {
           /* re-run the solution process, since relations in the system have changed */
           success = NLS_FAILED;
@@ -2397,7 +2394,7 @@ NLS_SOLVER_STATUS solveHomotopy(DATA *data, threadData_t *threadData, NONLINEAR_
         /* take the solution */
         vecCopy(homotopyData->n, homotopyData->x, nlsData->nlsx);
         /* reset continous flag */
-        ((DATA*)data)->simulationInfo->solveContinuous = 0;
+        data->simulationInfo->solveContinuous = 0;
         break;
       }
     }
diff --git a/OMCompiler/SimulationRuntime/c/simulation/solver/nonlinearSolverHybrd.c b/OMCompiler/SimulationRuntime/c/simulation/solver/nonlinearSolverHybrd.c
@@ -263,7 +263,6 @@ static int getAnalyticalJacobian(NLS_USERDATA* hybrdUserData, double* jac)
   threadData_t *threadData = hybrdUserData->threadData;
   NONLINEAR_SYSTEM_DATA* systemData = hybrdUserData->nlsData;
   DATA_HYBRD* solverData = (DATA_HYBRD*)(systemData->solverData);
-  const int index = systemData->jacobianIndex;
   ANALYTIC_JACOBIAN* jacobian = hybrdUserData->analyticJacobian;
 
   memset(jac, 0, (solverData->n)*(solverData->n)*sizeof(double));
@@ -280,9 +279,9 @@ static int getAnalyticalJacobian(NLS_USERDATA* hybrdUserData, double* jac)
       if(jacobian->sparsePattern->colorCols[ii]-1 == i)
         jacobian->seedVars[ii] = 1;
 
-    ((systemData->analyticalJacobianColumn))(data, threadData, jacobian, NULL);
+    systemData->analyticalJacobianColumn(data, threadData, jacobian, NULL);
 
-    for(j=0; j<jacobian->sizeCols; j++)
+    for(j = 0; j < jacobian->sizeCols; j++)
     {
       if(jacobian->seedVars[j] == 1)
       {
diff --git a/OMCompiler/SimulationRuntime/c/simulation/solver/nonlinearSystem.c b/OMCompiler/SimulationRuntime/c/simulation/solver/nonlinearSystem.c
@@ -1198,7 +1198,7 @@ int solve_nonlinear_system(DATA *data, threadData_t *threadData, int sysNumber)
 
   /* enable to avoid division by zero */
   data->simulationInfo->noThrowDivZero = 1;
-  ((DATA*)data)->simulationInfo->solveContinuous = 1;
+  data->simulationInfo->solveContinuous = 1;
 
   /* performance measurement */
   rt_ext_tp_tick(&nonlinsys->totalTimeClock);
@@ -1400,7 +1400,7 @@ int solve_nonlinear_system(DATA *data, threadData_t *threadData, int sysNumber)
 
   /* enable to avoid division by zero */
   data->simulationInfo->noThrowDivZero = 0;
-  ((DATA*)data)->simulationInfo->solveContinuous = 0;
+  data->simulationInfo->solveContinuous = 0;
 
   /* performance measurement and statistics */
   nonlinsys->totalTime += rt_ext_tp_tock(&(nonlinsys->totalTimeClock));
diff --git a/OMCompiler/SimulationRuntime/c/simulation/solver/stateset.c b/OMCompiler/SimulationRuntime/c/simulation/solver/stateset.c
@@ -86,15 +86,13 @@ void initializeStateSetJacobians(DATA *data, threadData_t *threadData)
   TRACE_PUSH
   long i = 0;
   STATE_SET_DATA *set = NULL;
-  unsigned int jacIndex;
   ANALYTIC_JACOBIAN* jacobian;
 
   /* go troug all state sets*/
   for(i=0; i<data->modelData->nStateSets; i++)
   {
     set = &(data->simulationInfo->stateSetData[i]);
-    jacIndex = set->jacobianIndex;
-    jacobian = &(data->simulationInfo->analyticJacobians[jacIndex]);
+    jacobian = &(data->simulationInfo->analyticJacobians[set->jacobianIndex]);
 
     if(set->initialAnalyticalJacobian(data, threadData, jacobian))
     {
@@ -183,7 +181,7 @@ static void getAnalyticalJacobianSet(DATA* data, threadData_t *threadData, unsig
 {
   TRACE_PUSH
   unsigned int i, j, k, l, ii;
-  unsigned int jacIndex = data->simulationInfo->stateSetData[index].jacobianIndex;
+  const unsigned int jacIndex = data->simulationInfo->stateSetData[index].jacobianIndex;
   ANALYTIC_JACOBIAN* jacobian = &(data->simulationInfo->analyticJacobians[jacIndex]);
 
   unsigned int nrows = jacobian->sizeRows;

Original file line number	Diff line number	Diff line change
`@@ -645,7 +645,7 @@ int nlsSparseSymJac(N_Vector vecX, N_Vector vecFX, SUNMatrix Jac,`
`645`	`645`	`}`
`646`	`646`	`}`
`647`	`647`	`/* Evaluate Jacobian column */`
`648`		`- ((nlsData->analyticalJacobianColumn))(data, threadData, analyticJacobian, NULL);`
	`648`	`+ nlsData->analyticalJacobianColumn(data, threadData, analyticJacobian, NULL);`
`649`	`649`
`650`	`650`	`/* Save column in Jac and unset seed variables */`
`651`	`651`	`for (ii = 0; ii < kinsolData->size; ii++) {`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ static int getAnalyticalJacobian(DATA* data, threadData_t *threadData,`
`120`	`120`	`{`
`121`	`121`	`int i,ii,j,k,l;`
`122`	`122`
`123`		`- LINEAR_SYSTEM_DATA* systemData = &(((DATA*)data)->simulationInfo->linearSystemData[sysNumber]);`
	`123`	`+ LINEAR_SYSTEM_DATA* systemData = &(data->simulationInfo->linearSystemData[sysNumber]);`
`124`	`124`
`125`	`125`	`const int index = systemData->jacobianIndex;`
`126`	`126`	`ANALYTIC_JACOBIAN* jacobian = systemData->parDynamicData[omc_get_thread_num()].jacobian;`
`@@ -144,7 +144,7 @@ static int getAnalyticalJacobian(DATA* data, threadData_t *threadData,`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`
`147`		`- ((systemData->analyticalJacobianColumn))(data, threadData, jacobian, parentJacobian);`
	`147`	`+ systemData->analyticalJacobianColumn(data, threadData, jacobian, parentJacobian);`
`148`	`148`
`149`	`149`	`for(j = 0; j < jacobian->sizeCols; j++)`
`150`	`150`	`{`
Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@ int freeTotalPivotData(void** voiddata)`
`338`	`338`	`int getAnalyticalJacobianTotalPivot(DATA* data, threadData_t threadData, double jac, int sysNumber)`
`339`	`339`	`{`
`340`	`340`	`int i,j,k,l,ii;`
`341`		`- LINEAR_SYSTEM_DATA* systemData = &(((DATA*)data)->simulationInfo->linearSystemData[sysNumber]);`
	`341`	`+ LINEAR_SYSTEM_DATA* systemData = &(data->simulationInfo->linearSystemData[sysNumber]);`
`342`	`342`
`343`	`343`	`const int index = systemData->jacobianIndex;`
`344`	`344`
`@@ -354,7 +354,7 @@ int getAnalyticalJacobianTotalPivot(DATA* data, threadData_t *threadData, double`
`354`	`354`	`if(jacobian->sparsePattern->colorCols[ii]-1 == i)`
`355`	`355`	`jacobian->seedVars[ii] = 1;`
`356`	`356`
`357`		`- ((systemData->analyticalJacobianColumn))(data, threadData, jacobian, parentJacobian);`
	`357`	`+ systemData->analyticalJacobianColumn(data, threadData, jacobian, parentJacobian);`
`358`	`358`
`359`	`359`	`for(j = 0; j < jacobian->sizeCols; j++)`
`360`	`360`	`{`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ freeUmfPackData(void **voiddata)`
`135`	`135`	`int getAnalyticalJacobianUmfPack(DATA* data, threadData_t *threadData, int sysNumber)`
`136`	`136`	`{`
`137`	`137`	`int i,ii,j,k,l;`
`138`		`- LINEAR_SYSTEM_DATA* systemData = &(((DATA*)data)->simulationInfo->linearSystemData[sysNumber]);`
	`138`	`+ LINEAR_SYSTEM_DATA* systemData = &(data->simulationInfo->linearSystemData[sysNumber]);`
`139`	`139`
`140`	`140`	`const int index = systemData->jacobianIndex;`
`141`	`141`	`ANALYTIC_JACOBIAN* jacobian = systemData->parDynamicData[omc_get_thread_num()].jacobian;`
`@@ -148,7 +148,7 @@ int getAnalyticalJacobianUmfPack(DATA* data, threadData_t *threadData, int sysNu`
`148`	`148`	`{`
`149`	`149`	`jacobian->seedVars[i] = 1;`
`150`	`150`
`151`		`- ((systemData->analyticalJacobianColumn))(data, threadData, jacobian, parentJacobian);`
	`151`	`+ systemData->analyticalJacobianColumn(data, threadData, jacobian, parentJacobian);`
`152`	`152`
`153`	`153`	`for(j = 0; j < jacobian->sizeCols; j++)`
`154`	`154`	`{`