Fix some abs/fabs warnings (possibly abs was also part of f2c and was…

… an fabs in disguise) git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@24340 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jan 30, 2015 · 7680a65 · 7680a65
1 parent 9c48a4a
commit 7680a65
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/SimulationRuntime/c/openmodelica_types.h b/SimulationRuntime/c/openmodelica_types.h
@@ -47,6 +47,8 @@ typedef long int integer;
 typedef unsigned long int uinteger;
 #endif
 typedef double doublereal;
+#define maxmacro(X,Y) X > Y ? X : Y
+#define minmacro(X,Y) X > Y ? Y : X
 
 typedef void* modelica_complex; /* currently only External objects are represented using modelica_complex.*/
 typedef void* modelica_metatype; /* MetaModelica extension, added by sjoelund */

diff --git a/SimulationRuntime/c/optimization/eval_all/EvalG.c b/SimulationRuntime/c/optimization/eval_all/EvalG.c
@@ -802,7 +802,7 @@ static inline void debugeJac(OptData * optData, Number* vopt){
            hh *= 0.9;
          else
            break;
-         if(fabs(hh) < 1e-32){
+         if(fabsl(hh) < 1e-32){
            printf("\nWarning: StepSize for FD became very small!\n");
            break;
          }

diff --git a/SimulationRuntime/c/simulation/solver/dassl.c b/SimulationRuntime/c/simulation/solver/dassl.c
@@ -1098,7 +1098,7 @@ int jacA_num(DATA* data, double *t, double *y, double *yprime, double *delta, do
   for(i=data->modelData.nStates-1; i >= 0; i--)
   {
     delta_hhh = *h * yprime[i];
-    delta_hh = delta_h * fmax(fmax(abs(y[i]),abs(delta_hhh)),abs(1. / wt[i]));
+    delta_hh = delta_h * fmax(fmax(fabs(y[i]),fabs(delta_hhh)),fabs(1. / wt[i]));
     delta_hh = (delta_hhh >= 0 ? delta_hh : -delta_hh);
     delta_hh = y[i] + delta_hh - y[i];
     deltaInv = 1. / delta_hh;
@@ -1196,7 +1196,7 @@ int jacA_numColored(DATA* data, double *t, double *y, double *yprime, double *de
       if(data->simulationInfo.analyticJacobians[index].sparsePattern.colorCols[ii]-1 == i)
       {
         delta_hhh = *h * yprime[ii];
-        delta_hh[ii] = delta_h * fmax(fmax(abs(y[ii]),abs(delta_hhh)),abs(1./wt[ii]));
+        delta_hh[ii] = delta_h * fmax(fmax(fabs(y[ii]),fabs(delta_hhh)),fabs(1./wt[ii]));
         delta_hh[ii] = (delta_hhh >= 0 ? delta_hh[ii] : -delta_hh[ii]);
         delta_hh[ii] = y[ii] + delta_hh[ii] - y[ii];
 

diff --git a/SimulationRuntime/c/simulation/solver/nonlinearSolverHybrd.c b/SimulationRuntime/c/simulation/solver/nonlinearSolverHybrd.c
@@ -263,7 +263,7 @@ static int getNumericalJacobian(struct dataAndSys* dataAndSysNum, double* jac, c
   for(i = 0; i < solverData->n ; ++i)
   {
     delta_hhh = solverData->epsfcn * f[i];
-    delta_hh = fmax(delta_h * fmax(abs(x[i]), abs(delta_hhh)), delta_h);
+    delta_hh = fmax(delta_h * fmax(fabs(x[i]), fabs(delta_hhh)), delta_h);
     delta_hh = ((f[i] >= 0) ? delta_hh : -delta_hh);
     delta_hh = x[i] + delta_hh - x[i];
     deltaInv = 1. / delta_hh;

diff --git a/SimulationRuntime/c/simulation/solver/nonlinearSolverNewton.c b/SimulationRuntime/c/simulation/solver/nonlinearSolverNewton.c
@@ -454,7 +454,7 @@ static int fdjac(int* n, int(*f)(int*, double*, double*, int*, void*, int), doub
     if(linear){
       delta_hh = 1;
     } else {
-      delta_hh = fmax(delta_h * fmax(abs(x[i]), abs(fvec[i])), delta_h);
+      delta_hh = fmax(delta_h * fmax(fabs(x[i]), fabs(fvec[i])), delta_h);
       delta_hh = ((fvec[i] >= 0) ? delta_hh : -delta_hh);
       delta_hh = x[i] + delta_hh - x[i];
     }