From 848065cc61c042c89f101fc10ed408c3fa7b7158 Mon Sep 17 00:00:00 2001 From: pnenzi Date: Wed, 24 Jan 2001 11:21:36 +0000 Subject: [PATCH] Removed #ifndef'd (NEWCONV) code. --- src/spicelib/devices/bsim3soi_dd/b3soiddld.c | 18 -------------- src/spicelib/devices/bsim3soi_pd/b3soipdld.c | 25 -------------------- 2 files changed, 43 deletions(-) diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddld.c b/src/spicelib/devices/bsim3soi_dd/b3soiddld.c index 3e84207e6..f121e3abc 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddld.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddld.c @@ -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 */ } } diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdld.c b/src/spicelib/devices/bsim3soi_pd/b3soipdld.c index bf5652ca2..d766d2381 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdld.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdld.c @@ -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 */ } }