Fixed a missing check for DEVisLinear and DEVisLinearStatic

This commit is contained in:
Francesco Lannutti 2013-06-06 22:18:16 +02:00 committed by Francesco Lannutti
parent 9facab260b
commit f2d7d1115f
1 changed files with 8 additions and 3 deletions

View File

@ -40,7 +40,9 @@ CKTloadLinearStatic (CKTcircuit *ckt)
for (i = 0; i < DEVmaxnum; i++)
{
if (DEVices[i] && DEVices[i]->DEVload && ckt->CKThead [i] && (*DEVices[i]->DEVisLinear) && (*DEVices[i]->DEVisLinearStatic))
if (DEVices[i] && DEVices[i]->DEVload && ckt->CKThead [i] &&
DEVices[i]->DEVisLinear && (*DEVices[i]->DEVisLinear) &&
DEVices[i]->DEVisLinearStatic && (*DEVices[i]->DEVisLinearStatic))
{
error = DEVices[i]->DEVload (ckt->CKThead [i], ckt) ;
@ -63,7 +65,9 @@ CKTloadLinearDynamic (CKTcircuit *ckt)
for (i = 0; i < DEVmaxnum; i++)
{
if (DEVices[i] && DEVices[i]->DEVload && ckt->CKThead [i] && *DEVices[i]->DEVisLinear && !(*DEVices[i]->DEVisLinearStatic))
if (DEVices[i] && DEVices[i]->DEVload && ckt->CKThead [i] &&
DEVices[i]->DEVisLinear && (*DEVices[i]->DEVisLinear) &&
DEVices[i]->DEVisLinearStatic && !(*DEVices[i]->DEVisLinearStatic))
{
error = DEVices[i]->DEVload (ckt->CKThead [i], ckt) ;
@ -123,7 +127,8 @@ CKTload(CKTcircuit *ckt)
/* Francesco Lannutti */
#ifdef KLU
if (DEVices[i] && DEVices[i]->DEVload && ckt->CKThead[i] && !(*DEVices[i]->DEVisLinear)) {
if (DEVices[i] && DEVices[i]->DEVload && ckt->CKThead[i] &&
DEVices[i]->DEVisLinear && !(*DEVices[i]->DEVisLinear)) {
#else
if (DEVices[i] && DEVices[i]->DEVload && ckt->CKThead[i]) {
#endif