Changeset 7d177c1 in OpenModelica

Timestamp:

2013-08-26T12:04:59+02:00 (11 years ago)

Author:

Adeel Asghar <adeel.asghar@…>

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:

569c48d4

Parents:

27a8a7db

Message:

• Removed some unused stuff.
• small fixes.

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

Location:

SimulationRuntime/c/simulation

Files:

• simulation_runtime.cpp (modified) (3 diffs)
• simulation_runtime.h (modified) (1 diff)

SimulationRuntime/c/simulation/simulation_runtime.cpp

@@ -86 +86 @@
 #endif
 
-
 using namespace std;
 
@@ -92 +91 @@
 
 /* This variable is used to get the step size value during the simulation. */
-static double stepSize = 0.0;
-static double currentTime = 0.0;
-static int initTime = 0;
-
-double getSimulationStepSize(double time, int *takeStep)
-{
-  /* if the function is called first time during the simulation. */
-  if (!initTime) {
-    initTime = 1;
-    currentTime = time;
-    *takeStep = 1;
-  }
-  else {
-    if (currentTime != time) {
-      currentTime = time;
-      *takeStep = 1;
-    }
-    else {
-      *takeStep = 0;
-    }
-  }
+double stepSize = 0.0;
+
+double getSimulationStepSize()
+{
   return stepSize;
 }
 
-void printSimulationStepSize(double in_stepSize, double time, int takeStep)
-{
-  fprintf(stderr, "in_stepSize=%f, time=%f, takeStep=%d\n", in_stepSize, time, takeStep);
+void printSimulationStepSize(double in_stepSize, double time)
+{
+  fprintf(stderr, "in_stepSize=%f, time=%f\n", in_stepSize, time);
 }
 
@@ -811 +793 @@
   read_input_xml(&(data->modelData), &(data->simulationInfo));
   initializeOutputFilter(&(data->modelData), data->simulationInfo.variableFilter);
-  /* set the global stepsize, currentTime & initTime variable */
+  /* set the global stepsize variable */
   stepSize = data->simulationInfo.stepSize;
-  currentTime = 0.0;
-  initTime = 0;
 
   /* allocate memory for mixed system solvers */

SimulationRuntime/c/simulation/simulation_runtime.h

@@ -96 +96 @@
         fortran_integer *ng, double *gout, double *rpar, fortran_integer* ipar);
 
-extern double getSimulationStepSize(double time, int *takeStep);
-extern void printSimulationStepSize(double in_stepSize, double time, int takeStep);
+extern double getSimulationStepSize();
+extern void printSimulationStepSize(double in_stepSize, double time);
 
 /* the main function of the simulation runtime!