- fix a debug-message

- add some additional TRACE information


git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@20765 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: lochel

SimulationRuntime/c/simulation/options.c

@@ -68,7 +68,7 @@ int checkCommandLineArguments(int argc, char **argv)
     debugStreamPrint(LOG_STDOUT, 0, "%s", argv[i]);
   messageClose(LOG_STDOUT);
 
-  debugStreamPrint(LOG_STDOUT, 0, "interpreted command line options");
+  debugStreamPrint(LOG_STDOUT, 1, "interpreted command line options");
 #endif
 
   for(i=1; i<argc; ++i)
@@ -125,11 +125,19 @@ int checkCommandLineArguments(int argc, char **argv)
       }
     }
 
-    if(!found) {
+    if(!found)
+    {
+#ifdef USE_DEBUG_OUTPUT
+  messageClose(LOG_STDOUT);
+#endif
       warningStreamPrint(LOG_STDOUT, 0, "invalid command line option: %s", argv[i]);
       return 1;
     }
   }
+  
+#ifdef USE_DEBUG_OUTPUT
+  messageClose(LOG_STDOUT);
+#endif
 
   return 0;
 }

SimulationRuntime/c/simulation/simulation_runtime.cpp

@@ -425,6 +425,8 @@ void initializeOutputFilter(MODEL_DATA *modelData, modelica_string variableFilte
  */
 int startNonInteractiveSimulation(int argc, char**argv, DATA* data)
 {
+  TRACE_PUSH
+  
   int retVal = -1;
   int measureSimTime = 0;
 
@@ -585,6 +587,7 @@ int startNonInteractiveSimulation(int argc, char**argv, DATA* data)
     retVal = printModelInfoJSON(data, jsonInfo.c_str(), result_file_cstr.c_str()) && retVal;
   }
 
+  TRACE_POP
   return retVal;
 }
 
@@ -654,9 +657,14 @@ int callSolver(DATA* simData, string result_file_cstr, string init_initMethod,
   long i;
   long solverID = S_UNKNOWN;
   const char* outVars = (outputVariablesAtEnd.size() == 0) ? NULL : outputVariablesAtEnd.c_str();
+  
+  TRACE_PUSH
 
   if(initializeResultData(simData, result_file_cstr, cpuTime))
+  {
+    TRACE_POP
     return -1;
+  }
 
   if(std::string("") == simData->simulationInfo.solverMethod)
     solverID = S_DASSL;
@@ -697,6 +705,7 @@ int callSolver(DATA* simData, string result_file_cstr, string init_initMethod,
 
   sim_result.free(&sim_result, simData);
 
+  TRACE_POP
   return retVal;
 }
 

SimulationRuntime/c/simulation/solver/initialization/initialization.c

@@ -984,13 +984,19 @@ int initialization(DATA *data, const char* pInitMethod, const char* pOptiMethod,
   int optiMethod = IOM_NELDER_MEAD_EX;                                      /* default method */
   int retVal = -1;
   int i;
+  
+  TRACE_PUSH
 
   infoStreamPrint(LOG_INIT, 0, "### START INITIALIZATION ###");
 
   /* import start values from extern mat-file */
-  if(pInitFile && strcmp(pInitFile, "")) {
+  if(pInitFile && strcmp(pInitFile, ""))
+  {
     if(importStartValues(data, pInitFile, initTime))
+    {
+      TRACE_POP
       return 1;
+    }
   }
 
   /* set up all variables and parameters with their start-values */
@@ -1099,5 +1105,6 @@ int initialization(DATA *data, const char* pInitMethod, const char* pOptiMethod,
   data->callback->function_updateRelations(data, 1);
 
   /* valid system for the first time! */
+  TRACE_POP
   return retVal;
 }

SimulationRuntime/c/simulation/solver/solver_main.c

@@ -523,6 +523,8 @@ int solver_main(DATA* data, const char* init_initMethod,
   SOLVER_INFO solverInfo;
   SIMULATION_INFO *simInfo = &(data->simulationInfo);
 
+  TRACE_PUSH
+  
   solverInfo.solverMethod = solverID;
 
   /* do some solver specific checks */
@@ -545,12 +547,14 @@ int solver_main(DATA* data, const char* init_initMethod,
   case S_LOBATTO4:
   case S_LOBATTO6:
     warningStreamPrint(LOG_STDOUT, 0, "Sundial/kinsol is needed but not available. Please choose other solver.");
+    TRACE_POP
     return 1;
 #endif
 
 #ifndef WITH_IPOPT
   case S_OPTIMIZATION:
     warningStreamPrint(LOG_STDOUT, 0, "Ipopt is needed but not available.");
+    TRACE_POP
     return 1;
 #endif
 
@@ -590,6 +594,7 @@ int solver_main(DATA* data, const char* init_initMethod,
   /* free SolverInfo memory */
   freeSolverData(data, &solverInfo);
 
+  TRACE_POP
   return retVal;
 }