OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove dependency on C99's isinf() and isnan() functions.

Browse Source 
Signed-off-by: Bård Skaflestad <Bard.Skaflestad@sintef.no>
This commit is contained in:
Bård Skaflestad 2012-06-18 16:00:17 +00:00 committed by Bård Skaflestad
parent b21134fede
commit 7dfb478e2e
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
preprocess.c
View File

@ -389,14 +389,18 @@ static void approximate_intersection_pt(int *L, double *c, double *pt)
/* find parameter a where lines L0L1 and L2L3 have same /* find parameter a where lines L0L1 and L2L3 have same
* z-coordinate */ * z-coordinate */
a = (z2-z0)/(z1-z0 - (z3-z2)); if (fabs((z1 - z0) - (z3 - z2)) > 0.0) {
if (isinf(a) || isnan(a)){
a = (z2 - z0) / ((z1 - z0) - (z3 - z2));
} else {
a = 0; a = 0;
} }
/* the corresponding z-coordinate is */ /* the corresponding z-coordinate is */
z = z0* (1.0-a) + z1* a; z = z0*(1.0 - a) + z1*a;
/* find point (x1, y1, z) on pillar 1 */ /* find point (x1, y1, z) on pillar 1 */