From f2d7d1115fcfde69c51bc6e9540119d04a4f6e8a Mon Sep 17 00:00:00 2001 From: Francesco Lannutti Date: Thu, 6 Jun 2013 22:18:16 +0200 Subject: [PATCH] Fixed a missing check for DEVisLinear and DEVisLinearStatic --- src/spicelib/analysis/cktload.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/spicelib/analysis/cktload.c b/src/spicelib/analysis/cktload.c index 6055218e6..298e674cc 100644 --- a/src/spicelib/analysis/cktload.c +++ b/src/spicelib/analysis/cktload.c @@ -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