Browse Source

Maintain the KLU related changes under '#ifdef KLU'

pre-master-46
Francesco Lannutti 6 years ago
committed by Holger Vogt
parent
commit
f3127234aa
  1. 16
      src/spicelib/analysis/cktic.c

16
src/spicelib/analysis/cktic.c

@ -25,6 +25,8 @@ CKTic(CKTcircuit *ckt)
for(node = ckt->CKTnodes;node != NULL; node = node->next) { for(node = ckt->CKTnodes;node != NULL; node = node->next) {
if(node->nsGiven) { if(node->nsGiven) {
#ifdef KLU
if (ckt->CKTkluMODE) { if (ckt->CKTkluMODE) {
node->ptr = (double *) SMPfindElt (ckt->CKTmatrix, node->number, node->number, 0) ; node->ptr = (double *) SMPfindElt (ckt->CKTmatrix, node->number, node->number, 0) ;
if (node->ptr == NULL) { if (node->ptr == NULL) {
@ -32,14 +34,22 @@ CKTic(CKTcircuit *ckt)
printf ("Please specify an existing element for .nodeset\n") ; printf ("Please specify an existing element for .nodeset\n") ;
} }
} else { } else {
#endif
node->ptr = SMPmakeElt(ckt->CKTmatrix,node->number,node->number); node->ptr = SMPmakeElt(ckt->CKTmatrix,node->number,node->number);
#ifdef KLU
} }
#endif
if(node->ptr == NULL) return(E_NOMEM); if(node->ptr == NULL) return(E_NOMEM);
ckt->CKThadNodeset = 1; ckt->CKThadNodeset = 1;
ckt->CKTrhsOld[node->number] = ckt->CKTrhs[node->number] = node->nodeset; ckt->CKTrhsOld[node->number] = ckt->CKTrhs[node->number] = node->nodeset;
} }
if(node->icGiven) { if(node->icGiven) {
if(! ( node->ptr)) { if(! ( node->ptr)) {
#ifdef KLU
if (ckt->CKTkluMODE) { if (ckt->CKTkluMODE) {
node->ptr = (double *) SMPfindElt (ckt->CKTmatrix, node->number, node->number, 0) ; node->ptr = (double *) SMPfindElt (ckt->CKTmatrix, node->number, node->number, 0) ;
if (node->ptr == NULL) { if (node->ptr == NULL) {
@ -47,8 +57,14 @@ CKTic(CKTcircuit *ckt)
printf ("Please specify an existing element for .ic\n") ; printf ("Please specify an existing element for .ic\n") ;
} }
} else { } else {
#endif
node->ptr = SMPmakeElt(ckt->CKTmatrix,node->number, node->number); node->ptr = SMPmakeElt(ckt->CKTmatrix,node->number, node->number);
#ifdef KLU
} }
#endif
if(node->ptr == NULL) return(E_NOMEM); if(node->ptr == NULL) return(E_NOMEM);
} }
ckt->CKTrhsOld[node->number] = ckt->CKTrhs[node->number] = node->ic; ckt->CKTrhsOld[node->number] = ckt->CKTrhs[node->number] = node->ic;

Loading…
Cancel
Save