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

Reverse the sequence of dynamic-gmin and new-gmin. 

The old method dynamic-gmin now comes first,
new-gmin will follow when the former has failed to converge.
This commit is contained in:
Holger Vogt 2021-11-18 15:22:51 +01:00
parent 2fdc09a3aa
commit 6c7675ba88
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,9 +60,9 @@ CKTop (CKTcircuit *ckt, long int firstmode, long int continuemode,
} }
/* first the new gmin, then the old gmin */ /* first the new gmin, then the old gmin */
else { else {
converged = new_gmin(ckt, firstmode, continuemode, iterlim); converged = dynamic_gmin(ckt, firstmode, continuemode, iterlim);
if(converged != 0) { if(converged != 0) {
converged = dynamic_gmin(ckt, firstmode, continuemode, iterlim); converged = new_gmin(ckt, firstmode, continuemode, iterlim);
} }
} }
@ -275,7 +275,7 @@ spice3_gmin (CKTcircuit *ckt, long int firstmode,
int converged, i; int converged, i;
ckt->CKTmode = firstmode; ckt->CKTmode = firstmode;
SPfrontEnd->IFerrorf (ERR_INFO, "Starting gmin stepping"); SPfrontEnd->IFerrorf (ERR_INFO, "Starting spice3 gmin stepping");
ckt->CKTdiagGmin = ckt->CKTdiagGmin =
(ckt->CKTgshunt == 0) ? ckt->CKTgmin : ckt->CKTgshunt; (ckt->CKTgshunt == 0) ? ckt->CKTgmin : ckt->CKTgshunt;
@ -311,7 +311,7 @@ spice3_gmin (CKTcircuit *ckt, long int firstmode,
converged = NIiter (ckt, iterlim); converged = NIiter (ckt, iterlim);
if (converged == 0) { if (converged == 0) {
SPfrontEnd->IFerrorf (ERR_INFO, "gmin stepping completed"); SPfrontEnd->IFerrorf (ERR_INFO, "spice3 gmin stepping completed");
#ifdef XSPICE #ifdef XSPICE
/* gtri - wbk - add convergence problem reporting flags */ /* gtri - wbk - add convergence problem reporting flags */
@ -319,7 +319,7 @@ spice3_gmin (CKTcircuit *ckt, long int firstmode,
#endif #endif
} else { } else {
SPfrontEnd->IFerrorf (ERR_WARNING, "gmin stepping failed"); SPfrontEnd->IFerrorf (ERR_WARNING, "spice3 gmin stepping failed");
} }
return converged; return converged;