|
|
@ -54,11 +54,17 @@ CKTop (CKTcircuit *ckt, long int firstmode, long int continuemode, |
|
|
|
|
|
|
|
|
if (ckt->CKTnumGminSteps >= 1) { |
|
|
if (ckt->CKTnumGminSteps >= 1) { |
|
|
if (ckt->CKTnumGminSteps == 1) { |
|
|
if (ckt->CKTnumGminSteps == 1) { |
|
|
|
|
|
/* only the old gmin */ |
|
|
if (cp_getvar("dyngmin", CP_BOOL, NULL, 0)) { |
|
|
if (cp_getvar("dyngmin", CP_BOOL, NULL, 0)) { |
|
|
converged = dynamic_gmin(ckt, firstmode, continuemode, iterlim); |
|
|
converged = dynamic_gmin(ckt, firstmode, continuemode, iterlim); |
|
|
} |
|
|
} |
|
|
|
|
|
/* first the new gmin, then the old gmin */ |
|
|
else { |
|
|
else { |
|
|
converged = new_gmin(ckt, firstmode, continuemode, iterlim); |
|
|
converged = new_gmin(ckt, firstmode, continuemode, iterlim); |
|
|
|
|
|
/* if(converged != 0) { |
|
|
|
|
|
converged = dynamic_gmin(ckt, firstmode, continuemode, iterlim); |
|
|
|
|
|
}*/ |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
else { |
|
|
else { |
|
|
|