Changeset f2e948cb in OpenModelica

Timestamp:

2016-11-14T08:22:12+01:00 (8 years ago)

Author:

hudson <openmodelica@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

b6a7a6d6

Parents:

c26746f

git-author:

Rüdiger Franke <rdgfranke@…> (11/14/16 07:37:29)

git-committer:

hudson <openmodelica@…> (11/14/16 08:22:12)

Message:

Give log categories full names

Location:

SimulationRuntime/cpp

Files:

• Core/SimController/SimManager.cpp (modified) (5 diffs)
• Core/System/ContinuousEvents.cpp (modified) (1 diff)
• Core/Utils/extension/logger.cpp (modified) (1 diff)
• Core/Utils/extension/measure_time.cpp (modified) (1 diff)
• Include/Core/SimulationSettings/IGlobalSettings.h (modified) (1 diff)
• SimCoreFactory/OMCFactory/OMCFactory.cpp (modified) (4 diffs)
• Solver/CVode/CVode.cpp (modified) (2 diffs)
• Solver/IDA/IDA.cpp (modified) (2 diffs)

SimulationRuntime/cpp/Core/SimController/SimManager.cpp

@@ -266 +266 @@
     try
     {
-        LOGGER_WRITE("SimManager: Start simulation at t = " + to_string(_tStart), LC_SOLV, LL_INFO);
+        LOGGER_WRITE("SimManager: Start simulation at t = " + to_string(_tStart), LC_SOLVER, LL_INFO);
         runSingleProcess();
         // Measure time; Output SimInfos
@@ -272 +272 @@
         if ((status & ISolver::DONE) || (status & ISolver::USER_STOP))
         {
-            //LOGGER_WRITE("SimManager: Simulation done at t = " + to_string(_tEnd), LC_SOLV, LL_INFO);
+            //LOGGER_WRITE("SimManager: Simulation done at t = " + to_string(_tEnd), LC_SOLVER, LL_INFO);
             writeProperties();
         }
@@ -279 +279 @@
     {
         LOGGER_WRITE("SimManager: Simulation stopped with errors before t = " +
-                     to_string(_tEnd), LC_SOLV, LL_ERROR);
-        LOGGER_WRITE("SimManager: " + string(ex.what()), LC_SOLV, LL_ERROR);
+                     to_string(_tEnd), LC_SOLVER, LL_ERROR);
+        LOGGER_WRITE("SimManager: " + string(ex.what()), LC_SOLVER, LL_ERROR);
         writeProperties();
         // rethrow with suppress depending on logger setting to not appear twice
         throw ModelicaSimulationError(SIMMANAGER, ex.what(), "",
-                                      LOGGER_IS_SET(LC_SOLV, LL_ERROR));
+                                      LOGGER_IS_SET(LC_SOLVER, LL_ERROR));
     }
     #ifdef RUNTIME_PROFILING
@@ -303 +303 @@
 {
   // declaration for Logging
-  std::pair<LogCategory, LogLevel> logM = Logger::getLogMode(LC_SOLV, LL_INFO);
+  std::pair<LogCategory, LogLevel> logM = Logger::getLogMode(LC_SOLVER, LL_INFO);
 
   LOGGER_WRITE_TUPLE("SimManager: Simulation stop time: " + to_string(_tEnd), logM);
   //LOGGER_WRITE("Rechenzeit in Sekunden:                 " + to_string>(_tClockEnd-_tClockStart), logM);
 
-  LOGGER_WRITE_BEGIN("Simulation info from solver:", LC_SOLV, LL_INFO);
+  LOGGER_WRITE_BEGIN("Simulation info from solver:", LC_SOLVER, LL_INFO);
   _solver->writeSimulationInfo();
-  LOGGER_WRITE_END(LC_SOLV, LL_INFO);
+  LOGGER_WRITE_END(LC_SOLVER, LL_INFO);
 /*
      // Zeit
@@ -567 +567 @@
   /* Logs temporarily disabled
      BOOST_LOG_SEV(simmgr_lg::get(), simmgr_normal) <<"Run single process." ; */
-    LOGGER_WRITE("SimManager: Run single process",LC_SOLV,LL_DEBUG);
+    LOGGER_WRITE("SimManager: Run single process", LC_SOLVER, LL_DEBUG);
 
     memset(_timeEventCounter, 0, _dimtimeevent * sizeof(int));

SimulationRuntime/cpp/Core/System/ContinuousEvents.cpp

@@ -104 +104 @@
   if (dim > 0)
   {
-    LOGGER_WRITE_VECTOR("conditions", _conditions1, dim, LC_EVT, LL_DEBUG);
+    LOGGER_WRITE_VECTOR("conditions", _conditions1, dim, LC_EVENTS, LL_DEBUG);
     crestart = !std::equal(_conditions1, _conditions1 + dim, _conditions0);
   }

SimulationRuntime/cpp/Core/Utils/extension/logger.cpp

@@ -84 +84 @@
   case(LC_LS):
     return "ls";
-  case(LC_SOLV):
+  case(LC_SOLVER):
     return "solver";
-  case(LC_OUT):
+  case(LC_OUTPUT):
     return "output";
-  case(LC_EVT):
+  case(LC_EVENTS):
     return "events";
-  case(LC_MOD):
+  case(LC_MODEL):
     return "model";
   case(LC_OTHER):

SimulationRuntime/cpp/Core/Utils/extension/measure_time.cpp

@@ -230 +230 @@
           if((*data)[i] == NULL)
           {
-              LOGGER_WRITE("Skipped a measured block in '" + block->first + "' because it is null.", LC_OUT, LL_ERROR);
+              LOGGER_WRITE("Skipped a measured block in '" + block->first + "' because it is null.", LC_OUTPUT, LL_ERROR);
               continue;
           }

SimulationRuntime/cpp/Include/Core/SimulationSettings/IGlobalSettings.h

@@ -26 +26 @@
 #include <vector>
 
-enum LogCategory {LC_INIT = 0, LC_NLS = 1, LC_LS = 2, LC_SOLV = 3, LC_OUT = 4, LC_EVT = 5, LC_OTHER = 6, LC_MOD = 7};
+enum LogCategory {LC_INIT = 0, LC_NLS = 1, LC_LS = 2, LC_SOLVER = 3, LC_OUTPUT = 4, LC_EVENTS = 5, LC_OTHER = 6, LC_MODEL = 7};
 enum LogLevel {LL_ERROR = 0, LL_WARNING = 1, LL_INFO = 2, LL_DEBUG = 3};
 enum LogFormat {LF_TXT = 0, LF_XML = 1};

SimulationRuntime/cpp/SimCoreFactory/OMCFactory/OMCFactory.cpp

@@ -75 +75 @@
   map<string, LogCategory> logCatMap = MAP_LIST_OF
     "init", LC_INIT MAP_LIST_SEP "nls", LC_NLS MAP_LIST_SEP
-    "ls", LC_LS MAP_LIST_SEP "solver", LC_SOLV MAP_LIST_SEP
-    "output", LC_OUT MAP_LIST_SEP "events", LC_EVT MAP_LIST_SEP
-    "model", LC_MOD MAP_LIST_SEP "other", LC_OTHER MAP_LIST_END;
+    "ls", LC_LS MAP_LIST_SEP "solver", LC_SOLVER MAP_LIST_SEP
+    "output", LC_OUTPUT MAP_LIST_SEP "events", LC_EVENTS MAP_LIST_SEP
+    "model", LC_MODEL MAP_LIST_SEP "other", LC_OTHER MAP_LIST_END;
   map<string, LogLevel> logLvlMap = MAP_LIST_OF
     "error", LL_ERROR MAP_LIST_SEP "warning", LL_WARNING MAP_LIST_SEP
@@ -110 +110 @@
             switch (logOMEdit) {
             case LOG_EVENTS:
-              logSettings.modes[LC_EVT] = LL_DEBUG;
+              logSettings.modes[LC_EVENTS] = LL_DEBUG;
               break;
             case LOG_INIT:
@@ -122 +122 @@
               break;
             case LOG_SOLVER:
-              logSettings.modes[LC_SOLV] = LL_DEBUG;
+              logSettings.modes[LC_SOLVER] = LL_DEBUG;
               //case LOG_STATS:
             default:
-              if (logSettings.modes[LC_SOLV] < LL_INFO)
-                logSettings.modes[LC_SOLV] = LL_INFO;
+              if (logSettings.modes[LC_SOLVER] < LL_INFO)
+                logSettings.modes[LC_SOLVER] = LL_INFO;
             }
           }
@@ -151 +151 @@
     }
 
-  if (vm.count("warn-all")) {
+  if (vm.count("warn-all") && vm["warn-all"].as<bool>()) {
     for (int i = 0; i < logSettings.modes.size(); i++)
       if (logSettings.modes[i] < LL_WARNING)

SimulationRuntime/cpp/Solver/CVode/CVode.cpp

@@ -323 +323 @@
     _cvode_initialized = true;
 
-    LOGGER_WRITE("Cvode: initialized",LC_SOLV,LL_DEBUG);
+    LOGGER_WRITE("Cvode: initialized", LC_SOLVER, LL_DEBUG);
   }
 }
@@ -963 +963 @@
   flag = CVodeGetNonlinSolvStats(_cvodeMem, &nni, &ncfn);
 
-  LOGGER_WRITE("Cvode: number steps = " + to_string(nst), LC_SOLV, LL_INFO);
-  LOGGER_WRITE("Cvode: function evaluations 'f' = " + to_string(nfe), LC_SOLV, LL_INFO);
-  LOGGER_WRITE("Cvode: linear solver setups 'nsetups' = " + to_string(nsetups), LC_SOLV, LL_INFO);
-  LOGGER_WRITE("Cvode: nonlinear iterations 'nni' = " + to_string(nni), LC_SOLV, LL_INFO);
-  LOGGER_WRITE("Cvode: convergence failures 'ncfn' = " + to_string(ncfn), LC_SOLV, LL_INFO);
-  LOGGER_WRITE("Cvode: number of evaluateODE calls 'eODE' = " + to_string(_numberOfOdeEvaluations), LC_SOLV, LL_INFO);
+  LOGGER_WRITE("Cvode: number steps = " + to_string(nst), LC_SOLVER, LL_INFO);
+  LOGGER_WRITE("Cvode: function evaluations 'f' = " + to_string(nfe), LC_SOLVER, LL_INFO);
+  LOGGER_WRITE("Cvode: linear solver setups 'nsetups' = " + to_string(nsetups), LC_SOLVER, LL_INFO);
+  LOGGER_WRITE("Cvode: nonlinear iterations 'nni' = " + to_string(nni), LC_SOLVER, LL_INFO);
+  LOGGER_WRITE("Cvode: convergence failures 'ncfn' = " + to_string(ncfn), LC_SOLVER, LL_INFO);
+  LOGGER_WRITE("Cvode: number of evaluateODE calls 'eODE' = " + to_string(_numberOfOdeEvaluations), LC_SOLVER, LL_INFO);
 
   //// Solver

SimulationRuntime/cpp/Solver/IDA/IDA.cpp

@@ -1 +1 @@
 #include <Core/ModelicaDefine.h>
- #include <Core/Modelica.h>
+#include <Core/Modelica.h>
 #include <Solver/IDA/IDA.h>
 #include <Core/Math/Functions.h>
@@ -1074 +1074 @@
   flag = IDAGetNonlinSolvStats(_idaMem, &nni, &ncfn);
 
-  LOGGER_WRITE("Cvode: number steps = " + to_string(nst), LC_SOLV, LL_INFO);
-  LOGGER_WRITE("Cvode: function evaluations 'f' = " + to_string(nfe), LC_SOLV, LL_INFO);
-  LOGGER_WRITE("Cvode: error test failures 'netf' = " + to_string(netfS), LC_SOLV, LL_INFO);
-  LOGGER_WRITE("Cvode: linear solver setups 'nsetups' = " + to_string(nsetups), LC_SOLV, LL_INFO);
-  LOGGER_WRITE("Cvode: nonlinear iterations 'nni' = " + to_string(nni), LC_SOLV, LL_INFO);
-  LOGGER_WRITE("Cvode: convergence failures 'ncfn' = " + to_string(ncfn), LC_SOLV, LL_INFO);
+  LOGGER_WRITE("Cvode: number steps = " + to_string(nst), LC_SOLVER, LL_INFO);
+  LOGGER_WRITE("Cvode: function evaluations 'f' = " + to_string(nfe), LC_SOLVER, LL_INFO);
+  LOGGER_WRITE("Cvode: error test failures 'netf' = " + to_string(netfS), LC_SOLVER, LL_INFO);
+  LOGGER_WRITE("Cvode: linear solver setups 'nsetups' = " + to_string(nsetups), LC_SOLVER, LL_INFO);
+  LOGGER_WRITE("Cvode: nonlinear iterations 'nni' = " + to_string(nni), LC_SOLVER, LL_INFO);
+  LOGGER_WRITE("Cvode: convergence failures 'ncfn' = " + to_string(ncfn), LC_SOLVER, LL_INFO);
 }