Changeset 472a887 in OpenModelica

Timestamp:

2010-12-01T12:24:24+01:00 (14 years ago)

Author:

Anton Sodja <anton.sodja@…>

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:

46c01a5

Parents:

d5045e79

Message:

Updated export to Dymola mat-file format -- also integer and boolean
variables are now stored in the file.

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

Location:

c_runtime

Files:

• simulation_result_mat.cpp (modified) (15 diffs)
• simulation_result_mat.h (modified) (2 diffs)

c_runtime/simulation_result_mat.cpp

@@ -46 +46 @@
   const char Aclass[] = "A1 bt. ir1 na  Tj  re  ac  nt  so   r   y   ";
   
-  const int rank = 5;
+  const int rank = 9;
   int dims[rank] = { 1, globalData->nStates, globalData->nStates, 
-         globalData->nAlgebraic, globalData->nParameters };
+         globalData->nAlgebraic, globalData->intVariables.nAlgebraic,
+         globalData->boolVariables.nAlgebraic, 
+         globalData->nParameters, globalData->intVariables.nParameters,
+         globalData->boolVariables.nParameters };
   const char **names[rank] = { &timeValName,
-       globalData->statesNames,
-       globalData->stateDerivativesNames,
-       globalData->algebraicsNames,
-       globalData->parametersNames };
+             globalData->statesNames,
+             globalData->stateDerivativesNames,
+             globalData->algebraicsNames,
+             globalData->int_alg_names,
+             globalData->bool_alg_names,
+             globalData->parametersNames,
+             globalData->int_param_names,
+             globalData->bool_param_names,
+                             };
   const char **descriptions[rank] = { &timeValDesc, 
-        globalData->statesComments,
-        globalData->stateDerivativesComments,
-        globalData->algebraicsComments,
-        globalData->parametersComments };
-  const int nVars = 1+globalData->nStates*2+globalData->nAlgebraic;
+              globalData->statesComments,
+              globalData->stateDerivativesComments,
+              globalData->algebraicsComments,
+              globalData->int_alg_comments,
+              globalData->bool_alg_comments,
+              globalData->parametersComments,
+              globalData->int_param_comments,
+              globalData->bool_param_comments 
+                                    };
+  const int nVars = globalData->nStates*2+globalData->nAlgebraic
+    +globalData->intVariables.nAlgebraic +globalData->boolVariables.nAlgebraic;
+  const int nParams = globalData->nParameters+globalData->intVariables.nParameters
+    +globalData->boolVariables.nParameters;
 
   char *stringMatrix = NULL;
@@ -74 +90 @@
     
     // flatten variables' names
-    flattenStrBuf(rank, dims, names, stringMatrix, rows, cols);
+    flattenStrBuf(rank, dims, names, stringMatrix, rows, cols, true);
     // write `name' matrix
     writeMatVer4Matrix("name", rows, cols, stringMatrix, true);
@@ -80 +96 @@
     
     // flatten variables' comments
-    flattenStrBuf(rank, dims, descriptions, stringMatrix, rows, cols);
+    flattenStrBuf(rank, dims, descriptions, stringMatrix, rows, cols, false);
     // write `description' matrix
     writeMatVer4Matrix("description", rows, cols, stringMatrix, true);
@@ -86 +102 @@
 
     // generate dataInfo table
-    generateDataInfo(doubleMatrix, rows, cols, globalData);
+    generateDataInfo(doubleMatrix, rows, cols, globalData, nVars, nParams);
     // write `dataInfo' matrix
     writeMatVer4Matrix("dataInfo", cols, rows, doubleMatrix, false);
@@ -93 +109 @@
 
     // generate `data_1' matrix (with parameter data)
-    rows = 2;
-    cols = 1+globalData->nParameters;
-    doubleMatrix = new double[rows*cols];
-    if (doubleMatrix == NULL) 
-      throw SimulationResultMallocException();
-    doubleMatrix[0] = tstart; // start time
-    doubleMatrix[cols] = tstop; // stop time
-    for(fortran_integer i = 0; i < globalData->nParameters; ++i) {
-      doubleMatrix[i+1] = globalData->parameters[i];
-      doubleMatrix[i+1+cols] = globalData->parameters[i];
-    }
+    generateData_1(doubleMatrix, rows, cols, globalData, tstart, tstop);
     //  write `data_1' matrix
     writeMatVer4Matrix("data_1", cols, rows, doubleMatrix, false);
@@ -110 +116 @@
     data2HdrPos = fp.tellp();
     // write `data_2' header
-    writeMatVer4MatrixHeader("data_2", nVars, 0, false);
+    writeMatVer4MatrixHeader("data_2", nVars+1, 0, false);
 
     fp.flush();
@@ -123 +129 @@
 simulation_result_mat::~simulation_result_mat()
 {
-  int nVars = 1+globalData->nStates*2+globalData->nAlgebraic;
+  int nVars = 1+globalData->nStates*2+globalData->nAlgebraic
+    +globalData->intVariables.nAlgebraic +globalData->boolVariables.nAlgebraic;
   // this is a bad programming practice - closing file in destructor,
   // where a proper error reporting can't be done
@@ -139 +146 @@
 void simulation_result_mat::emit()
 {
+  double datPoint;
+
   // that does not belong here
   storeExtrapolationData();
@@ -149 +158 @@
   fp.write((char*)globalData->statesDerivatives,sizeof(double)*globalData->nStates);
   fp.write((char*)globalData->algebraics,sizeof(double)*globalData->nAlgebraic);
+  for(fortran_integer i = 0; i < globalData->intVariables.nAlgebraic; ++i) {
+    datPoint = (double)globalData->intVariables.algebraics[i];
+    fp.write((char*)&datPoint,sizeof(double));
+  }
+  for(fortran_integer i = 0; i < globalData->boolVariables.nAlgebraic; ++i) {
+    datPoint = (double)globalData->boolVariables.algebraics[i];
+    fp.write((char*)&datPoint,sizeof(double));
+  }
+
   if (!fp) throw SimulationResultBaseException();
   ++ntimepoints;
@@ -155 +173 @@
 // from an array of string creates flatten 'char*'-array suitable to be 
 // stored as MAT-file matrix
+static inline void fixDerInName(char *str, size_t len)
+{
+  char* dot;
+  if (len < 6) return;
+  
+  // check if name start with "der(" and includes at least one dot
+  while (strncmp(str,"der(",4) == 0 && (dot = strrchr(str,'.')) != NULL) {
+    size_t pos = (size_t)(dot-str)+1;
+    // move prefix to the begining of string :"der(a.b.c.d)" -> "a.b.c.b.c.d)"
+    for(size_t i = 4; i < pos; ++i)
+      str[i-4] = str[i];
+    // move "der(" to the end of prefix
+    // "a.b.c.b.c.d)" -> "a.b.c.der(d)"
+    strncpy(&str[pos-4],"der(",4);
+  }
+}
+
 long simulation_result_mat::flattenStrBuf(int rank, const int *dims, 
             const char ** const src[],
-            char* &dest, int& longest, int& nstrings)
+            char* &dest, int& longest, int& nstrings,
+            bool fixNames)
 {
   int i,j;
@@ -183 +219 @@
     for (j = 0; j < dims[i]; ++j) {
       strncpy(ptr,src[i][j],longest);
+      if (fixNames) fixDerInName(ptr,strlen(src[i][j]));
       ptr += longest;
     }
@@ -231 +268 @@
 void simulation_result_mat::generateDataInfo(double* &dataInfo, 
                int& rows, int& cols,
-               const sim_DATA *mdl_data)
-{
-  size_t nVars = mdl_data->nStates*2+mdl_data->nAlgebraic;
+               const sim_DATA *mdl_data,
+               int nVars, int nParams)
+{
+  //size_t nVars = mdl_data->nStates*2+mdl_data->nAlgebraic;
   //rows = 1+nVars+mdl_data->nParameters+mdl_data->nVarsAliases;
   size_t ccol = 0; // current column - index offset
 
   // assign rows & cols
-  rows = 1+nVars + mdl_data->nParameters;
+  rows = 1+ nVars + nParams;
   cols = 4;
   
@@ -250 +288 @@
   ccol += 4;
   // continuous and discrete variables
-  for(size_t i = 0; i < nVars; ++i) {
+  for(size_t i = 0; i < (size_t)nVars; ++i) {
     // row 1 - which table
     dataInfo[ccol+4*i] = 2.0;
@@ -262 +300 @@
   ccol += nVars*4;
   // parameters and constants
-  for(fortran_integer i = 0; i < mdl_data->nParameters; ++i) {
+  for(size_t i = 0; i < (size_t)nParams; ++i) {
     // col 1 - which table
     dataInfo[ccol+4*i] = 1.0;
@@ -275 +313 @@
   //ccol += mdl_data->nParameters*4;
 }
+
+void simulation_result_mat::generateData_1(double* &data_1, 
+             int& rows, int& cols,
+             const sim_DATA *mdl_data,
+             double tstart, double tstop)
+{
+  int offset;
+  // calculate number of rows and columns
+  rows = 2;
+  cols = 1+mdl_data->nParameters+mdl_data->intVariables.nParameters
+    +mdl_data->boolVariables.nParameters;
+  // allocate data buffer
+  data_1 = new double[rows*cols];
+  if (data_1 == NULL) 
+    throw SimulationResultMallocException();
+  data_1[0] = tstart; // start time
+  data_1[cols] = tstop; // stop time
+  offset = 1;
+  // double variables
+  for(fortran_integer i = 0; i < mdl_data->nParameters; ++i) {
+      data_1[offset+i] = mdl_data->parameters[i];
+      data_1[offset+i+cols] = mdl_data->parameters[i];
+  }
+  offset += mdl_data->nParameters;
+  // integer variables
+  for(fortran_integer i = 0; i < mdl_data->intVariables.nParameters; ++i) {
+    data_1[offset+i] = (double)mdl_data->intVariables.parameters[i];
+    data_1[offset+i+cols] = (double)mdl_data->intVariables.parameters[i];
+  }
+  offset += mdl_data->intVariables.nParameters;
+  // bool variables
+  for(fortran_integer i = 0; i < mdl_data->boolVariables.nParameters; ++i) {
+    data_1[offset+i] = (double)mdl_data->boolVariables.parameters[i];
+    data_1[offset+i+cols] = (double)mdl_data->boolVariables.parameters[i];
+  }
+   
+}

c_runtime/simulation_result_mat.h

@@ -64 +64 @@
   // helper functions  
   static long flattenStrBuf(int rank, const int *dims, const char ** const src[],
-          char* &dest, int& longest, int& nstrings);
+          char* &dest, int& longest, int& nstrings, 
+          bool fixNames);
   void writeMatVer4MatrixHeader(const char *name, int rows, int cols,
         bool is_text);
@@ -70 +71 @@
         const void *data, bool is_text);
   static void generateDataInfo(double* &dataInfo, int& rows, int& cols,
-             const sim_DATA *mdl_data);
+             const sim_DATA *mdl_data, int nVars, int nParams);
+  static void generateData_1(double* &data_1, int& rows, int& cols,
+           const sim_DATA *mdl_data, double tstart, double tstop);
 };