From 9cf1f2c3ba7c481e8be8d017ece233c312294ab7 Mon Sep 17 00:00:00 2001 From: Adrian Pop Date: Mon, 13 May 2013 19:23:37 +0000 Subject: [PATCH] - ansi C. for pleasing MSVC git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@16023 f25d12d1-65f4-0310-ae8a-bbce733d8d8e --- .../c/simulation/solver/nonlinearSolverHybrd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/SimulationRuntime/c/simulation/solver/nonlinearSolverHybrd.c b/SimulationRuntime/c/simulation/solver/nonlinearSolverHybrd.c index 96cb1c2a81b..d19cbbfeef7 100644 --- a/SimulationRuntime/c/simulation/solver/nonlinearSolverHybrd.c +++ b/SimulationRuntime/c/simulation/solver/nonlinearSolverHybrd.c @@ -646,6 +646,7 @@ int solveHybrd(DATA *data, int sysNumber) } else if((solverData->info == 4 || solverData->info == 5) && retries < 6) { + int scaling = 0; /* try to disable x-Scaling */ /* set x vector */ @@ -654,7 +655,7 @@ int solveHybrd(DATA *data, int sysNumber) else memcpy(solverData->x, systemData->nlsxExtrapolation, solverData->n*(sizeof(double))); - int scaling = solverData->useXScaling; + scaling = solverData->useXScaling; if(scaling) solverData->useXScaling = 0; @@ -693,10 +694,11 @@ int solveHybrd(DATA *data, int sysNumber) } /* Then try with old values (instead of extrapolating )*/ } else if((solverData->info == 4 || solverData->info == 5) && retries2 < 1) { + int scaling = 0; /* set x vector */ memcpy(solverData->x, systemData->nlsxOld, solverData->n*(sizeof(double))); - int scaling = solverData->useXScaling; + scaling = solverData->useXScaling; if(!scaling) solverData->useXScaling = 1;