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

In dctran.c, call EVTcall_hybrids() (which then calls a subset of 

code model instances) only when the current timestep was successful.
That is efficient and means that code models may rely on such calls,
for example a co-simulator may safely advance to the end of the timestep.
The function cm_irreversible() that is mentioned in a comment will be
added in a later commit.
This commit is contained in:
Giles Atkinson 2023-10-10 21:44:03 +01:00
parent 3d1cbf93ee
commit 508fad0f55
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -787,14 +787,6 @@ resume:
converged = NIiter(ckt,ckt->CKTtranMaxIter); converged = NIiter(ckt,ckt->CKTtranMaxIter);
#ifdef XSPICE
if(ckt->evt->counts.num_insts > 0) {
g_mif_info.circuit.evt_step = ckt->CKTtime;
EVTcall_hybrids(ckt);
}
/* gtri - end - wbk - Call all hybrids */
#endif
ckt->CKTstat->STATtimePts ++; ckt->CKTstat->STATtimePts ++;
ckt->CKTmode = (ckt->CKTmode&MODEUIC)|MODETRAN | MODEINITPRED; ckt->CKTmode = (ckt->CKTmode&MODEUIC)|MODETRAN | MODEINITPRED;
if(firsttime) { if(firsttime) {
@ -830,8 +822,10 @@ resume:
#ifdef XSPICE #ifdef XSPICE
/* gtri - begin - wbk - Add Breakpoint stuff */ /* gtri - begin - wbk - Add Breakpoint stuff */
/* Force backup if temporary breakpoint is < current time */
} else if(g_mif_info.breakpoint.current < ckt->CKTtime) { } else if(g_mif_info.breakpoint.current < ckt->CKTtime) {
/* Force backup if temporary breakpoint is < current time */
past_breakpoint:
ckt->CKTsaveDelta = ckt->CKTdelta; ckt->CKTsaveDelta = ckt->CKTdelta;
ckt->CKTtime -= ckt->CKTdelta; ckt->CKTtime -= ckt->CKTdelta;
ckt->CKTdelta = g_mif_info.breakpoint.current - ckt->CKTtime; ckt->CKTdelta = g_mif_info.breakpoint.current - ckt->CKTtime;
@ -879,6 +873,27 @@ resume:
return(error); return(error);
} }
if (newdelta > .9 * ckt->CKTdelta) { if (newdelta > .9 * ckt->CKTdelta) {
#if defined(XSPICE)
/* The timestep has succeeded. XSPICE instances with
* both analog and event ports ("hybrids") and others
* that have called cm_irreversible() receive an EVENT
* call here that allows them to capture their final
* port values and advance co-simulations. As this is an EVENT
* call, they are not expected to do any integrations,
* so there is no need for a further convergence test.
*/
if (ckt->evt->counts.num_hybrids > 0) {
g_mif_info.circuit.evt_step = ckt->CKTtime;
EVTcall_hybrids(ckt);
if (g_mif_info.breakpoint.current < ckt->CKTtime) {
/* A hybrid requested a breakpoint in the past. */
goto past_breakpoint;
}
}
#endif
if ((ckt->CKTorder == 1) && (ckt->CKTmaxOrder > 1)) { /* don't rise the order for backward Euler */ if ((ckt->CKTorder == 1) && (ckt->CKTmaxOrder > 1)) { /* don't rise the order for backward Euler */
newdelta = ckt->CKTdelta; newdelta = ckt->CKTdelta;
ckt->CKTorder = 2; ckt->CKTorder = 2;
@ -893,6 +908,7 @@ resume:
} }
/* time point OK - 630 */ /* time point OK - 630 */
ckt->CKTdelta = newdelta; ckt->CKTdelta = newdelta;
#ifdef NDEV #ifdef NDEV
if (!ft_norefprint) { if (!ft_norefprint) {
/* show a time process indicator, by Gong Ding, gdiso@ustc.edu */ /* show a time process indicator, by Gong Ding, gdiso@ustc.edu */