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

Merge branch 'pre-master' of ssh://git.code.sf.net/p/ngspice/ngspice into pre-master

This commit is contained in:
Holger Vogt 2020-12-25 15:47:20 +01:00
parent f381667c3b 45773088c3
commit a933a2142c
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,18 +13,16 @@ Modified: 2001 Paolo Nenzi (Cider Integration)
static int static int
model_numnodes(int type) model_max_numnodes(int type)
{ {
if (type == INPtypelook("VBIC") ||
type == INPtypelook("hicum2"))
return 5;
#ifdef ADMS #ifdef ADMS
if (type == INPtypelook("hicum0") || if (type == INPtypelook("hicum0") ||
type == INPtypelook("bjt504t")) type == INPtypelook("bjt504t"))
return 5; return 5;
#else
if (type == INPtypelook("VBIC") ||
type == INPtypelook("hicum2"))
return 5;
#endif #endif
return 4; return 4;
} }
@ -78,14 +76,14 @@ void INP2Q(CKTcircuit *ckt, INPtables * tab, struct card *current, CKTnode *gnod
INPtermInsert(ckt, &token, tab, &node[i]); INPtermInsert(ckt, &token, tab, &node[i]);
} }
int model_numnodes_ = model_numnodes(thismodel->INPmodType); int model_numnodes = model_max_numnodes(thismodel->INPmodType);
if (i > model_numnodes_) { if (i > model_numnodes) {
LITERR("Too many nodes for this model type"); LITERR("Too many nodes for this model type");
return; return;
} }
/* tie missing ports to ground, (substrate and thermal node) */ /* tie missing ports to ground, (substrate and thermal node) */
while (i < model_numnodes_) while (i < model_numnodes)
node[i++] = gnode; node[i++] = gnode;
numnodes = i; numnodes = i;