[Runtime] fix some debug outputs in kinsol solver

Willi Braun · OpenModelica-Hudson · commit d4122a2d85e9 · 2018-04-24T00:38:41.000+02:00
Belonging to [master]: - #2388
diff --git a/SimulationRuntime/c/simulation/solver/kinsolSolver.c b/SimulationRuntime/c/simulation/solver/kinsolSolver.c
@@ -139,7 +139,7 @@ static void nlsKinsolJacSumDense(DlsMat mat);
 
 int checkReturnFlag(int flag)
 {
-  int retVal;
+  int retVal = flag;
   switch(flag)
   {
   case KIN_SUCCESS:
@@ -599,7 +599,8 @@ void nlsKinsolJacSumDense(DlsMat mat)
   int i,j;
   double sum;
 
-  for(i=0; i<mat->M; ++i,sum=0.0){
+  for(i=0; i<mat->M; ++i){
+    sum = 0.0;
     for(j=0; j<mat->N;++j){
       sum += fabs(DENSE_ELEM(mat,j,i));
     }
@@ -787,7 +788,7 @@ void nlsKinsolFScaling(DATA* data, NLS_KINSOL_DATA *kinsolData, NONLINEAR_SYSTEM
 }
 
 static
-int nlsKinsolConfigPrint(NLS_KINSOL_DATA *kinsolData, NONLINEAR_SYSTEM_DATA *nlsData)
+void nlsKinsolConfigPrint(NLS_KINSOL_DATA *kinsolData, NONLINEAR_SYSTEM_DATA *nlsData)
 {
   int retValue;
   double fNorm;
@@ -816,8 +817,6 @@ int nlsKinsolConfigPrint(NLS_KINSOL_DATA *kinsolData, NONLINEAR_SYSTEM_DATA *nls
   infoStreamPrint(LOG_NLS_V, 0, "KINSOL linear solver %d", kinsolData->linearSolverMethod);
 
   messageClose(LOG_NLS_V);
-
-  return retValue;
 }
 
 static

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ static void nlsKinsolJacSumDense(DlsMat mat);`
`139`	`139`
`140`	`140`	`int checkReturnFlag(int flag)`
`141`	`141`	`{`
`142`		`- int retVal;`
	`142`	`+ int retVal = flag;`
`143`	`143`	`switch(flag)`
`144`	`144`	`{`
`145`	`145`	`case KIN_SUCCESS:`
`@@ -599,7 +599,8 @@ void nlsKinsolJacSumDense(DlsMat mat)`
`599`	`599`	`int i,j;`
`600`	`600`	`double sum;`
`601`	`601`
`602`		`- for(i=0; i<mat->M; ++i,sum=0.0){`
	`602`	`+ for(i=0; i<mat->M; ++i){`
	`603`	`+ sum = 0.0;`
`603`	`604`	`for(j=0; j<mat->N;++j){`
`604`	`605`	`sum += fabs(DENSE_ELEM(mat,j,i));`
`605`	`606`	`}`
`@@ -787,7 +788,7 @@ void nlsKinsolFScaling(DATA* data, NLS_KINSOL_DATA *kinsolData, NONLINEAR_SYSTEM`
`787`	`788`	`}`
`788`	`789`
`789`	`790`	`static`
`790`		`-int nlsKinsolConfigPrint(NLS_KINSOL_DATA kinsolData, NONLINEAR_SYSTEM_DATA nlsData)`
	`791`	`+void nlsKinsolConfigPrint(NLS_KINSOL_DATA kinsolData, NONLINEAR_SYSTEM_DATA nlsData)`
`791`	`792`	`{`
`792`	`793`	`int retValue;`
`793`	`794`	`double fNorm;`
`@@ -816,8 +817,6 @@ int nlsKinsolConfigPrint(NLS_KINSOL_DATA kinsolData, NONLINEAR_SYSTEM_DATA nls`
`816`	`817`	`infoStreamPrint(LOG_NLS_V, 0, "KINSOL linear solver %d", kinsolData->linearSolverMethod);`
`817`	`818`
`818`	`819`	`messageClose(LOG_NLS_V);`
`819`		`-`
`820`		`- return retValue;`
`821`	`820`	`}`
`822`	`821`
`823`	`822`	`static`