- fix #2704 (don't handle impure functions as constant)

- add TRACE information to dassl.c::functionODE_residual and solver_main.c::finishSimulation

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

Author: lochel

Compiler/BackEnd/RemoveSimpleEquations.mo

@@ -1544,6 +1544,7 @@ algorithm
     // const
     case (_, _, _, _, _, (vars, shared, eqns, seqns, index, mT, _))
       equation
+        true = Expression.isConst(exp); // lochel: this is at least for impure functions needed
         Debug.fcall(Flags.DEBUG_ALIAS, BackendDump.debugStrCrefStrExpStr, ("Const Equation ", cr, " = ", exp, " found.\n"));
         colum = mT[i];
         _ = arrayUpdate(mT, i, index::colum);

Compiler/FrontEnd/Expression.mo

@@ -7201,7 +7201,6 @@ algorithm
 
     case (DAE.TUPLE(PR = ae),_) then isConstWorkList(ae,true);
 
-
     case (DAE.ASUB(exp=e,sub=ae),_) then isConstWorkList(ae,isConstWork(e,true));
 
     case (DAE.TSUB(exp=e),_) then isConstWork(e,true);
@@ -7219,7 +7218,6 @@ algorithm
       then isConstWork(e1,isConstWork(e2,true));
 
     else false;
-
   end match;
 end isConstWork;
 

SimulationRuntime/c/simulation/solver/dassl.c

@@ -503,6 +503,8 @@ int functionODE_residual(double *t, double *y, double *yd, double* cj, double *d
   long i;
   int saveJumpState;
   int success = 0;
+  
+  TRACE_PUSH
 
   timeBackup = data->localData[0]->timeValue;
   data->localData[0]->timeValue = *t;
@@ -524,7 +526,8 @@ int functionODE_residual(double *t, double *y, double *yd, double* cj, double *d
 
     /* get the difference between the temp_xd(=localData->statesDerivatives)
        and xd(=statesDerivativesBackup) */
-    for(i=0; i < data->modelData.nStates; i++) {
+    for(i=0; i < data->modelData.nStates; i++)
+    {
       delta[i] = data->localData[0]->realVars[data->modelData.nStates + i] - yd[i];
     }
     success = 1;
@@ -540,6 +543,7 @@ int functionODE_residual(double *t, double *y, double *yd, double* cj, double *d
 
   data->localData[0]->timeValue = timeBackup;
 
+  TRACE_POP
   return 0;
 }
 

SimulationRuntime/c/simulation/solver/solver_main.c

@@ -410,6 +410,8 @@ int finishSimulation(DATA* data, SOLVER_INFO* solverInfo, const char* outputVari
   int ui;
 
   SIMULATION_INFO *simInfo = &(data->simulationInfo);
+  
+  TRACE_PUSH
 
   /* Last step with terminal()=true */
   if(solverInfo->currentTime >= simInfo->stopTime && solverInfo->solverMethod != S_OPTIMIZATION)
@@ -498,6 +500,8 @@ int finishSimulation(DATA* data, SOLVER_INFO* solverInfo, const char* outputVari
 
     rt_tick(SIM_TIMER_TOTAL);
   }
+  
+  TRACE_POP
   return retValue;
 }