epilectrik
/
pyNgSpice
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Commented out NEWCONV code.

pre-master-46
pnenzi 21 years ago
parent
afb6410121
commit
7b92662abd
2 changed files with 44 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      ChangeLog
  2. 80
      src/spicelib/devices/bsim4/b4ld.c

4
ChangeLog
View File

@ -1,3 +1,7 @@
2005-03-07 Paolo Nenzi <p.nenzi@ieee.org>
* src/spicelib/devices/bsim4/b4ld.c: commented out NEWCONV section.
2005-03-06 Paolo Nenzi <p.nenzi@ieee.org>
* src/spicelib/devices/bsim4: removed uninitialized variables in model

80
src/spicelib/devices/bsim4/b4ld.c
View File

@ -3571,46 +3571,46 @@ finished:
if ((here->BSIM4off == 0) || (!(ckt->CKTmode & MODEINITFIX)))
{ if (Check == 1)
{ ckt->CKTnoncon++;
#ifndef NEWCONV
}
else
{ if (here->BSIM4mode >= 0)
{ Idtot = here->BSIM4cd + here->BSIM4csub
+ here->BSIM4Igidl - here->BSIM4cbd;
}
else
{ Idtot = here->BSIM4cd + here->BSIM4cbd - here->BSIM4Igidl; /* bugfix */
}
tol0 = ckt->CKTreltol * MAX(fabs(cdhat), fabs(Idtot))
+ ckt->CKTabstol;
tol1 = ckt->CKTreltol * MAX(fabs(cseshat), fabs(Isestot))
+ ckt->CKTabstol;
tol2 = ckt->CKTreltol * MAX(fabs(cdedhat), fabs(Idedtot))
+ ckt->CKTabstol;
tol3 = ckt->CKTreltol * MAX(fabs(cgshat), fabs(Igstot))
+ ckt->CKTabstol;
tol4 = ckt->CKTreltol * MAX(fabs(cgdhat), fabs(Igdtot))
+ ckt->CKTabstol;
tol5 = ckt->CKTreltol * MAX(fabs(cgbhat), fabs(Igbtot))
+ ckt->CKTabstol;
if ((fabs(cdhat - Idtot) >= tol0) || (fabs(cseshat - Isestot) >= tol1)
|| (fabs(cdedhat - Idedtot) >= tol2))
{ ckt->CKTnoncon++;
}
else if ((fabs(cgshat - Igstot) >= tol3) || (fabs(cgdhat - Igdtot) >= tol4)
|| (fabs(cgbhat - Igbtot) >= tol5))
{ ckt->CKTnoncon++;
}
else
{ Ibtot = here->BSIM4cbs + here->BSIM4cbd
- here->BSIM4Igidl - here->BSIM4Igisl - here->BSIM4csub;
tol6 = ckt->CKTreltol * MAX(fabs(cbhat), fabs(Ibtot))
+ ckt->CKTabstol;
if (fabs(cbhat - Ibtot) > tol6)
{ ckt->CKTnoncon++;
}
}
#endif /* NEWCONV */
// #ifndef NEWCONV
// }
// else
// { if (here->BSIM4mode >= 0)
// { Idtot = here->BSIM4cd + here->BSIM4csub
// + here->BSIM4Igidl - here->BSIM4cbd;
// }
// else
// { Idtot = here->BSIM4cd + here->BSIM4cbd - here->BSIM4Igidl; /* bugfix */
// }
// tol0 = ckt->CKTreltol * MAX(fabs(cdhat), fabs(Idtot))
// + ckt->CKTabstol;
// tol1 = ckt->CKTreltol * MAX(fabs(cseshat), fabs(Isestot))
// + ckt->CKTabstol;
// tol2 = ckt->CKTreltol * MAX(fabs(cdedhat), fabs(Idedtot))
// + ckt->CKTabstol;
// tol3 = ckt->CKTreltol * MAX(fabs(cgshat), fabs(Igstot))
// + ckt->CKTabstol;
// tol4 = ckt->CKTreltol * MAX(fabs(cgdhat), fabs(Igdtot))
// + ckt->CKTabstol;
// tol5 = ckt->CKTreltol * MAX(fabs(cgbhat), fabs(Igbtot))
// + ckt->CKTabstol;
// if ((fabs(cdhat - Idtot) >= tol0) || (fabs(cseshat - Isestot) >= tol1)
// || (fabs(cdedhat - Idedtot) >= tol2))
// { ckt->CKTnoncon++;
// }
// else if ((fabs(cgshat - Igstot) >= tol3) || (fabs(cgdhat - Igdtot) >= tol4)
// || (fabs(cgbhat - Igbtot) >= tol5))
// { ckt->CKTnoncon++;
// }
// else
// { Ibtot = here->BSIM4cbs + here->BSIM4cbd
// - here->BSIM4Igidl - here->BSIM4Igisl - here->BSIM4csub;
// tol6 = ckt->CKTreltol * MAX(fabs(cbhat), fabs(Ibtot))
// + ckt->CKTabstol;
// if (fabs(cbhat - Ibtot) > tol6)
// { ckt->CKTnoncon++;
// }
// }
// #endif /* NEWCONV */
}
}
*(ckt->CKTstate0 + here->BSIM4vds) = vds;

Write Preview
Loading…
Cancel
Save