luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

inp2q.c, #3/23, renumber 'nodeflag' 

range over {4,5} instead of {0,1}
This commit is contained in:
rlar 2017-03-08 17:59:24 +01:00
parent 9abcaa88ae
commit 042916ae88
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/spicelib/parser/inp2q.c
View File

@ -49,7 +49,7 @@ void INP2Q(CKTcircuit *ckt, INPtables * tab, card * current, CKTnode *gnode)
printf("INP2Q: Parsing '%s'\n", current->line); printf("INP2Q: Parsing '%s'\n", current->line);
#endif #endif
nodeflag = 0; /* initially specify a 4 terminal device */ nodeflag = 4; /* initially specify a 4 terminal device */
line = current->line; line = current->line;
INPgetTok(&line, &name, 1); INPgetTok(&line, &name, 1);
INPinsert(&name, tab); INPinsert(&name, tab);
@ -95,14 +95,14 @@ void INP2Q(CKTcircuit *ckt, INPtables * tab, card * current, CKTnode *gnode)
node5 = gnode; /* 4-terminal adms device - thermal node to ground */ node5 = gnode; /* 4-terminal adms device - thermal node to ground */
nname5 = copy("0"); nname5 = copy("0");
INPtermInsert(ckt, &nname5, tab, &node5); INPtermInsert(ckt, &nname5, tab, &node5);
nodeflag = 1; /* now specify a 5 node device */ nodeflag = 5; /* now specify a 5 node device */
} }
} else { } else {
/* 5-terminal device */ /* 5-terminal device */
#ifdef TRACE #ifdef TRACE
printf("INP2Q: checking for 5 node device\n"); printf("INP2Q: checking for 5 node device\n");
#endif #endif
nodeflag = 1; /* now specify a 5 node device */ nodeflag = 5; /* now specify a 5 node device */
nname5 = model; nname5 = model;
INPtermInsert(ckt, &nname5, tab, &node5); INPtermInsert(ckt, &nname5, tab, &node5);
INPgetTok(&line, &model, 1); INPgetTok(&line, &model, 1);
@ -133,9 +133,9 @@ void INP2Q(CKTcircuit *ckt, INPtables * tab, card * current, CKTnode *gnode)
return; return;
} }
#ifdef ADMS #ifdef ADMS
if ((nodeflag && (thismodel->INPmodType != INPtypelook("hicum0"))) if ((nodeflag > 4 && (thismodel->INPmodType != INPtypelook("hicum0")))
&& (nodeflag && (thismodel->INPmodType != INPtypelook("hicum2"))) && (nodeflag > 4 && (thismodel->INPmodType != INPtypelook("hicum2")))
&& (nodeflag && (thismodel->INPmodType != INPtypelook("bjt504t")))) && (nodeflag > 4 && (thismodel->INPmodType != INPtypelook("bjt504t"))))
{ {
LITERR("Too much nodes for this model type"); LITERR("Too much nodes for this model type");
return; return;
@ -172,7 +172,7 @@ void INP2Q(CKTcircuit *ckt, INPtables * tab, card * current, CKTnode *gnode)
IFC(bindNode, (ckt, fast, 4, node4)); IFC(bindNode, (ckt, fast, 4, node4));
#ifdef ADMS #ifdef ADMS
if (nodeflag) { /* 5-node device */ if (nodeflag > 4) { /* 5-node device */
IFC(bindNode, (ckt, fast, 5, node5)); IFC(bindNode, (ckt, fast, 5, node5));
} }
#endif #endif