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

Improve scheduling of breakpoints for V-source (PULSE and PWL). 

This fixes bugs with the TRA delay line reported by Tom Hajjar in
the Help forum, Jan 11 2024.
This commit is contained in:
Giles Atkinson 2024-01-13 18:06:46 +00:00
parent 2ad97feb31
commit d86a0c77cb
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/spicelib/devices/vsrc/vsrcacct.c
View File

@ -92,7 +92,7 @@ VSRCaccept(CKTcircuit *ckt, GENmodel *inModel)
} }
if (ckt->CKTtime >= here->VSRCbreak_time) { if (ckt->CKTtime >= here->VSRCbreak_time) {
double wait; double wait, atime;
if (time >= PER) { if (time >= PER) {
/* Repeating signal: where in period are we? */ /* Repeating signal: where in period are we? */
@ -101,26 +101,35 @@ VSRCaccept(CKTcircuit *ckt, GENmodel *inModel)
time -= basetime; time -= basetime;
} }
/* A request for a breakpoint very close
* to the current time will be ignored.
* Adjust so the next corner will be
* selected.
*/
atime = time + ckt->CKTminBreak;
/* Set next breakpoint. */ /* Set next breakpoint. */
if (time < 0.0) { if (atime < 0.0) {
/* Await first pulse */ /* Await first pulse */
wait = -time; wait = -time;
} else if (time < TR) { } else if (atime < TR) {
/* Wait for end of rise. */ /* Wait for end of rise. */
wait = TR - time; wait = TR - time;
} else if (time < TR + PW) { } else if (atime < TR + PW) {
/* Wait for fall. */ /* Wait for fall. */
wait = TR + PW - time; wait = TR + PW - time;
} else if (time < TR + PW + TF) { } else if (atime < TR + PW + TF) {
/* Wait for end of fall. */ /* Wait for end of fall. */
wait = TR + PW + TF - time; wait = TR + PW + TF - time;
} else { } else {
/* Wait for next pulse. */ /* Wait for next pulse. */
wait = PER - time; wait = PER - time;
} }
here->VSRCbreak_time = ckt->CKTtime + wait; here->VSRCbreak_time = ckt->CKTtime + wait;
@ -160,7 +169,7 @@ VSRCaccept(CKTcircuit *ckt, GENmodel *inModel)
case PWL: case PWL:
if (ckt->CKTtime >= here->VSRCbreak_time) { if (ckt->CKTtime >= here->VSRCbreak_time) {
double time, end, period; double time, atime, end, period;
int i; int i;
time = ckt->CKTtime - here->VSRCrdelay; time = ckt->CKTtime - here->VSRCrdelay;
@ -183,10 +192,18 @@ VSRCaccept(CKTcircuit *ckt, GENmodel *inModel)
} }
} }
/* A request for a breakpoint very close
* to the current time will be ignored.
* Adjust so the next corner will be
* selected.
*/
atime = time + ckt->CKTminBreak;
for (i = 0; for (i = 0;
i < here->VSRCfunctionOrder; i < here->VSRCfunctionOrder;
i += 2) { i += 2) {
if (here->VSRCcoeffs[i] > time) { if (here->VSRCcoeffs[i] > atime) {
here->VSRCbreak_time = here->VSRCbreak_time =
ckt->CKTtime + ckt->CKTtime +
here->VSRCcoeffs[i] - time; here->VSRCcoeffs[i] - time;
@ -257,7 +274,7 @@ VSRCaccept(CKTcircuit *ckt, GENmodel *inModel)
if (ckt->CKTtime >= if (ckt->CKTtime >=
state->RTScapTime - ckt->CKTminBreak && state->RTScapTime - ckt->CKTminBreak &&
ckt->CKTtime <= ckt->CKTtime <=
state->RTScapTime + ckt->CKTminBreak) { state->RTScapTime + ckt->CKTminBreak) {
error = CKTsetBreak(ckt, state->RTSemTime); error = CKTsetBreak(ckt, state->RTSemTime);
if(error) if(error)
return(error); return(error);