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, #23/23, whitespace

This commit is contained in:
rlar 2017-03-11 19:28:02 +01:00
parent 9ad1a3033b
commit 3ce3424a9c
1 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,8 +58,9 @@ 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 = 4; /* 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);
@ -105,45 +106,49 @@ void INP2Q(CKTcircuit *ckt, INPtables * tab, card * current, CKTnode *gnode)
printf("INP2Q: Looking up model\n"); printf("INP2Q: Looking up model\n");
#endif #endif
if (thismodel->INPmodType != INPtypelook("BJT") && if (thismodel->INPmodType != INPtypelook("BJT") &&
#ifdef CIDER #ifdef CIDER
thismodel->INPmodType != INPtypelook("NBJT") && thismodel->INPmodType != INPtypelook("NBJT") &&
thismodel->INPmodType != INPtypelook("NBJT2") && thismodel->INPmodType != INPtypelook("NBJT2") &&
#endif #endif
#ifdef ADMS #ifdef ADMS
thismodel->INPmodType != INPtypelook("hicum0") && thismodel->INPmodType != INPtypelook("hicum0") &&
thismodel->INPmodType != INPtypelook("hicum2") && thismodel->INPmodType != INPtypelook("hicum2") &&
thismodel->INPmodType != INPtypelook("bjt504t") && thismodel->INPmodType != INPtypelook("bjt504t") &&
#endif #endif
thismodel->INPmodType != INPtypelook("VBIC")) thismodel->INPmodType != INPtypelook("VBIC"))
{ {
LITERR("incorrect model type"); LITERR("incorrect model type");
return; return;
} }
if (nodeflag > model_numnodes(thismodel->INPmodType))
{ if (nodeflag > model_numnodes(thismodel->INPmodType))
LITERR("Too much nodes for this model type"); {
return; LITERR("Too much nodes for this model type");
} return;
type = thismodel->INPmodType; }
mdfast = thismodel->INPmodfast;
type = thismodel->INPmodType;
mdfast = thismodel->INPmodfast;
#ifdef TRACE #ifdef TRACE
printf("INP2Q: Type: %d nodeflag: %d instancename: %s\n", type, nodeflag, name); printf("INP2Q: Type: %d nodeflag: %d instancename: %s\n", type, nodeflag, name);
#endif #endif
IFC(newInstance, (ckt, mdfast, &fast, name)); IFC(newInstance, (ckt, mdfast, &fast, name));
for (i = 0; i < nodeflag; i++) for (i = 0; i < nodeflag; i++)
IFC(bindNode, (ckt, fast, i + 1, node[i])); IFC(bindNode, (ckt, fast, i + 1, node[i]));
PARSECALL((&line, ckt, type, fast, &leadval, &waslead, tab)); PARSECALL((&line, ckt, type, fast, &leadval, &waslead, tab));
if (waslead) { if (waslead) {
#ifdef CIDER #ifdef CIDER
if( type == INPtypelook("NBJT2") ) { if (type == INPtypelook("NBJT2")) {
LITERR(" error: no unlabeled parameter permitted on NBJT2\n"); LITERR(" error: no unlabeled parameter permitted on NBJT2\n");
return; return;
} }
#endif #endif
ptemp.rValue = leadval; ptemp.rValue = leadval;
GCA(INPpName, ("area", &ptemp, ckt, type, fast)); GCA(INPpName, ("area", &ptemp, ckt, type, fast));
} }
} }