diff --git a/src/include/ngspice/complex.h b/src/include/ngspice/complex.h index f8d8c334e..9ed79eac7 100644 --- a/src/include/ngspice/complex.h +++ b/src/include/ngspice/complex.h @@ -69,7 +69,6 @@ typedef struct { #endif /* Some defines used mainly in cmath.c. */ -#define FTEcabs(d) (((d) < 0.0) ? - (d) : (d)) #define cph(c) (atan2(imagpart(c), (realpart(c)))) #define cmag(c) (hypot(realpart(c), imagpart(c))) #define radtodeg(c) (cx_degrees ? ((c) * (180 / M_PI)) : (c)) @@ -82,7 +81,7 @@ typedef struct { #define cdiv(r1, i1, r2, i2, r3, i3) \ { \ double r, s; \ - if (FTEcabs(r2) > FTEcabs(i2)) { \ + if (fabs(r2) > fabs(i2)) { \ r = (i2) / (r2); \ s = (r2) + r * (i2); \ (r3) = ((r1) + r * (i1)) / s; \ @@ -96,11 +95,6 @@ typedef struct { } - - -#define DC_ABS(a,b) (fabs(a) + fabs(b)) - - /* * Division among complex numbers */ diff --git a/src/maths/cmaths/cmath1.c b/src/maths/cmaths/cmath1.c index 5f6d40d42..180e7a7a4 100644 --- a/src/maths/cmaths/cmath1.c +++ b/src/maths/cmaths/cmath1.c @@ -46,7 +46,7 @@ cx_mag(void *data, short int type, int length, int *newlength, short int *newtyp *newtype = VF_REAL; if (type == VF_REAL) for (i = 0; i < length; i++) - d[i] = FTEcabs(dd[i]); + d[i] = fabs(dd[i]); else for (i = 0; i < length; i++) d[i] = cmag(cc[i]); diff --git a/src/maths/cmaths/cmath2.c b/src/maths/cmaths/cmath2.c index e4ed30892..85a1ea8f0 100644 --- a/src/maths/cmaths/cmath2.c +++ b/src/maths/cmaths/cmath2.c @@ -41,8 +41,8 @@ cx_max_local(void *data, short int type, int length) int i; for (i = 0; i < length; i++) - if (largest < FTEcabs(dd[i])) - largest = FTEcabs(dd[i]); + if (largest < fabs(dd[i])) + largest = fabs(dd[i]); } return largest; } @@ -467,7 +467,7 @@ cx_vector(void *data, short int type, int length, int *newlength, short int *new NG_IGNORE(length); if (type == VF_REAL) - len = (int)FTEcabs(*dd); + len = (int)fabs(*dd); else len = (int)cmag(*cc); if (len == 0) @@ -494,7 +494,7 @@ cx_unitvec(void *data, short int type, int length, int *newlength, short int *ne NG_IGNORE(length); if (type == VF_REAL) - len = (int)FTEcabs(*dd); + len = (int)fabs(*dd); else len = (int)cmag(*cc); if (len == 0) @@ -649,9 +649,9 @@ cx_mod(void *data1, void *data2, short int datatype1, short int datatype2, int l if ((datatype1 == VF_REAL) && (datatype2 == VF_REAL)) { d = alloc_d(length); for (i = 0; i < length; i++) { - r1 = (int)floor(FTEcabs(dd1[i])); + r1 = (int)floor(fabs(dd1[i])); rcheck(r1 > 0, "mod"); - r2 = (int)floor(FTEcabs(dd2[i])); + r2 = (int)floor(fabs(dd2[i])); rcheck(r2 > 0, "mod"); r3 = r1 % r2; d[i] = (double) r3; @@ -672,13 +672,13 @@ cx_mod(void *data1, void *data2, short int datatype1, short int datatype2, int l } else { c2 = cc2[i]; } - r1 = (int)floor(FTEcabs(realpart(c1))); + r1 = (int)floor(fabs(realpart(c1))); rcheck(r1 > 0, "mod"); - r2 = (int)floor(FTEcabs(realpart(c2))); + r2 = (int)floor(fabs(realpart(c2))); rcheck(r2 > 0, "mod"); - i1 = (int)floor(FTEcabs(imagpart(c1))); + i1 = (int)floor(fabs(imagpart(c1))); rcheck(i1 > 0, "mod"); - i2 = (int)floor(FTEcabs(imagpart(c2))); + i2 = (int)floor(fabs(imagpart(c2))); rcheck(i2 > 0, "mod"); r3 = r1 % r2; i3 = i1 % i2;