- fix incompatible pointer types

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@19249 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Feb 22, 2014 · f0f56a3 · f0f56a3
1 parent 73061b1
commit f0f56a3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/SimulationRuntime/c/simulation/solver/external_input.c b/SimulationRuntime/c/simulation/solver/external_input.c
@@ -76,9 +76,9 @@ int externalInputallocate(DATA* data)
     data->simulationInfo.external_input.t = (modelica_real*)calloc(data->simulationInfo.external_input.n,sizeof(modelica_real));
 
     for(i = 0; i < data->simulationInfo.external_input.n; ++i){
-      c = fscanf(pFile, "%f", &data->simulationInfo.external_input.t[i]);
+      c = fscanf(pFile, "%lf", &data->simulationInfo.external_input.t[i]);
       for(j = 0; j < m; ++j){
-        c = fscanf(pFile, "%f", &data->simulationInfo.external_input.u[i][j]);
+        c = fscanf(pFile, "%lf", &data->simulationInfo.external_input.u[i][j]);
       }
       if(c<0)
         data->simulationInfo.external_input.n = i;

diff --git a/SimulationRuntime/c/simulation_data.h b/SimulationRuntime/c/simulation_data.h
@@ -157,8 +157,8 @@ typedef struct ANALYTIC_JACOBIAN
 typedef struct EXTERNAL_INPUT 
 {
     modelica_boolean active;
-    float** u;
-    float* t;
+    modelica_real** u;
+    modelica_real* t;
     modelica_integer N;
     modelica_integer n;
     modelica_integer i;