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

cktop.c, #5/14, simplify loop termination

This commit is contained in:
rlar 2016-07-24 10:16:57 +02:00
parent e2f4c2ec9f
commit eea4d016ec
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,7 +130,7 @@ dynamic_gmin (CKTcircuit * ckt, long int firstmode,
long int continuemode, int iterlim) long int continuemode, int iterlim)
{ {
double OldGmin, gtarget, factor; double OldGmin, gtarget, factor;
int success, failed, converged; int converged;
int NumNodes, iters, i; int NumNodes, iters, i;
double *OldRhsOld, *OldCKTstate0; double *OldRhsOld, *OldCKTstate0;
@ -157,9 +157,8 @@ dynamic_gmin (CKTcircuit * ckt, long int firstmode,
OldGmin = 1e-2; OldGmin = 1e-2;
ckt->CKTdiagGmin = OldGmin / factor; ckt->CKTdiagGmin = OldGmin / factor;
gtarget = MAX (ckt->CKTgmin, ckt->CKTgshunt); gtarget = MAX (ckt->CKTgmin, ckt->CKTgshunt);
success = failed = 0;
while ((!success) && (!failed)) { for (;;) {
fprintf (stderr, "Trying gmin = %12.4E ", ckt->CKTdiagGmin); fprintf (stderr, "Trying gmin = %12.4E ", ckt->CKTdiagGmin);
ckt->CKTnoncon = 1; ckt->CKTnoncon = 1;
iters = ckt->CKTstat->STATnumIter; iters = ckt->CKTstat->STATnumIter;
@ -173,7 +172,7 @@ dynamic_gmin (CKTcircuit * ckt, long int firstmode,
"One successful gmin step"); "One successful gmin step");
if (ckt->CKTdiagGmin <= gtarget) { if (ckt->CKTdiagGmin <= gtarget) {
success = 1; break; /* successfull */
} else { } else {
for (i = 0, n = ckt->CKTnodes; n; n = n->next) for (i = 0, n = ckt->CKTnodes; n; n = n->next)
OldRhsOld[i++] = ckt->CKTrhsOld[n->number]; OldRhsOld[i++] = ckt->CKTrhsOld[n->number];
@ -201,9 +200,9 @@ dynamic_gmin (CKTcircuit * ckt, long int firstmode,
} }
} else { } else {
if (factor < 1.00005) { if (factor < 1.00005) {
failed = 1;
SPfrontEnd->IFerrorf (ERR_WARNING, SPfrontEnd->IFerrorf (ERR_WARNING,
"Last gmin step failed"); "Last gmin step failed");
break; /* failed */
} else { } else {
SPfrontEnd->IFerrorf (ERR_WARNING, SPfrontEnd->IFerrorf (ERR_WARNING,
"Further gmin increment"); "Further gmin increment");