- avoid memory leaks

- use absdouble()>epsilon for double==double in SimulationResultsCmp git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12386 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Aug 1, 2012 · ca6738c · ca6738c
1 parent 1ff5a01
commit ca6738c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/Compiler/runtime/SimulationResultsCmp.c b/Compiler/runtime/SimulationResultsCmp.c
@@ -241,7 +241,7 @@ unsigned int cmpData(char* varname, DataField *time, DataField *reftime, DataFie
     /* events */
     if(i>0) {
       /* an event */
-      if (t == time->data[i-1]) {
+      if (absdouble(t-time->data[i-1]) > 0.00000065) {
         /* fprintf(stderr, "event: %.6g  %d  %.6g\n",t,i,d);
           goto the last */
         char te = 0;

diff --git a/SimulationRuntime/c/simulation/solver/dassl.c b/SimulationRuntime/c/simulation/solver/dassl.c
@@ -147,7 +147,8 @@ dasrt_deinitial(DASSL_DATA *dasslData){
   free(dasslData->iwork);
   free(dasslData->ipar);
   free(dasslData->info);
-
+  free(dasslData->dasslStatistics);
+  free(dasslData->dasslStatisticsTmp);
   return 0;
 }
 

diff --git a/SimulationRuntime/c/simulation/solver/model_help.c b/SimulationRuntime/c/simulation/solver/model_help.c
@@ -504,6 +504,8 @@ void initializeDataStruc(DATA *data)
   data->modelData.booleanAlias = (DATA_BOOLEAN_ALIAS*) calloc(data->modelData.nAliasBoolean, sizeof(DATA_BOOLEAN_ALIAS));
   data->modelData.stringAlias = (DATA_STRING_ALIAS*) calloc(data->modelData.nAliasString, sizeof(DATA_STRING_ALIAS));
 
+  /* initialized in events.c initSample */
+  data->simulationInfo.sampleTimes = 0;
   data->simulationInfo.rawSampleExps = (SAMPLE_RAW_TIME*) calloc(data->modelData.nSamples, sizeof(SAMPLE_RAW_TIME));
 
   data->simulationInfo.zeroCrossings = (modelica_real*) calloc(data->modelData.nZeroCrossings, sizeof(modelica_real));