Removed #ifndef'd (NEWCONV) code.
This commit is contained in:
parent
1a1fad9023
commit
848065cc61
|
|
@ -3621,24 +3621,6 @@ here->B3SOIDDdum4 = Ic;
|
|||
{ ckt->CKTnoncon++;
|
||||
if (here->B3SOIDDdebugMod > 2)
|
||||
fprintf(fpdebug, "Check is on, noncon=%d\n", ckt->CKTnoncon++);
|
||||
#ifndef NEWCONV
|
||||
}
|
||||
else
|
||||
{ tol = ckt->CKTreltol * MAX(fabs(cdhat), fabs(here->B3SOIDDcd))
|
||||
+ ckt->CKTabstol;
|
||||
if (fabs(cdhat - here->B3SOIDDcd) >= tol)
|
||||
{ ckt->CKTnoncon++;
|
||||
}
|
||||
else
|
||||
{ tol = ckt->CKTreltol * MAX(fabs(cbhat),
|
||||
fabs(here->B3SOIDDcbs + here->B3SOIDDcbd))
|
||||
+ ckt->CKTabstol;
|
||||
if (fabs(cbhat - (here->B3SOIDDcbs + here->B3SOIDDcbd))
|
||||
> tol)
|
||||
{ ckt->CKTnoncon++;
|
||||
}
|
||||
}
|
||||
#endif /* NEWCONV */
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -4043,31 +4043,6 @@ B3SOIPDload (inModel, ckt)
|
|||
if (Check == 1)
|
||||
{
|
||||
ckt->CKTnoncon++;
|
||||
#ifndef NEWCONV
|
||||
}
|
||||
else
|
||||
{
|
||||
tol =
|
||||
ckt->CKTreltol * MAX (fabs (cdhat),
|
||||
fabs (here->B3SOIPDcd)) +
|
||||
ckt->CKTabstol;
|
||||
if (fabs (cdhat - here->B3SOIPDcd) >= tol)
|
||||
{
|
||||
ckt->CKTnoncon++;
|
||||
}
|
||||
else
|
||||
{
|
||||
tol = ckt->CKTreltol * MAX (fabs (cbhat),
|
||||
fabs (here->B3SOIPDcbs +
|
||||
here->B3SOIPDcbd)) +
|
||||
ckt->CKTabstol;
|
||||
if (fabs (cbhat - (here->B3SOIPDcbs + here->B3SOIPDcbd))
|
||||
> tol)
|
||||
{
|
||||
ckt->CKTnoncon++;
|
||||
}
|
||||
}
|
||||
#endif /* NEWCONV */
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue