added LOG_SOLVER_V

OpenModelica · Dec 13, 2016 · d1d09a1 · d1d09a1
1 parent ab3e53f
commit d1d09a1
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git a/SimulationRuntime/c/simulation/simulation_runtime.cpp b/SimulationRuntime/c/simulation/simulation_runtime.cpp
@@ -182,6 +182,10 @@ void setGlobalVerboseLevel(int argc, char**argv)
   if(useStream[LOG_INIT])
     useStream[LOG_SOTI] = 1;
 
+  /* print LOG_STATS if LOG_SOLVER if active */
+  if(useStream[LOG_SOLVER_V] == 1)
+    useStream[LOG_SOLVER] = 1;
+
   /* print LOG_STATS if LOG_SOLVER if active */
   if(useStream[LOG_SOLVER] == 1)
     useStream[LOG_STATS] = 1;

diff --git a/SimulationRuntime/c/simulation/solver/dassl.c b/SimulationRuntime/c/simulation/solver/dassl.c
@@ -193,7 +193,7 @@ int dassl_initial(DATA* data, threadData_t *threadData, SOLVER_INFO* solverInfo,
   {
     dasslData->rtol[i] = data->simulationInfo->tolerance;
     dasslData->atol[i] = data->simulationInfo->tolerance * fmax(fabs(data->modelData->realVarsData[i].attribute.nominal), 1e-32);
-    infoStreamPrint(LOG_SOLVER, 0, "%d. %s -> %g", i+1, data->modelData->realVarsData[i].info.name, dasslData->atol[i]);
+    infoStreamPrint(LOG_SOLVER_V, 0, "%d. %s -> %g", i+1, data->modelData->realVarsData[i].info.name, dasslData->atol[i]);
   }
   messageClose(LOG_SOLVER);
 

diff --git a/SimulationRuntime/c/simulation/solver/ida_solver.c b/SimulationRuntime/c/simulation/solver/ida_solver.c
@@ -216,7 +216,7 @@ ida_solver_initial(DATA* data, threadData_t *threadData, SOLVER_INFO* solverInfo
   for(i=0; i < data->modelData->nStates; ++i)
   {
     tmp[i] = data->simulationInfo->tolerance * fmax(fabs(data->modelData->realVarsData[i].attribute.nominal), 1e-32);
-     infoStreamPrint(LOG_SOLVER, 0, "%ld. %s -> %g", i+1, data->modelData->realVarsData[i].info.name, tmp[i]);
+     infoStreamPrint(LOG_SOLVER_V, 0, "%ld. %s -> %g", i+1, data->modelData->realVarsData[i].info.name, tmp[i]);
   }
   /* daeMode: set nominal values for algebraic variables */
   if (idaData->daeMode)

diff --git a/SimulationRuntime/c/simulation/solver/nonlinearSystem.c b/SimulationRuntime/c/simulation/solver/nonlinearSystem.c
@@ -863,7 +863,7 @@ int check_nonlinear_solution(DATA *data, int printFailingSystems, int sysNumber)
     warningStreamPrintWithEquationIndexes(LOG_NLS, 1, indexes, "nonlinear system %d fails: at t=%g", index, data->localData[0]->timeValue);
     if(data->simulationInfo->initial)
     {
-      warningStreamPrint(LOG_NLS, 0, "proper start-values for some of the following iteration variables might help");
+      warningStreamPrint(LOG_NLS_V, 0, "proper start-values for some of the following iteration variables might help");
     }
     for(j=0; j<modelInfoGetEquation(&data->modelData->modelDataXml, (nonlinsys[i]).equationIndex).numVar; ++j) {
       int done=0;
@@ -874,15 +874,15 @@ int check_nonlinear_solution(DATA *data, int printFailingSystems, int sysNumber)
         if (!strcmp(mData->realVarsData[k].info.name, modelInfoGetEquation(&data->modelData->modelDataXml, (nonlinsys[i]).equationIndex).vars[j]))
         {
         done = 1;
-        warningStreamPrint(LOG_NLS, 0, "[%ld] Real %s(start=%g, nominal=%g)", j+1,
+        warningStreamPrint(LOG_NLS_V, 0, "[%ld] Real %s(start=%g, nominal=%g)", j+1,
                                      mData->realVarsData[k].info.name,
                                      mData->realVarsData[k].attribute.start,
                                      mData->realVarsData[k].attribute.nominal);
         }
       }
       if (!done)
       {
-        warningStreamPrint(LOG_NLS, 0, "[%ld] Real %s(start=?, nominal=?)", j+1, modelInfoGetEquation(&data->modelData->modelDataXml, (nonlinsys[i]).equationIndex).vars[j]);
+        warningStreamPrint(LOG_NLS_V, 0, "[%ld] Real %s(start=?, nominal=?)", j+1, modelInfoGetEquation(&data->modelData->modelDataXml, (nonlinsys[i]).equationIndex).vars[j]);
       }
     }
     messageCloseWarning(LOG_NLS);

diff --git a/SimulationRuntime/c/util/omc_error.c b/SimulationRuntime/c/util/omc_error.c
@@ -69,6 +69,7 @@ const char *LOG_STREAM_NAME[SIM_LOG_MAX] = {
   "LOG_RT",
   "LOG_SIMULATION",
   "LOG_SOLVER",
+  "LOG_SOLVER_V",
   "LOG_SOLVER_CONTEXT",
   "LOG_SOTI",
   "LOG_STATS",
@@ -113,6 +114,7 @@ const char *LOG_STREAM_DESC[SIM_LOG_MAX] = {
   "additional information regarding real-time processes",/* LOG_RT */
   "additional information about simulation process",     /* LOG_SIMULATION */
   "additional information about solver process",         /* LOG_SOLVER */
+  "verbose information about the integration process",   /* LOG_SOLVER_V */
   "context information during the solver process",       /* LOG_SOLVER_CONTEXT" */
   "final solution of the initialization",                /* LOG_SOTI */
   "additional statistics about timer/events/solver",     /* LOG_STATS */

diff --git a/SimulationRuntime/c/util/omc_error.h b/SimulationRuntime/c/util/omc_error.h
@@ -107,6 +107,7 @@ enum LOG_STREAM
   LOG_RT,
   LOG_SIMULATION,
   LOG_SOLVER,
+  LOG_SOLVER_V,
   LOG_SOLVER_CONTEXT,
   LOG_SOTI,
   LOG_STATS,