- changed fmu export for event handling

- added bug fix in event handling - removed one old unsed variable git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@9724 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Aug 31, 2011 · 2536ca0 · 2536ca0
1 parent 362a6c7
commit 2536ca0
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 87 deletions.
diff --git a/c_runtime/fmu_model_interface.c b/c_runtime/fmu_model_interface.c
@@ -319,17 +319,9 @@ fmiStatus fmiGetReal(fmiComponent c, const fmiValueReference vr[], size_t nvr, f
     return fmiError;
 #if NUMBER_OF_REALS>0
   // calculate new values
-  if (comp->eventInfo.stateValuesChanged == fmiTrue)
-  {
-    int needToIterate = 0;
-    functionDAE(&needToIterate);
-    comp->eventInfo.stateValuesChanged = fmiFalse;
-  }
-  if (comp->outputsvalid == fmiFalse)
-  {
-     functionAliasEquations();
-     comp->outputsvalid = fmiTrue;
-  }
+  functionODE();
+  functionAlgebraics();
+
   for (i=0; i<nvr; i++) {
     if (vrOutOfRange(comp, "fmiGetReal", vr[i], NUMBER_OF_REALS+NUMBER_OF_STATES))
       return fmiError;
@@ -354,17 +346,9 @@ fmiStatus fmiGetInteger(fmiComponent c, const fmiValueReference vr[], size_t nvr
     return fmiError;
 #if NUMBER_OF_INTEGERS>0
   // calculate new values
-  if (comp->eventInfo.stateValuesChanged == fmiTrue)
-  {
-    int needToIterate = 0;
-    functionDAE(&needToIterate);
-    comp->eventInfo.stateValuesChanged = fmiFalse;
-  }
-  if (comp->outputsvalid == fmiFalse)
-  {
-     functionAliasEquations();
-     comp->outputsvalid = fmiTrue;
-  }
+  functionODE();
+  functionAlgebraics();
+
   for (i=0; i<nvr; i++) {
     if (vrOutOfRange(comp, "fmiGetInteger", vr[i], NUMBER_OF_INTEGERS))
       return fmiError;
@@ -389,17 +373,9 @@ fmiStatus fmiGetBoolean(fmiComponent c, const fmiValueReference vr[], size_t nvr
     return fmiError;
 #if NUMBER_OF_BOOLEANS>0
   // calculate new values
-  if (comp->eventInfo.stateValuesChanged == fmiTrue)
-  {
-    int needToIterate = 0;
-    functionDAE(&needToIterate);
-    comp->eventInfo.stateValuesChanged = fmiFalse;
-  }
-  if (comp->outputsvalid == fmiFalse)
-  {
-     functionAliasEquations();
-     comp->outputsvalid = fmiTrue;
-  }
+  functionODE();
+  functionAlgebraics();
+
   for (i=0; i<nvr; i++) {
     if (vrOutOfRange(comp, "fmiGetBoolean", vr[i], NUMBER_OF_BOOLEANS))
       return fmiError;
@@ -424,17 +400,9 @@ fmiStatus fmiGetString(fmiComponent c, const fmiValueReference vr[], size_t nvr,
     return fmiError;
 #if NUMBER_OF_STRINGS>0
   // calculate new values
-  if (comp->eventInfo.stateValuesChanged == fmiTrue)
-  {
-    functionODE();
-    comp->eventInfo.stateValuesChanged == fmiFalse;
-  }
-  if (comp->outputsvalid == fmiFalse)
-  {
-     functionAlgebraics();
-     functionAliasEquations();
-     comp->outputsvalid = fmiTrue;
-  }
+  functionODE();
+  functionAlgebraics();
+
   for (i=0; i<nvr; i++) {
     if (vrOutOfRange(comp, "fmiGetString", vr[i], NUMBER_OF_STRINGS))
       return fmiError;
@@ -518,7 +486,9 @@ fmiStatus fmiGetDerivatives(fmiComponent c, fmiReal derivatives[], size_t nx) {
   //if (comp->eventInfo.stateValuesChanged == fmiTrue)
   //{
     // calculate new values
-    functionDAE(&needToIterate);
+  	functionODE();
+    functionAlgebraics();
+
     for (i=0; i<nx; i++) {
       fmiValueReference vr = vrStatesDerivatives[i];
       derivatives[i] = getReal(comp, vr); // to be implemented by the includer of this file
@@ -648,6 +618,12 @@ fmiStatus fmiEventUpdate(fmiComponent c, fmiBoolean intermediateResults, fmiEven
   eventInfo->stateValuesChanged  = fmiFalse;
   eventInfo->terminateSimulation = fmiFalse;
   eventInfo->upcomingTimeEvent   = fmiFalse;
+  /*functionODE();
+  functionAlgebraics();
+  fmiCompletedIntegratorStep(c,fmiFalse);
+  */
+  update_DAEsystem();
+  //fmiCompletedIntegratorStep(c,fmiFalse);
   eventUpdate(comp, eventInfo); // to be implemented by the includer of this file
   return fmiOK;
 }

diff --git a/c_runtime/simulation_events.cpp b/c_runtime/simulation_events.cpp
@@ -188,29 +188,22 @@ sample(double start, double interval, int hindex)
   // adrpo: if we test for inSample == 0 no event is generated when start + 0*interval!
   // if (inSample == 0) return 0;
   double tmp = ((globalData->timeValue - start) / interval);
-  if (euler_in_use)
-    {
-      tmp = 1;
-      int tmpindex = globalData->curSampleTimeIx;
-      if (tmpindex < globalData->nSampleTimes)
-        {
-          while ((globalData->sampleTimes[tmpindex]).activated == 1)
-            {
-              if ((globalData->sampleTimes[tmpindex]).zc_index == hindex)
-                {
-                  tmp = 0;
-                }
-              tmpindex++;
-              if (tmpindex == globalData->nSampleTimes)
-                break;
-            }
-        }
-      //tmp = ((globalData->timeValue - start) / interval);
-    }
-  else
-    {
-      tmp -= floor(tmp);
-    }
+  tmp = 1;
+  int tmpindex = globalData->curSampleTimeIx;
+  if (tmpindex < globalData->nSampleTimes)
+	{
+	  while ((globalData->sampleTimes[tmpindex]).activated == 1)
+		{
+		  if ((globalData->sampleTimes[tmpindex]).zc_index == hindex)
+			{
+			  tmp = 0;
+			}
+		  tmpindex++;
+		  if (tmpindex == globalData->nSampleTimes)
+			break;
+		}
+	}
+
   /* adrpo - 2008-01-15
    * comparison was tmp >= 0 fails sometimes on x86 due to extended precision in registers
    * TODO - fix the simulation runtime so that the sample event is generated at EXACTLY that time.
@@ -596,8 +589,6 @@ deactivateSampleEventsandEquations()
 int
 CheckForNewEvent(int* sampleactived)
 {
-  //std::copy(gout, gout + globalData->nZeroCrossing, gout_old);
-  //function_onlyZeroCrossings(gout,&globalData->timeValue);
   initializeZeroCrossings();
   if (sim_verbose >= LOG_EVENTS)
     {
@@ -632,7 +623,8 @@ CheckForNewEvent(int* sampleactived)
               EventList.push_front(i);
             }
         }
-      if ((gout[i] < 0 && gout_old[i] > 0) || (gout[i] > 0 && gout_old[i] < 0))
+      if ((gout[i] < 0 && gout_old[i] > 0) ||
+          (gout[i] > 0 && gout_old[i] < 0))
         {
           if (sim_verbose >= LOG_EVENTS)
             {
@@ -879,7 +871,7 @@ FindRoot(double *EventTime)
 
   if (tmpEventList.empty())
     {
-      double value = fabs(gout[0]);
+      double value = fabs(gout[*(EventList.begin())]);;
       for ( it=EventList.begin() ; it != EventList.end(); it++ )
         {
           if (value > fabs(gout[*it]))

diff --git a/c_runtime/simulation_events.h b/c_runtime/simulation_events.h
@@ -88,16 +88,10 @@ int
 checkForSampleEvent();
 
 extern long inUpdate;
-extern int euler_in_use;
 static const int IterationMax = 200;
 
 #define ZEROCROSSING(ind,exp) { \
-    if (euler_in_use) { \
         gout[ind] = exp; \
-    } \
-    else {\
-        gout[ind] = (zeroCrossingEnabled[ind])?((double)zeroCrossingEnabled[ind])*exp:1.0; \
-    } \
 }
 
 #define RELATIONTOZC(res,exp1,exp2,index,op_w,op) { \

diff --git a/c_runtime/solver_main.cpp b/c_runtime/solver_main.cpp
@@ -218,8 +218,6 @@ const double rungekutta_c[rungekutta_s] =
 // Used when calculating residual for its side effects. (alg. var calc)
 double *dummy_delta = NULL;
 
-int euler_in_use = 0;
-
 int
 solver_main_step(int flag, double &start, double &stop, bool &reset, int* stats)
 {
@@ -294,9 +292,6 @@ solver_main(int argc, char** argv, double &start, double &stop, double &step,
       dasslStatsTmp[i] = 0;
   }
 
-  //Workaround for Relation in simulation_events
-  euler_in_use = 1;
-
   //Flags for event handling
   int dideventstep = 0;
   bool reset = false;
@@ -389,7 +384,7 @@ solver_main(int argc, char** argv, double &start, double &stop, double &step,
           activateSampleEvents();
         }
       update_DAEsystem();
-      SaveZeroCrossings();
+      initializeZeroCrossings();
       if (sampleEvent_actived)
         {
           deactivateSampleEventsandEquations();

diff --git a/c_runtime/solver_qss/solver_qss.cpp b/c_runtime/solver_qss/solver_qss.cpp
@@ -73,9 +73,6 @@ int qss_main( int argc, char** argv,double &start,  double &stop, double &step,
       dasslStatsTmp[i] = 0;
   }
 
-  //Workaround for Relation in simulation_events
-  euler_in_use = 1;
-
   //Flags for event handling
   int dideventstep = 0;
   bool reset = false;