diff --git a/ChangeLog b/ChangeLog index 370991224..63374f04f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-10-15 Robert Larice + * src/include/ngspice.h , + * src/main.c , + * src/maths/misc/accuracy.c , + * src/maths/misc/accuracy.h : + collect BMin BMax ExpLim Accuracy in "accuracy.h", kill `Acc' + 2010-10-15 Robert Larice * src/xspice/cmpp/pp_mod.c : cmpp shall add a function prototype to the generated "cfunc.c" file diff --git a/src/include/ngspice.h b/src/include/ngspice.h index d3a814b95..30a521ed2 100644 --- a/src/include/ngspice.h +++ b/src/include/ngspice.h @@ -260,17 +260,5 @@ extern int tcl_fprintf(FILE *f, const char *format, ...); #endif -#ifdef CIDER -/* Definitions of globals for Machine Accuracy Limits - * Imported from cider -*/ - -extern double BMin; /* lower limit for B(x) */ -extern double BMax; /* upper limit for B(x) */ -extern double ExpLim; /* limit for exponential */ -extern double Accuracy; /* accuracy of the machine */ -extern double Acc, MuLim, MutLim; -#endif /* CIDER */ - #endif /* NGSPICE_H_INCLUDED */ diff --git a/src/main.c b/src/main.c index 6997920dc..eb95b91c1 100644 --- a/src/main.c +++ b/src/main.c @@ -119,7 +119,7 @@ double BMin; /* lower limit for B(x) */ double BMax; /* upper limit for B(x) */ double ExpLim; /* limit for exponential */ double Accuracy; /* accuracy of the machine */ -double Acc, MuLim, MutLim; +double MuLim, MutLim; #ifdef CIDER /* Global debug flags from CIDER, soon they will become diff --git a/src/maths/misc/accuracy.c b/src/maths/misc/accuracy.c index fec3ea719..a0ce01052 100644 --- a/src/maths/misc/accuracy.c +++ b/src/maths/misc/accuracy.c @@ -70,17 +70,13 @@ evalAccLimits(void) double xhold, dif; /* Introduced to avoid numerical trap if using non IEEE754 FPU */ -#ifndef CIDER - double Acc, BMin, BMax, ExpLim, MuLim, MutLim; -#endif - /* First we compute accuracy */ for( ; (acc + 1.0) > 1.0 ; ) { acc *= 0.5; } acc *= 2.0; - Acc = acc; + Accuracy = acc; /* * This loop has been modified to include a variable to track diff --git a/src/maths/misc/accuracy.h b/src/maths/misc/accuracy.h index a03471c98..806f0d702 100644 --- a/src/maths/misc/accuracy.h +++ b/src/maths/misc/accuracy.h @@ -15,6 +15,8 @@ extern double BMin; /* lower limit for B(x) */ extern double BMax; /* upper limit for B(x) */ extern double ExpLim; /* limit for exponential */ extern double Accuracy; /* accuracy of the machine */ +extern double MuLim, MutLim; + extern void evalAccLimits(void);