It's called modelica_integer_max, not int_max...

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@19797 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Mar 26, 2014 · eb6fe37 · eb6fe37
1 parent 5a52d24
commit eb6fe37
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
@@ -68,10 +68,10 @@ int externalInputallocate(DATA* data)
     }while(c!='\n');
 
     m = data->modelData.nInputVars;
-    data->simulationInfo.external_input.u = (modelica_real**)calloc(int_max(1,n),sizeof(modelica_real*));
+    data->simulationInfo.external_input.u = (modelica_real**)calloc(modelica_integer_max(1,n),sizeof(modelica_real*));
     for(i = 0; i<data->simulationInfo.external_input.n; ++i)
-      data->simulationInfo.external_input.u[i] = (modelica_real*)calloc(int_max(1,m),sizeof(modelica_real));
-    data->simulationInfo.external_input.t = (modelica_real*)calloc(int_max(1,data->simulationInfo.external_input.n),sizeof(modelica_real));
+      data->simulationInfo.external_input.u[i] = (modelica_real*)calloc(modelica_integer_max(1,m),sizeof(modelica_real));
+    data->simulationInfo.external_input.t = (modelica_real*)calloc(modelica_integer_max(1,data->simulationInfo.external_input.n),sizeof(modelica_real));
 
     for(i = 0; i < data->simulationInfo.external_input.n; ++i){
       c = fscanf(pFile, "%lf", &data->simulationInfo.external_input.t[i]);

diff --git a/SimulationRuntime/c/simulation/solver/initialization/initialization_data.c b/SimulationRuntime/c/simulation/solver/initialization/initialization_data.c
@@ -234,7 +234,7 @@ INIT_DATA *initializeInitData(DATA *simData)
   initData->residualScalingCoefficients = (double*)malloc(initData->nInitResiduals * sizeof(double));
   assertStreamPrint(NULL, 0 != initData->residualScalingCoefficients, "out of memory");
 
-  initData->startValueResidualScalingCoefficients = (double*)malloc(int_max(1,initData->nStartValueResiduals) * sizeof(double));
+  initData->startValueResidualScalingCoefficients = (double*)malloc(modelica_integer_max(1,initData->nStartValueResiduals) * sizeof(double));
   assertStreamPrint(NULL, 0 != initData->startValueResidualScalingCoefficients, "out of memory");
 
   for(i=0; i<initData->nInitResiduals; ++i) {