- fix some runtime messages

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@21219 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jun 20, 2014 · aaf147e · aaf147e
1 parent 774bc97
commit aaf147e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/SimulationRuntime/c/optimization/DataManagement/DerStructure.c b/SimulationRuntime/c/optimization/DataManagement/DerStructure.c
@@ -55,10 +55,12 @@ inline void allocate_der_struct(OptDataStructure *s, OptDataDim * dim, DATA* dat
   char * cflags;
 
   cflags = (char*)omc_flagValue[FLAG_UP_HESSIAN];
-  if(cflags){
+  if(cflags)
+  {
     optData->dim.updateHessian = atoi(cflags);
-    if(optData->dim.updateHessian < 0){
-      warningStreamPrint(LOG_STDOUT, 1, "not support %i for keep hessian-matrix constant.", optData->dim.updateHessian);
+    if(optData->dim.updateHessian < 0)
+    {
+      warningStreamPrint(LOG_STDOUT, 0, "not support %i for keep hessian-matrix constant.", optData->dim.updateHessian);
       optData->dim.updateHessian = 0;
     }
   }else{

diff --git a/SimulationRuntime/c/optimization/DataManagement/InitialGuess.c b/SimulationRuntime/c/optimization/DataManagement/InitialGuess.c
@@ -167,8 +167,10 @@ static inline void initial_guess_ipopt_sim(OptData *optData, SOLVER_INFO* solver
  *  helper for initial_guess_optimizer (pick up clfag option)
  *  author: Vitalij Ruge
  **/
-static int initial_guess_ipopt_cflag(OptData *optData, char* cflags){
-  if(!strcmp(cflags,"const") || !strcmp(cflags,"CONST")){
+static int initial_guess_ipopt_cflag(OptData *optData, char* cflags)
+{
+  if(!strcmp(cflags,"const") || !strcmp(cflags,"CONST"))
+  {
     int i, j;
     const int nsi = optData->dim.nsi;
     const int np = optData->dim.np;
@@ -191,7 +193,7 @@ static int initial_guess_ipopt_cflag(OptData *optData, char* cflags){
     return 1;
   }
 
-  warningStreamPrint(LOG_STDOUT, 1, "not support ipopt_init=%s", cflags);
+  warningStreamPrint(LOG_STDOUT, 0, "not support ipopt_init=%s", cflags);
   return 1;
 
 }

diff --git a/SimulationRuntime/c/optimization/optimizer_main.c b/SimulationRuntime/c/optimization/optimizer_main.c
@@ -115,7 +115,7 @@ static inline void optimizationWithIpopt(OptData*optData){
     else if(!strcmp(cflags,"const") || !strcmp(cflags,"CONST"))
       AddIpoptStrOption(nlp, "hessian_constant", "yes");
     else
-      warningStreamPrint(LOG_STDOUT, 1, "not support ipopt_hesse=%s",cflags);
+      warningStreamPrint(LOG_STDOUT, 0, "not support ipopt_hesse=%s",cflags);
   }
 
   cflags = (char*)omc_flagValue[FLAG_LS_IPOPT];

diff --git a/SimulationRuntime/c/simulation/solver/linearSolverLapack.c b/SimulationRuntime/c/simulation/solver/linearSolverLapack.c
@@ -123,6 +123,7 @@ int solveLapack(DATA *data, int sysNumber)
         sprintf(buffer, "%s%20.12g ", buffer, systemData->A[i + j*n]);
       infoStreamPrint(LOG_LS_V, 0, "%s", buffer);
     }
+    messageClose(LOG_LS_V);
 
   /* b vector */
     infoStreamPrint(LOG_LS_V, 1, "b vector [%d]", n);

diff --git a/SimulationRuntime/c/simulation/solver/solver_main.c b/SimulationRuntime/c/simulation/solver/solver_main.c
@@ -369,15 +369,17 @@ int initializeModel(DATA* data, const char* init_initMethod,
   {
     int success = 0;
     MMC_TRY_INTERNAL(simulationJumpBuffer)
-    if(initialization(data, init_initMethod, init_optiMethod, init_file, init_time, lambda_steps)) {
+    if(initialization(data, init_initMethod, init_optiMethod, init_file, init_time, lambda_steps))
+    {
       warningStreamPrint(LOG_STDOUT, 0, "Error in initialization. Storing results and exiting.\nUse -lv=LOG_INIT -w for more information.");
       simInfo->stopTime = simInfo->startTime;
       retValue = -1;
     }
 
     success = 1;
     MMC_CATCH_INTERNAL(simulationJumpBuffer)
-    if (!success) {
+    if (!success)
+    {
       retValue =  -1;
       infoStreamPrint(LOG_ASSERT, 0, "simulation terminated by an assertion at initialization");
     }