luke/ngspice
1
0
Fork 0
mirror of https://git.code.sf.net/p/ngspice/ngspice synced 2026-08-22 05:47:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

correct choice for both r model types

Browse Source
This commit is contained in:
dwarning
2021-01-05 09:16:29 +01:00
parent 2ba0e9d0e0
commit 21719dceb2
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/spicelib/parser/inp2r.c
+6 -6
View File
@@ -51,11 +51,7 @@ void INP2R(CKTcircuit *ckt, INPtables * tab, struct card *current)
#endif #endif
if (mytype < 0) { if (mytype < 0) {
if ((mytype = INPtypelook("Resistor")) < 0 if ((mytype = INPtypelook("Resistor")) < 0) {
#ifdef ADMS
|| (mytype = INPtypelook("r2_cmc")) < 0
#endif
){
LITERR("Device type Resistor not supported by this binary\n"); LITERR("Device type Resistor not supported by this binary\n");
return; return;
} }
@@ -153,7 +149,11 @@ void INP2R(CKTcircuit *ckt, INPtables * tab, struct card *current)
INPinsert(&model, tab); INPinsert(&model, tab);
current->error = INPgetMod(ckt, model, &thismodel, tab); current->error = INPgetMod(ckt, model, &thismodel, tab);
if (thismodel != NULL) { 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"); LITERR("incorrect model type for resistor");
return; return;
} }