luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use ceil for round up

This commit is contained in:
dwarning 2010-11-06 18:06:45 +00:00
parent d803d1e622
commit 503e47089f
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
2010-11-06 Dietmar Warning
* analysis/dctran.c: use ceil function for correct round up
2010-11-06 Robert Larice 2010-11-06 Robert Larice
* src/spicelib/devices/ndev/ndevdump.c : * src/spicelib/devices/ndev/ndevdump.c :
drop some unused static variables drop some unused static variables

10
src/spicelib/analysis/dctran.c
View File

@ -99,7 +99,7 @@ DCtran(CKTcircuit *ckt,
ckt->CKTsizeIncr = 10; ckt->CKTsizeIncr = 10;
ckt->CKTtimeIndex = -1; /* before the DC soln has been stored */ ckt->CKTtimeIndex = -1; /* before the DC soln has been stored */
ckt->CKTtimeListSize = ckt->CKTfinalTime / maxstepsize + 0.5; ckt->CKTtimeListSize = (int) ceil( ckt->CKTfinalTime / maxstepsize );
ltra_num = CKTtypelook("LTRA"); ltra_num = CKTtypelook("LTRA");
if (ltra_num >= 0 && ckt->CKThead[ltra_num] != NULL) if (ltra_num >= 0 && ckt->CKThead[ltra_num] != NULL)
ckt->CKTtimePoints = NEWN(double, ckt->CKTtimeListSize); ckt->CKTtimePoints = NEWN(double, ckt->CKTtimeListSize);
@ -349,12 +349,12 @@ DCtran(CKTcircuit *ckt,
if (ckt->CKTtimeIndex >= ckt->CKTtimeListSize) { if (ckt->CKTtimeIndex >= ckt->CKTtimeListSize) {
/* need more space */ /* need more space */
int need; int need;
need = 0.5 + (ckt->CKTfinalTime - ckt->CKTtime) / maxstepsize; need = (int) ceil( (ckt->CKTfinalTime - ckt->CKTtime) / maxstepsize );
if (need < ckt->CKTsizeIncr) if (need < ckt->CKTsizeIncr)
need = ckt->CKTsizeIncr; need = ckt->CKTsizeIncr;
ckt->CKTtimeListSize += need; ckt->CKTtimeListSize += need;
ckt->CKTtimePoints = TREALLOC(double, ckt->CKTtimePoints, ckt->CKTtimeListSize); ckt->CKTtimePoints = TREALLOC(double, ckt->CKTtimePoints, ckt->CKTtimeListSize);
ckt->CKTsizeIncr *= 1.4; ckt->CKTsizeIncr = (int) ceil(1.4 * ckt->CKTsizeIncr);
} }
*(ckt->CKTtimePoints + ckt->CKTtimeIndex) = ckt->CKTtime; *(ckt->CKTtimePoints + ckt->CKTtimeIndex) = ckt->CKTtime;
} }
@ -549,7 +549,7 @@ resume:
*/ */
ckt->CKTorder = 1; ckt->CKTorder = 1;
#ifdef STEPDEBUG #ifdef STEPDEBUG
if( (ckt->CKTdelta >.1* ckt->CKTsaveDelta) || if( (ckt->CKTdelta > .1*ckt->CKTsaveDelta) ||
(ckt->CKTdelta > .1*(*(ckt->CKTbreaks+1)-*(ckt->CKTbreaks))) ) { (ckt->CKTdelta > .1*(*(ckt->CKTbreaks+1)-*(ckt->CKTbreaks))) ) {
if(ckt->CKTsaveDelta < (*(ckt->CKTbreaks+1)-*(ckt->CKTbreaks))) { if(ckt->CKTsaveDelta < (*(ckt->CKTbreaks+1)-*(ckt->CKTbreaks))) {
(void)printf("limited by pre-breakpoint delta (saveDelta: %g, nxt_breakpt: %g, curr_breakpt: %g\n", (void)printf("limited by pre-breakpoint delta (saveDelta: %g, nxt_breakpt: %g, curr_breakpt: %g\n",