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

correct choice for both r model types

This commit is contained in:
dwarning 2021-01-05 09:16:29 +01:00 committed by Holger Vogt
parent 08700f8147
commit aedf9d0eb5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/spicelib/parser/inp2r.c
View File

@ -51,11 +51,7 @@ void INP2R(CKTcircuit *ckt, INPtables * tab, struct card *current)
#endif
if (mytype < 0) {
if ((mytype = INPtypelook("Resistor")) < 0
#ifdef ADMS
|| (mytype = INPtypelook("r2_cmc")) < 0
#endif
){
if ((mytype = INPtypelook("Resistor")) < 0) {
LITERR("Device type Resistor not supported by this binary\n");
return;
}
@ -153,7 +149,11 @@ void INP2R(CKTcircuit *ckt, INPtables * tab, struct card *current)
INPinsert(&model, tab);
current->error = INPgetMod(ckt, model, &thismodel, tab);
if (thismodel != NULL) {
if (mytype != thismodel->INPmodType) {
if ((INPtypelook("Resistor") != thismodel->INPmodType)
#ifdef ADMS
&& (INPtypelook("r2_cmc") != thismodel->INPmodType)
#endif
) {
LITERR("incorrect model type for resistor");
return;
}