some fixes from static analysis

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@21892 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Aug 17, 2014 · d9e41cc · d9e41cc
1 parent 2b24682
commit d9e41cc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/SimulationRuntime/c/optimization/DataManagement/DerStructure.c b/SimulationRuntime/c/optimization/DataManagement/DerStructure.c
@@ -53,7 +53,6 @@ inline void allocate_der_struct(OptDataStructure *s, OptDataDim * dim, DATA* dat
   const int nJ2 = dim->nJ2;
   int i, j, k;
   char * cflags;
-  const int indexBC[2] = {data->callback->INDEX_JAC_B, optData->data->callback->INDEX_JAC_C};
   cflags = (char*)omc_flagValue[FLAG_UP_HESSIAN];
   if(cflags)
   {

diff --git a/SimulationRuntime/c/optimization/DataManagement/InitialGuess.c b/SimulationRuntime/c/optimization/DataManagement/InitialGuess.c
@@ -313,7 +313,7 @@ static inline void smallIntSolverStep(DATA* data, SOLVER_INFO* solverInfo, const
       if(++iter >  10){
         printf("\n");
         warningStreamPrint(LOG_STDOUT, 0, "Initial guess failure at time %.12g", solverInfo->currentTime);
-        break;
+        assert(0);
       }
     }while(err < 0);
 

diff --git a/SimulationRuntime/c/optimization/DataManagement/MoveData.c b/SimulationRuntime/c/optimization/DataManagement/MoveData.c
@@ -517,7 +517,7 @@ void optData2ModelData(OptData *optData, double *vopt, const int index){
 
   int i, j, k, shift, l;
   DATA * data = optData->data;
-  const int indexBC[2] = {data->callback->INDEX_JAC_B, data->callback->INDEX_JAC_C};
+  const int * indexBC = optData->s.indexABCD + 3;
   OptDataDim * dim = &optData->dim;
 
   for(l = 0; l < 3; ++l)