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

inp2m.c, #9/9c, cleanup

This commit is contained in:
rlar 2017-03-07 21:49:52 +01:00
parent eecd940af8
commit 40ca7d6db3
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/spicelib/parser/inp2m.c
View File

@ -67,7 +67,6 @@ INP2M(CKTcircuit *ckt, INPtables *tab, card *current)
printf("INP2M: Parsing '%s'\n", current->line); printf("INP2M: Parsing '%s'\n", current->line);
#endif #endif
numnodes = 4; /* initially specify a 4 terminal device */
line = current->line; line = current->line;
INPgetTok(&line, &name, 1); INPgetTok(&line, &name, 1);
@ -86,29 +85,31 @@ INP2M(CKTcircuit *ckt, INPtables *tab, card *current)
node[5] = NULL; node[5] = NULL;
node[6] = NULL; node[6] = NULL;
for (numnodes = 4; numnodes < 8; numnodes++) { for (i = 4; i < 8; i++) {
INPgetNetTok(&line, &nname[numnodes], 1); INPgetNetTok(&line, &nname[i], 1);
if (numnodes == 4) if (i == 4)
save = line; /* saj - save the posn for later if save = line; /* saj - save the posn for later if
the default mosfet model is used */ the default mosfet model is used */
err_msg = INPgetMod(ckt, nname[numnodes], &thismodel, tab); err_msg = INPgetMod(ckt, nname[i], &thismodel, tab);
tfree(err_msg); tfree(err_msg);
/* check if using model binning -- pass in line since need 'l' and 'w' */ /* check if using model binning -- pass in line since need 'l' and 'w' */
if (!thismodel && numnodes < 5) if (!thismodel && i < 5)
INPgetModBin(ckt, nname[numnodes], &thismodel, tab, line); INPgetModBin(ckt, nname[i], &thismodel, tab, line);
if (thismodel) if (thismodel)
break; break;
} }
/* nothing found, reset and process as if it were a 4 node device */ /* nothing found, reset and process as if it were a 4 node device */
if (numnodes >= 8) { if (i >= 8) {
numnodes = 4; numnodes = 4;
line = save; line = save;
} else {
numnodes = i;
} }
if (numnodes > model_numnodes(thismodel->INPmodType)) { if (numnodes > model_numnodes(thismodel->INPmodType)) {