introduced new debug flag LOG_NLS_RES into simulation runtime, to mon…

…itor every evaluation of the residual function git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@17526 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Oct 4, 2013 · f3e2188 · f3e2188
1 parent 1ffaf91
commit f3e2188
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 0 deletions.
diff --git a/SimulationRuntime/c/simulation/simulation_runtime.cpp b/SimulationRuntime/c/simulation/simulation_runtime.cpp
@@ -230,6 +230,10 @@ void setGlobalVerboseLevel(int argc, char**argv)
   if(useStream[LOG_NLS_V])
     useStream[LOG_NLS] = 1;
 
+  /* print LOG_NLS if LOG_NLS_RES if active */
+  if(useStream[LOG_NLS_RES])
+    useStream[LOG_NLS] = 1;
+
   /* print LOG_EVENTS if LOG_EVENTS_V if active */
   if(useStream[LOG_EVENTS_V])
     useStream[LOG_EVENTS] = 1;

diff --git a/SimulationRuntime/c/simulation/solver/nonlinearSolverHybrd.c b/SimulationRuntime/c/simulation/solver/nonlinearSolverHybrd.c
@@ -337,9 +337,21 @@ static int wrapper_fvec_hybrj(integer* n, double* x, double* f, double* fjac, in
       for(i=0; i<*n; i++)
         x[i] = x[i]*solverData->xScalefactors[i];
 
+    /* debug output */
+    if(ACTIVE_STREAM(LOG_NLS_RES)) {
+      INFO1(LOG_NLS_RES, "-- residual function call %d --", solverData->nfev);
+      printVector(x, n, LOG_NLS_RES, "x vector");
+    }
+
     /* call residual function */
     (systemData->residualFunc)(data, x, f, iflag);
 
+    /* debug output */
+    if(ACTIVE_STREAM(LOG_NLS_RES)) {
+      printVector(f, n, LOG_NLS_RES, "residuals");
+      INFO1(LOG_NLS_RES, "-- end of residual function call %d --", solverData->nfev);
+    }
+
     /* Scaling x vector */
     if(solverData->useXScaling)
       for(i=0; i<*n; i++)

diff --git a/SimulationRuntime/c/util/omc_error.c b/SimulationRuntime/c/util/omc_error.c
@@ -59,6 +59,7 @@ const char *LOG_STREAM_NAME[LOG_MAX] = {
   "LOG_NLS",
   "LOG_NLS_V",
   "LOG_NLS_JAC",
+  "LOG_NLS_RES",
   "LOG_RES_INIT",
   "LOG_SIMULATION",
   "LOG_SOLVER",
@@ -87,6 +88,7 @@ const char *LOG_STREAM_DESC[LOG_MAX] = {
   "logging for nonlinear systems",                      /* LOG_NLS */
   "verbose logging of nonlinear systems",               /* LOG_NLS_V */
   "outputs the jacobian of nonlinear systems",          /* LOG_NLS_JAC */
+  "outputs every evaluation of the residual function",  /* LOG_NLS_RES */
   "outputs residuals of the initialization",            /* LOG_RES_INIT */
   "additional information about simulation process",    /* LOG_SIMULATION */
   "additional information about solver process",        /* LOG_SOLVER */

diff --git a/SimulationRuntime/c/util/omc_error.h b/SimulationRuntime/c/util/omc_error.h
@@ -98,6 +98,7 @@ enum LOG_STREAM
   LOG_NLS,
   LOG_NLS_V,
   LOG_NLS_JAC,
+  LOG_NLS_RES,
   LOG_RES_INIT,
   LOG_SIMULATION,
   LOG_SOLVER,