- fixed CVodeWriteOutput-Tracing

OpenModelica · Jun 19, 2015 · 97c3eb8 · 97c3eb8
1 parent 8e9e1ae
commit 97c3eb8
Showing 1 changed file with 4 additions and 35 deletions.
diff --git a/SimulationRuntime/cpp/Solver/CVode/CVode.cpp b/SimulationRuntime/cpp/Solver/CVode/CVode.cpp
@@ -648,17 +648,7 @@ void Cvode::writeCVodeOutput(const double &time, const double &h, const int &stp
         _time_system->setTime(_tLastWrite);
         _continuous_system->setContinuousStates(NV_DATA_S(_CV_yWrite));
         _continuous_system->evaluateAll(IContinuous::CONTINUOUS);
-        #ifdef RUNTIME_PROFILING
-        if(MeasureTime::getInstance() != NULL)
-        {
-            MEASURETIME_END(measuredFunctionStartValues, measuredFunctionEndValues, measureTimeFunctionsArray[2], cvodeWriteOutputHandler);
-        }
-        #endif
         SolverDefaultImplementation::writeToFile(stp, _tLastWrite, h);
-        #ifdef RUNTIME_PROFILING
-        if(MeasureTime::getInstance() != NULL)
-            measureTimeFunctionsArray[2].sumMeasuredValues->_numCalcs--;
-        #endif
       }      //end if time -_tLastWritten
       if (_bWritten)
       {
@@ -667,48 +657,27 @@ void Cvode::writeCVodeOutput(const double &time, const double &h, const int &stp
         _continuous_system->setRHS(oldValues);
         delete[] oldValues;
         //_continuous_system->evaluateAll(IContinuous::CONTINUOUS);
-        #ifdef RUNTIME_PROFILING
-        if(MeasureTime::getInstance() != NULL)
-        {
-            MEASURETIME_END(measuredFunctionStartValues, measuredFunctionEndValues, measureTimeFunctionsArray[2], cvodeWriteOutputHandler);
-        }
-        #endif
       }
       else if (time == _tEnd && _tLastWrite != time)
       {
         _idid = CVodeGetDky(_cvodeMem, time, 0, _CV_y);
         _time_system->setTime(time);
         _continuous_system->setContinuousStates(NV_DATA_S(_CV_y));
         _continuous_system->evaluateAll(IContinuous::CONTINUOUS);
-        #ifdef RUNTIME_PROFILING
-        if(MeasureTime::getInstance() != NULL)
-        {
-            MEASURETIME_END(measuredFunctionStartValues, measuredFunctionEndValues, measureTimeFunctionsArray[2], cvodeWriteOutputHandler);
-        }
-        #endif
         SolverDefaultImplementation::writeToFile(stp, _tEnd, h);
       }
     }
     else
     {
-        #ifdef RUNTIME_PROFILING
-        if(MeasureTime::getInstance() != NULL)
-        {
-            MEASURETIME_END(measuredFunctionStartValues, measuredFunctionEndValues, measureTimeFunctionsArray[2], cvodeWriteOutputHandler);
-        }
-        #endif
         SolverDefaultImplementation::writeToFile(stp, time, h);
     }
   }
-  else
+  #ifdef RUNTIME_PROFILING
+  if(MeasureTime::getInstance() != NULL)
   {
-    #ifdef RUNTIME_PROFILING
-    if(MeasureTime::getInstance() != NULL)
-    {
-        MEASURETIME_END(measuredFunctionStartValues, measuredFunctionEndValues, measureTimeFunctionsArray[2], cvodeWriteOutputHandler);
-    }
-    #endif
+      MEASURETIME_END(measuredFunctionStartValues, measuredFunctionEndValues, measureTimeFunctionsArray[2], cvodeWriteOutputHandler);
   }
+  #endif
 }
 
 bool Cvode::stateSelection()