Correct logging for FMUs and IDA

OpenModelica · Nov 14, 2016 · a4e7088 · a4e7088
1 parent b6a7a6d
commit a4e7088
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/SimulationRuntime/cpp/Include/FMU/FMUWrapper.h b/SimulationRuntime/cpp/Include/FMU/FMUWrapper.h
@@ -151,7 +151,7 @@ class FMUWrapper : public IFMUInterface
     virtual fmiStatus initialize(fmiBoolean toleranceControlled, fmiReal relativeTolerance, fmiEventInfo& eventInfo)
     {
       //LOGGER_WRITE("Initialize",LC_OTHER,LL_DEBUG);
-      Logger::write("Initializing memory and variables", LC_MOD, LL_DEBUG);
+      Logger::write("Initializing memory and variables", LC_MODEL, LL_DEBUG);
       _model->initializeMemory();
       _model->initializeFreeVariables();
       _model->initializeBoundVariables();

diff --git a/SimulationRuntime/cpp/Include/FMU2/FMU2Wrapper.cpp b/SimulationRuntime/cpp/Include/FMU2/FMU2Wrapper.cpp
@@ -92,7 +92,7 @@ void FMU2Logger::writeInternal(string msg, LogCategory cat, LogLevel lvl,
   case LC_NLS:
     category = logNonlinearSystems;
     break;
-  case LC_EVT:
+  case LC_EVENTS:
     category = logEvents;
     break;
   }
@@ -160,7 +160,7 @@ fmi2Status FMU2Wrapper::setDebugLogging(fmi2Boolean loggingOn,
             _logCategories &= ~(1 << j);
           switch (j) {
           case logEvents:
-            _logger->set(LC_EVT, loggingOn? LL_DEBUG: LL_ERROR);
+            _logger->set(LC_EVENTS, loggingOn? LL_DEBUG: LL_ERROR);
             break;
           case logNonlinearSystems:
             _logger->set(LC_NLS, loggingOn? LL_DEBUG: LL_ERROR);

diff --git a/SimulationRuntime/cpp/Solver/IDA/IDA.cpp b/SimulationRuntime/cpp/Solver/IDA/IDA.cpp
@@ -1073,12 +1073,12 @@ void Ida::writeSimulationInfo()
 
   flag = IDAGetNonlinSolvStats(_idaMem, &nni, &ncfn);
 
-  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);
+  LOGGER_WRITE("IDA: number steps = " + to_string(nst), LC_SOLVER, LL_INFO);
+  LOGGER_WRITE("IDA: function evaluations 'f' = " + to_string(nfe), LC_SOLVER, LL_INFO);
+  LOGGER_WRITE("IDA: error test failures 'netf' = " + to_string(netfS), LC_SOLVER, LL_INFO);
+  LOGGER_WRITE("IDA: linear solver setups 'nsetups' = " + to_string(nsetups), LC_SOLVER, LL_INFO);
+  LOGGER_WRITE("IDA: nonlinear iterations 'nni' = " + to_string(nni), LC_SOLVER, LL_INFO);
+  LOGGER_WRITE("IDA: convergence failures 'ncfn' = " + to_string(ncfn), LC_SOLVER, LL_INFO);
 }
 
 int Ida::check_flag(void *flagvalue, const char *funcname, int opt)