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

enable backward Euler

This commit is contained in:
dwarning 2010-11-06 13:30:44 +00:00
parent b4d3cc8646
commit 8a8fbcafe5
2 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -3,6 +3,7 @@
* remove two really ancient configuration options: * remove two really ancient configuration options:
* NOSQRT: Nobody want use log/exp instead of sqrt * NOSQRT: Nobody want use log/exp instead of sqrt
* CAPZEROBYPASS: Nobody want calculate 0.0 * x * CAPZEROBYPASS: Nobody want calculate 0.0 * x
* analysis/dctran.c: limit the order to 1 if backward Euler is enabled
2010-11-04 Robert Larice 2010-11-04 Robert Larice
* src/misc/string.c , * src/misc/string.c ,

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

@ -42,7 +42,7 @@ DCtran(CKTcircuit *ckt,
int i; int i;
double olddelta; double olddelta;
double delta; double delta;
double new; double newdelta;
double *temp; double *temp;
double startdTime; double startdTime;
double startsTime; double startsTime;
@ -64,7 +64,7 @@ DCtran(CKTcircuit *ckt,
IFuid timeUid; IFuid timeUid;
IFuid *nameList; IFuid *nameList;
int numNames; int numNames;
double maxstepsize=0.0; double maxstepsize = 0.0;
int ltra_num; int ltra_num;
CKTnode *node; CKTnode *node;
@ -84,9 +84,9 @@ DCtran(CKTcircuit *ckt,
int redostep; int redostep;
#endif #endif
if(restart || ckt->CKTtime == 0) { if(restart || ckt->CKTtime == 0) {
delta=MIN(ckt->CKTfinalTime/200,ckt->CKTstep)/10; delta=MIN(ckt->CKTfinalTime/100,ckt->CKTstep)/10;
#ifdef STEPDEBUG #ifdef STEPDEBUG
printf("delta = %g finalTime/200: %g CKTstep: %g\n",delta,ckt->CKTfinalTime/200,ckt->CKTstep); printf("delta = %g finalTime/100: %g CKTstep: %g\n",delta,ckt->CKTfinalTime/100,ckt->CKTstep);
#endif #endif
/* begin LTRA code addition */ /* begin LTRA code addition */
if (ckt->CKTtimePoints != NULL) if (ckt->CKTtimePoints != NULL)
@ -108,13 +108,12 @@ DCtran(CKTcircuit *ckt,
if(ckt->CKTbreaks) FREE(ckt->CKTbreaks); if(ckt->CKTbreaks) FREE(ckt->CKTbreaks);
ckt->CKTbreaks = TMALLOC(double, 2); ckt->CKTbreaks = TMALLOC(double, 2);
if(ckt->CKTbreaks == (double *)NULL) return(E_NOMEM); if(ckt->CKTbreaks == (double *)NULL) return(E_NOMEM);
*(ckt->CKTbreaks)=0; *(ckt->CKTbreaks) = 0;
*(ckt->CKTbreaks+1)=ckt->CKTfinalTime; *(ckt->CKTbreaks+1) = ckt->CKTfinalTime;
ckt->CKTbreakSize=2; ckt->CKTbreakSize = 2;
#ifdef XSPICE #ifdef XSPICE
/* gtri - begin - wbk - 12/19/90 - Modify setting of CKTminBreak */ /* gtri - begin - wbk - 12/19/90 - Modify setting of CKTminBreak */
/* if(ckt->CKTminBreak==0) ckt->CKTminBreak=ckt->CKTmaxStep*5e-5; */
/* Set to 10 times delmin for ATESSE 1 compatibity */ /* Set to 10 times delmin for ATESSE 1 compatibity */
if(ckt->CKTminBreak==0) ckt->CKTminBreak = 10.0 * ckt->CKTdelmin; if(ckt->CKTminBreak==0) ckt->CKTminBreak = 10.0 * ckt->CKTdelmin;
/* gtri - end - wbk - 12/19/90 - Modify setting of CKTminBreak */ /* gtri - end - wbk - 12/19/90 - Modify setting of CKTminBreak */
@ -146,7 +145,7 @@ DCtran(CKTcircuit *ckt,
ckt->CKTtime = 0; ckt->CKTtime = 0;
ckt->CKTdelta = 0; ckt->CKTdelta = 0;
ckt->CKTbreak=1; ckt->CKTbreak = 1;
firsttime = 1; firsttime = 1;
save_mode = (ckt->CKTmode&MODEUIC) | MODETRANOP | MODEINITJCT; save_mode = (ckt->CKTmode&MODEUIC) | MODETRANOP | MODEINITJCT;
save_order = ckt->CKTorder; save_order = ckt->CKTorder;
@ -173,8 +172,8 @@ DCtran(CKTcircuit *ckt,
} else } else
#endif #endif
converged = CKTop(ckt, converged = CKTop(ckt,
(ckt->CKTmode & MODEUIC)|MODETRANOP| MODEINITJCT, (ckt->CKTmode & MODEUIC) | MODETRANOP | MODEINITJCT,
(ckt->CKTmode & MODEUIC)|MODETRANOP| MODEINITFLOAT, (ckt->CKTmode & MODEUIC) | MODETRANOP | MODEINITFLOAT,
ckt->CKTdcMaxIter); ckt->CKTdcMaxIter);
if(converged != 0) { if(converged != 0) {
@ -257,7 +256,7 @@ DCtran(CKTcircuit *ckt,
/* gtri - end - wbk - Add Breakpoint stuff */ /* gtri - end - wbk - Add Breakpoint stuff */
#endif #endif
ckt->CKTstat->STATtimePts ++; ckt->CKTstat->STATtimePts ++;
ckt->CKTorder=1; ckt->CKTorder = 1;
for(i=0;i<7;i++) { for(i=0;i<7;i++) {
ckt->CKTdeltaOld[i]=ckt->CKTmaxStep; ckt->CKTdeltaOld[i]=ckt->CKTmaxStep;
} }
@ -285,8 +284,8 @@ DCtran(CKTcircuit *ckt,
} }
#endif #endif
ckt->CKTmode = (ckt->CKTmode&MODEUIC)|MODETRAN | MODEINITTRAN; ckt->CKTmode = (ckt->CKTmode&MODEUIC) | MODETRAN | MODEINITTRAN;
/* modeinittran set here */ /* modeinittran set here */
ckt->CKTag[0]=ckt->CKTag[1]=0; ckt->CKTag[0]=ckt->CKTag[1]=0;
bcopy(ckt->CKTstate0, ckt->CKTstate1, bcopy(ckt->CKTstate0, ckt->CKTstate1,
(size_t) ckt->CKTnumStates * sizeof(double)); (size_t) ckt->CKTnumStates * sizeof(double));
@ -357,7 +356,7 @@ DCtran(CKTcircuit *ckt,
ckt->CKTtimePoints = TREALLOC(double, ckt->CKTtimePoints, ckt->CKTtimeListSize); ckt->CKTtimePoints = TREALLOC(double, ckt->CKTtimePoints, ckt->CKTtimeListSize);
ckt->CKTsizeIncr *= 1.4; ckt->CKTsizeIncr *= 1.4;
} }
*(ckt->CKTtimePoints + ckt->CKTtimeIndex) = ckt->CKTtime; *(ckt->CKTtimePoints + ckt->CKTtimeIndex) = ckt->CKTtime;
} }
/* end LTRA code addition */ /* end LTRA code addition */
@ -382,7 +381,7 @@ DCtran(CKTcircuit *ckt,
fflush(stdout); fflush(stdout);
#endif /* STEPDEBUG */ #endif /* STEPDEBUG */
ckt->CKTstat->STATaccepted ++; ckt->CKTstat->STATaccepted ++;
ckt->CKTbreak=0; ckt->CKTbreak = 0;
/* XXX Error will cause single process to bail. */ /* XXX Error will cause single process to bail. */
if(error) { if(error) {
ckt->CKTcurrentAnalysis = DOING_TRAN; ckt->CKTcurrentAnalysis = DOING_TRAN;
@ -616,8 +615,8 @@ resume:
/* gtri - end - wbk - Modify Breakpoint stuff */ /* gtri - end - wbk - Modify Breakpoint stuff */
#else /* !XSPICE */ #else /* !XSPICE */
/* don't want to get below delmin for no reason */ /* don't want to get below delmin for no reason */
ckt->CKTdelta = MAX(ckt->CKTdelta, ckt->CKTdelmin*2.0); ckt->CKTdelta = MAX(ckt->CKTdelta, ckt->CKTdelmin*2.0);
} }
else if(ckt->CKTtime + ckt->CKTdelta >= *(ckt->CKTbreaks)) { else if(ckt->CKTtime + ckt->CKTdelta >= *(ckt->CKTbreaks)) {
ckt->CKTsaveDelta = ckt->CKTdelta; ckt->CKTsaveDelta = ckt->CKTdelta;
@ -821,7 +820,7 @@ resume:
ckt->CKTorder = save2; ckt->CKTorder = save2;
} }
#endif #endif
firsttime =0; firsttime = 0;
#ifndef CLUSTER #ifndef CLUSTER
goto nextTime; /* no check on goto nextTime; /* no check on
* first time point * first time point
@ -831,8 +830,8 @@ resume:
goto chkStep; goto chkStep;
#endif #endif
} }
new = ckt->CKTdelta; newdelta = ckt->CKTdelta;
error = CKTtrunc(ckt,&new); error = CKTtrunc(ckt,&newdelta);
if(error) { if(error) {
ckt->CKTcurrentAnalysis = DOING_TRAN; ckt->CKTcurrentAnalysis = DOING_TRAN;
ckt->CKTstat->STATtranTime += ckt->CKTstat->STATtranTime +=
@ -851,11 +850,11 @@ resume:
- startkTime; - startkTime;
return(error); return(error);
} }
if(new>.9 * ckt->CKTdelta) { if(newdelta > .9 * ckt->CKTdelta) {
if(ckt->CKTorder == 1) { if((ckt->CKTorder == 1) && (ckt->CKTmaxOrder > 1)) { /* don't rise the order for backward Euler */
new = ckt->CKTdelta; newdelta = ckt->CKTdelta;
ckt->CKTorder = 2; ckt->CKTorder = 2;
error = CKTtrunc(ckt,&new); error = CKTtrunc(ckt,&newdelta);
if(error) { if(error) {
ckt->CKTcurrentAnalysis = DOING_TRAN; ckt->CKTcurrentAnalysis = DOING_TRAN;
ckt->CKTstat->STATtranTime += ckt->CKTstat->STATtranTime +=
@ -874,13 +873,13 @@ resume:
ckt->CKTstat->STATsyncTime - startkTime; ckt->CKTstat->STATsyncTime - startkTime;
return(error); return(error);
} }
if(new <= 1.05 * ckt->CKTdelta) { if(newdelta <= 1.05 * ckt->CKTdelta) {
ckt->CKTorder = 1; ckt->CKTorder = 1;
} }
} }
/* time point OK - 630 */ /* time point OK - 630 */
ckt->CKTdelta = new; ckt->CKTdelta = newdelta;
#ifdef NDEV #ifdef NDEV
/* show a time process indicator, by Gong Ding, gdiso@ustc.edu */ /* show a time process indicator, by Gong Ding, gdiso@ustc.edu */
if(ckt->CKTtime/ckt->CKTfinalTime*100<10.0) if(ckt->CKTtime/ckt->CKTfinalTime*100<10.0)
printf("%%%3.2lf\b\b\b\b\b",ckt->CKTtime/ckt->CKTfinalTime*100); printf("%%%3.2lf\b\b\b\b\b",ckt->CKTtime/ckt->CKTfinalTime*100);
@ -890,7 +889,6 @@ resume:
printf("%%%5.2lf\b\b\b\b\b\b\b",ckt->CKTtime/ckt->CKTfinalTime*100); printf("%%%5.2lf\b\b\b\b\b\b\b",ckt->CKTtime/ckt->CKTfinalTime*100);
fflush(stdout); fflush(stdout);
#endif #endif
#ifdef STEPDEBUG #ifdef STEPDEBUG
(void)printf( (void)printf(
"delta set to truncation error result: %g. Point accepted at CKTtime: %g\n", "delta set to truncation error result: %g. Point accepted at CKTtime: %g\n",
@ -920,7 +918,7 @@ resume:
ckt->CKTtime = ckt->CKTtime -ckt->CKTdelta; ckt->CKTtime = ckt->CKTtime -ckt->CKTdelta;
ckt->CKTstat->STATrejected ++; ckt->CKTstat->STATrejected ++;
#endif #endif
ckt->CKTdelta = new; ckt->CKTdelta = newdelta;
#ifdef STEPDEBUG #ifdef STEPDEBUG
(void)printf( (void)printf(
"delta set to truncation error result:point rejected\n"); "delta set to truncation error result:point rejected\n");