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

element instantiation e.g. r=50

This commit is contained in:
dwarning 2009-07-30 18:31:15 +00:00
parent 897d11bf48
commit 865eaed5ab
3 changed files with 288 additions and 259 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
src/spicelib/parser/inp2c.c
View File

@ -16,31 +16,35 @@ void INP2C(void *ckt, INPtables * tab, card * current)
/* parse a capacitor card */ /* parse a capacitor card */
/* Cname <node> <node> [<val>] [<mname>] [IC=<val>] */ /* Cname <node> <node> [<val>] [<mname>] [IC=<val>] */
int mytype; /* the type we determine capacitors are */ int mytype; /* the type we determine capacitors are */
int type = 0; /* the type the model says it is */ int type = 0; /* the type the model says it is */
char *line; /* the part of the current line left to parse */ char *line; /* the part of the current line left to parse */
char *saveline; /* ... just in case we need to go back... */ char *saveline; /* ... just in case we need to go back... */
char *name; /* the resistor's name */ char *name; /* the resistor's name */
char *model; /* the name of the capacitor's model */ char *model; /* the name of the capacitor's model */
char *nname1; /* the first node's name */ char *nname1; /* the first node's name */
char *nname2; /* the second node's name */ char *nname2; /* the second node's name */
void *node1; /* the first node's node pointer */ void *node1; /* the first node's node pointer */
void *node2; /* the second node's node pointer */ void *node2; /* the second node's node pointer */
double val; /* temp to held resistance */ double val; /* temp to held resistance */
int error; /* error code temporary */ int error; /* error code temporary */
int error1; /* secondary error code temporary */ int error1; /* secondary error code temporary */
INPmodel *thismodel; /* pointer to model structure describing our model */ INPmodel *thismodel; /* pointer to model structure describing our model */
void *mdfast = NULL; /* pointer to the actual model */ void *mdfast = NULL; /* pointer to the actual model */
void *fast; /* pointer to the actual instance */ void *fast; /* pointer to the actual instance */
IFvalue ptemp; /* a value structure to package resistance into */ IFvalue ptemp; /* a value structure to package resistance into */
int waslead; /* flag to indicate that funny unlabeled number was found */ int waslead; /* flag to indicate that funny unlabeled number was found */
double leadval; /* actual value of unlabeled number */ double leadval; /* actual value of unlabeled number */
IFuid uid; /* uid for default cap model */ IFuid uid; /* uid for default cap model */
#ifdef TRACE
printf("In INP2C, Current line: %s\n", current->line);
#endif
mytype = INPtypelook("Capacitor"); mytype = INPtypelook("Capacitor");
if (mytype < 0) { if (mytype < 0) {
LITERR("Device type Capacitor not supported by this binary\n"); LITERR("Device type Capacitor not supported by this binary\n");
return; return;
} }
line = current->line; line = current->line;
INPgetTok(&line, &name, 1); INPgetTok(&line, &name, 1);
@ -55,58 +59,65 @@ void INP2C(void *ckt, INPtables * tab, card * current)
INPgetTok(&line, &model, 1); INPgetTok(&line, &model, 1);
if (*model) { if (*model && (strcmp(model, "c") != 0)) {
/* token isn't null */ /* token isn't null */
if (INPlookMod(model)) { if (INPlookMod(model)) {
/* If this is a valid model connect it */ /* If this is a valid model connect it */
INPinsert(&model, tab); INPinsert(&model, tab);
thismodel = (INPmodel *) NULL; thismodel = (INPmodel *) NULL;
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 (mytype != thismodel->INPmodType) {
LITERR("incorrect model type"); LITERR("incorrect model type");
return; return;
} }
mdfast = thismodel->INPmodfast; mdfast = thismodel->INPmodfast;
type = thismodel->INPmodType; type = thismodel->INPmodType;
} }
} else { } else {
tfree(model); tfree(model);
/* It is not a model */ /* It is not a model */
line = saveline; /* go back */ line = saveline; /* go back */
type = mytype; type = mytype;
if (!tab->defCmod) { /* create default C model */ if (!tab->defCmod) { /* create default C model */
IFnewUid(ckt, &uid, (IFuid) NULL, "C", UID_MODEL, IFnewUid(ckt, &uid, (IFuid) NULL, "C", UID_MODEL,
(void **) NULL); (void **) NULL);
IFC(newModel, (ckt, type, &(tab->defCmod), uid)); IFC(newModel, (ckt, type, &(tab->defCmod), uid));
} }
mdfast = tab->defCmod; mdfast = tab->defCmod;
} }
IFC(newInstance, (ckt, mdfast, &fast, name)); IFC(newInstance, (ckt, mdfast, &fast, name));
} else { } else {
tfree(model); tfree(model);
/* The token is null and a default model will be created */ /* The token is null and a default model will be created */
type = mytype; type = mytype;
if (!tab->defCmod) { if (!tab->defCmod) {
/* create default C model */ /* create default C model */
IFnewUid(ckt, &uid, (IFuid) NULL, "C", UID_MODEL, IFnewUid(ckt, &uid, (IFuid) NULL, "C", UID_MODEL,
(void **) NULL); (void **) NULL);
IFC(newModel, (ckt, type, &(tab->defCmod), uid)); IFC(newModel, (ckt, type, &(tab->defCmod), uid));
} }
IFC(newInstance, (ckt, tab->defCmod, &fast, name)); IFC(newInstance, (ckt, tab->defCmod, &fast, name));
if (error1 == 1) { /* was a c=val construction */
val = INPevaluate(&line, &error1, 1); /* [<val>] */
#ifdef TRACE
printf ("In INP2C, C=val construction: val=%g\n", val);
#endif
}
} }
if (error1 == 0) { /* Looks like a number */ if (error1 == 0) { /* Looks like a number */
ptemp.rValue = val; ptemp.rValue = val;
GCA(INPpName, ("capacitance", &ptemp, ckt, type, fast)); GCA(INPpName, ("capacitance", &ptemp, ckt, type, fast));
} }
IFC(bindNode, (ckt, fast, 1, node1)); IFC(bindNode, (ckt, fast, 1, node1));
IFC(bindNode, (ckt, fast, 2, node2)); IFC(bindNode, (ckt, fast, 2, node2));
PARSECALL((&line, ckt, type, fast, &leadval, &waslead, tab)); PARSECALL((&line, ckt, type, fast, &leadval, &waslead, tab));
if (waslead) { if (waslead) {
ptemp.rValue = leadval; ptemp.rValue = leadval;
GCA(INPpName, ("capacitance", &ptemp, ckt, type, fast)); GCA(INPpName, ("capacitance", &ptemp, ckt, type, fast));
} }
return; return;
} }

141
src/spicelib/parser/inp2l.c
View File

@ -16,31 +16,35 @@ void INP2L(void *ckt, INPtables * tab, card * current)
/* parse an inductor card */ /* parse an inductor card */
/* Lname <node> <node> [<val>] [<mname>] [IC=<val>] */ /* Lname <node> <node> [<val>] [<mname>] [IC=<val>] */
int mytype; /* the type we determine inductors are */ int mytype; /* the type we determine inductors are */
int type = 0; /* the type the model says it is */ int type = 0; /* the type the model says it is */
char *line; /* the part of the current line left to parse */ char *line; /* the part of the current line left to parse */
char *saveline; /* ... just in case we need to go back... */ char *saveline; /* ... just in case we need to go back... */
char *name; /* the resistor's name */ char *name; /* the resistor's name */
char *model; /* the name of the inductor's model */ char *model; /* the name of the inductor's model */
char *nname1; /* the first node's name */ char *nname1; /* the first node's name */
char *nname2; /* the second node's name */ char *nname2; /* the second node's name */
void *node1; /* the first node's node pointer */ void *node1; /* the first node's node pointer */
void *node2; /* the second node's node pointer */ void *node2; /* the second node's node pointer */
double val; /* temp to held inductance */ double val; /* temp to held inductance */
int error; /* error code temporary */ int error; /* error code temporary */
int error1; /* secondary error code temporary */ int error1; /* secondary error code temporary */
INPmodel *thismodel; /* pointer to model structure describing our model */ INPmodel *thismodel; /* pointer to model structure describing our model */
void *mdfast = NULL; /* pointer to the actual model */ void *mdfast = NULL; /* pointer to the actual model */
void *fast; /* pointer to the actual instance */ void *fast; /* pointer to the actual instance */
IFvalue ptemp; /* a value structure to package inductance into */ IFvalue ptemp; /* a value structure to package inductance into */
int waslead; /* flag to indicate that funny unlabeled number was found */ int waslead; /* flag to indicate that funny unlabeled number was found */
double leadval; /* actual value of unlabeled number */ double leadval; /* actual value of unlabeled number */
IFuid uid; /* uid for default cap model */ IFuid uid; /* uid for default cap model */
#ifdef TRACE
printf("In INP2L, Current line: %s\n", current->line);
#endif
mytype = INPtypelook("Inductor"); mytype = INPtypelook("Inductor");
if (mytype < 0) { if (mytype < 0) {
LITERR("Device type Inductor not supported by this binary\n"); LITERR("Device type Inductor not supported by this binary\n");
return; return;
} }
line = current->line; line = current->line;
INPgetTok(&line, &name, 1); INPgetTok(&line, &name, 1);
@ -55,58 +59,65 @@ void INP2L(void *ckt, INPtables * tab, card * current)
INPgetTok(&line, &model, 1); INPgetTok(&line, &model, 1);
if (*model) { if (*model && (strcmp(model, "l") != 0)) {
/* token isn't null */ /* token isn't null */
if (INPlookMod(model)) { if (INPlookMod(model)) {
/* If this is a valid model connect it */ /* If this is a valid model connect it */
INPinsert(&model, tab); INPinsert(&model, tab);
thismodel = (INPmodel *) NULL; thismodel = (INPmodel *) NULL;
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 (mytype != thismodel->INPmodType) {
LITERR("incorrect model type"); LITERR("incorrect model type");
return; return;
} }
mdfast = thismodel->INPmodfast; mdfast = thismodel->INPmodfast;
type = thismodel->INPmodType; type = thismodel->INPmodType;
} }
} else { } else {
tfree(model); tfree(model);
/* It is not a model */ /* It is not a model */
line = saveline; /* go back */ line = saveline; /* go back */
type = mytype; type = mytype;
if (!tab->defLmod) { /* create default L model */ if (!tab->defLmod) { /* create default L model */
IFnewUid(ckt, &uid, (IFuid) NULL, "L", UID_MODEL, IFnewUid(ckt, &uid, (IFuid) NULL, "L", UID_MODEL,
(void **) NULL); (void **) NULL);
IFC(newModel, (ckt, type, &(tab->defLmod), uid)); IFC(newModel, (ckt, type, &(tab->defLmod), uid));
} }
mdfast = tab->defLmod; mdfast = tab->defLmod;
} }
IFC(newInstance, (ckt, mdfast, &fast, name)); IFC(newInstance, (ckt, mdfast, &fast, name));
} else { } else {
tfree(model); tfree(model);
/* The token is null and a default model will be created */ /* The token is null or we have l=val - a default model will be created */
type = mytype; type = mytype;
if (!tab->defLmod) { if (!tab->defLmod) {
/* create default L model */ /* create default L model */
IFnewUid(ckt, &uid, (IFuid) NULL, "L", UID_MODEL, IFnewUid(ckt, &uid, (IFuid) NULL, "L", UID_MODEL,
(void **) NULL); (void **) NULL);
IFC(newModel, (ckt, type, &(tab->defLmod), uid)); IFC(newModel, (ckt, type, &(tab->defLmod), uid));
} }
IFC(newInstance, (ckt, tab->defLmod, &fast, name)); IFC(newInstance, (ckt, tab->defLmod, &fast, name));
if (error1 == 1) { /* was a l=val construction */
val = INPevaluate(&line, &error1, 1); /* [<val>] */
#ifdef TRACE
printf ("In INP2L, L=val construction: val=%g\n", val);
#endif
}
} }
if (error1 == 0) { /* Looks like a number */ if (error1 == 0) { /* Looks like a number */
ptemp.rValue = val; ptemp.rValue = val;
GCA(INPpName, ("inductance", &ptemp, ckt, type, fast)); GCA(INPpName, ("inductance", &ptemp, ckt, type, fast));
} }
IFC(bindNode, (ckt, fast, 1, node1)); IFC(bindNode, (ckt, fast, 1, node1));
IFC(bindNode, (ckt, fast, 2, node2)); IFC(bindNode, (ckt, fast, 2, node2));
PARSECALL((&line, ckt, type, fast, &leadval, &waslead, tab)); PARSECALL((&line, ckt, type, fast, &leadval, &waslead, tab));
if (waslead) { if (waslead) {
ptemp.rValue = leadval; ptemp.rValue = leadval;
GCA(INPpName, ("inductance", &ptemp, ckt, type, fast)); GCA(INPpName, ("inductance", &ptemp, ckt, type, fast));
} }
return; return;
} }

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

@ -4,11 +4,10 @@ Author: 1988 Thomas L. Quarles
Modified: Paolo Nenzi 2000 Modified: Paolo Nenzi 2000
Remarks: This code is based on a version written by Serban Popescu which Remarks: This code is based on a version written by Serban Popescu which
accepted an optional parameter ac. I have adapted his code accepted an optional parameter ac. I have adapted his code
to conform to INP standard. (PN) to conform to INP standard. (PN)
**********/ **********/
#include "ngspice.h" #include "ngspice.h"
#include <stdio.h>
#include "ifsim.h" #include "ifsim.h"
#include "inpdefs.h" #include "inpdefs.h"
#include "inpmacs.h" #include "inpmacs.h"
@ -16,7 +15,7 @@ Remarks: This code is based on a version written by Serban Popescu which
#include "inp.h" #include "inp.h"
/* undefine to add tracing to this file */ /* undefine to add tracing to this file */
/*#define TRACE*/ /* #define TRACE */
void INP2R(void *ckt, INPtables * tab, card * current) void INP2R(void *ckt, INPtables * tab, card * current)
{ {
@ -46,16 +45,15 @@ void INP2R(void *ckt, INPtables * tab, card * current)
char *s,*t;/* Temporary buffer and pointer for translation */ char *s,*t;/* Temporary buffer and pointer for translation */
int i; int i;
#ifdef TRACE #ifdef TRACE
printf("In INP2R()\n"); printf("In INP2R, Current line: %s\n", current->line);
printf(" Current line: %s\n",current->line);
#endif #endif
mytype = INPtypelook("Resistor"); mytype = INPtypelook("Resistor");
if (mytype < 0) { if (mytype < 0) {
LITERR("Device type Resistor not supported by this binary\n"); LITERR("Device type Resistor not supported by this binary\n");
return; return;
} }
line = current->line; line = current->line;
INPgetTok(&line, &name, 1); /* Rname */ INPgetTok(&line, &name, 1); /* Rname */
@ -69,150 +67,159 @@ void INP2R(void *ckt, INPtables * tab, card * current)
* follows a number, so must be a model name * follows a number, so must be a model name
* -> MUST be a model name (or null) * -> MUST be a model name (or null)
*/ */
saveline = line; /* save then old pointer */ saveline = line; /* save then old pointer */
if (strstr( line, "tc=" )) { /* looking for tc= there are no spaces between */
#ifdef TRACE #ifdef TRACE
printf("Begining tc=xxx yyyy search and translation in '%s'\n", line); printf("Begining tc=xxx yyyy search and translation in '%s'\n", line);
#endif /* TRACE */ #endif /* TRACE */
/* This routine translates "tc=xxx yyy" to "tc=xxx tc2=yyy". /* This routine translates "tc=xxx yyy" to "tc=xxx tc2=yyy".
This is a re-write of the routine originally proposed by Hitoshi tanaka. This is a re-write of the routine originally proposed by Hitoshi Tanaka.
In my version we simply look for the first occurence of 'tc' followed In my version we simply look for the first occurence of 'tc' followed
by '=' followed by two numbers. If we find it then we splice in "tc2=". by '=' followed by two numbers. If we find it then we splice in "tc2=".
sjb - 2005-05-09 */ sjb - 2005-05-09 */
for(s=line; *s; s++) { /* scan the remainder of the line */ for(s=line; *s; s++) { /* scan the remainder of the line */
/* reject anything other than "tc" */ /* reject anything other than "tc" */
if(*s!='t') continue; if(*s!='t') continue;
s++; s++;
if(*s!='c') continue; if(*s!='c') continue;
s++; s++;
/* skip any white space */ /* skip any white space */
while(isspace(*s)) s++; while(isspace(*s)) s++;
/* reject if not '=' */ /* reject if not '=' */
if(*s!='=') continue; if(*s!='=') continue;
s++; s++;
/* skip any white space */ /* skip any white space */
while(isspace(*s)) s++; while(isspace(*s)) s++;
/* if we now have +, - or a decimal digit then assume we have a number, /* if we now have +, - or a decimal digit then assume we have a number,
otherwise reject */ otherwise reject */
if((*s!='+') && (*s!='-') && !isdigit(*s)) continue; if((*s!='+') && (*s!='-') && !isdigit(*s)) continue;
s++; s++;
/* look for next white space or null */ /* look for next white space or null */
while(!isspace(*s) && *s) s++; while(!isspace(*s) && *s) s++;
/* reject whole line if null (i.e not white space) */ /* reject whole line if null (i.e not white space) */
if(*s==0) break; if(*s==0) break;
s++; s++;
/* remember this location in the line. /* remember this location in the line.
Note that just before this location is a white space character. */ Note that just before this location is a white space character. */
t = s; t = s;
/* skip any additional white space */ /* skip any additional white space */
while(isspace(*s)) s++; while(isspace(*s)) s++;
/* if we now have +, - or a decimal digit then assume we have the /* if we now have +, - or a decimal digit then assume we have the
second number, otherwise reject */ second number, otherwise reject */
if((*s!='+') && (*s!='-') && !isdigit(*s)) continue; if((*s!='+') && (*s!='-') && !isdigit(*s)) continue;
/* if we get this far we have met all are criterea, /* if we get this far we have met all are criterea,
so now we splice in a "tc2=" at the location remembered above. */ so now we splice in a "tc2=" at the location remembered above. */
/* first alocate memory for the new longer line */ /* first alocate memory for the new longer line */
i = strlen(current->line); /* length of existing line */ i = strlen(current->line); /* length of existing line */
line = tmalloc(i + 4 + 1); /* alocate enough for "tc2=" & terminating NULL */ line = tmalloc(i + 4 + 1); /* alocate enough for "tc2=" & terminating NULL */
if(line == NULL) { if(line == NULL) {
/* failed to allocate memory so we recover rather crudely /* failed to allocate memory so we recover rather crudely
by rejecting the translation */ by rejecting the translation */
line = saveline; line = saveline;
break; break;
} }
/* copy first part of line */ /* copy first part of line */
i -= strlen(t); i -= strlen(t);
strncpy(line,current->line,i); strncpy(line,current->line,i);
line[i]=0; /* terminate */ line[i]=0; /* terminate */
/* add "tc2=" */ /* add "tc2=" */
strcat(line, "tc2="); strcat(line, "tc2=");
/* add rest of line */ /* add rest of line */
strcat(line, t); strcat(line, t);
/* calculate our saveline position in the new line */ /* calculate our saveline position in the new line */
saveline = line + (saveline - current->line); saveline = line + (saveline - current->line);
/* replace old line with new */ /* replace old line with new */
tfree(current->line); tfree(current->line);
current->line = line; current->line = line;
line = saveline; line = saveline;
} }
#ifdef TRACE #ifdef TRACE
printf("(Translated) Res line: %s\n",current->line); printf("(Translated) Resistor line: %s\n", current->line);
#endif #endif
}
INPgetTok(&line, &model, 1); INPgetTok(&line, &model, 1);
if (*model) { if (*model && (strcmp(model, "r") != 0)) {
/* token isn't null */ /* token isn't null */
if (INPlookMod(model)) { if (INPlookMod(model)) {
/* If this is a valid model connect it */ /* If this is a valid model connect it */
INPinsert(&model, tab); #ifdef TRACE
thismodel = (INPmodel *) NULL; printf("In INP2R, Valid R Model: %s\n", model);
current->error = INPgetMod(ckt, model, &thismodel, tab); #endif
if (thismodel != NULL) { INPinsert(&model, tab);
if (mytype != thismodel->INPmodType) { thismodel = (INPmodel *) NULL;
LITERR("incorrect model type for resistor"); current->error = INPgetMod(ckt, model, &thismodel, tab);
return; if (thismodel != NULL) {
} if (mytype != thismodel->INPmodType) {
mdfast = thismodel->INPmodfast; LITERR("incorrect model type for resistor");
type = thismodel->INPmodType; return;
} }
} else { mdfast = thismodel->INPmodfast;
tfree(model); type = thismodel->INPmodType;
/* It is not a model */ }
line = saveline; /* go back */ } else {
type = mytype; tfree(model);
if (!tab->defRmod) { /* create default R model */ /* It is not a model */
IFnewUid(ckt, &uid, (IFuid) NULL, "R", UID_MODEL, line = saveline; /* go back */
(void **) NULL); type = mytype;
IFC(newModel, (ckt, type, &(tab->defRmod), uid)); if (!tab->defRmod) { /* create default R model */
} IFnewUid(ckt, &uid, (IFuid) NULL, "R", UID_MODEL,
mdfast = tab->defRmod; (void **) NULL);
} IFC(newModel, (ckt, type, &(tab->defRmod), uid));
IFC(newInstance, (ckt, mdfast, &fast, name)); }
mdfast = tab->defRmod;
}
IFC(newInstance, (ckt, mdfast, &fast, name));
} else { } else {
tfree(model); tfree(model);
/* The token is null and a default model will be created */ /* The token is null or we have r=val - a default model will be created */
type = mytype; type = mytype;
if (!tab->defRmod) { if (!tab->defRmod) {
/* create default R model */ /* create default R model */
IFnewUid(ckt, &uid, (IFuid) NULL, "R", UID_MODEL, IFnewUid(ckt, &uid, (IFuid) NULL, "R", UID_MODEL,
(void **) NULL); (void **) NULL);
IFC(newModel, (ckt, type, &(tab->defRmod), uid)); IFC(newModel, (ckt, type, &(tab->defRmod), uid));
} }
IFC(newInstance, (ckt, tab->defRmod, &fast, name)); IFC(newInstance, (ckt, tab->defRmod, &fast, name));
if (error1 == 1) { /* was a r=val construction */
val = INPevaluate(&line, &error1, 1); /* [<val>] */
#ifdef TRACE
printf ("In INP2R, R=val construction: val=%g\n", val);
#endif
}
} }
if (error1 == 0) { /* got a resistance above */ if (error1 == 0) { /* got a resistance above */
ptemp.rValue = val; ptemp.rValue = val;
GCA(INPpName, ("resistance", &ptemp, ckt, type, fast)) GCA(INPpName, ("resistance", &ptemp, ckt, type, fast))
} }
IFC(bindNode, (ckt, fast, 1, node1)); IFC(bindNode, (ckt, fast, 1, node1));
IFC(bindNode, (ckt, fast, 2, node2)); IFC(bindNode, (ckt, fast, 2, node2));
PARSECALL((&line, ckt, type, fast, &leadval, &waslead, tab)); PARSECALL((&line, ckt, type, fast, &leadval, &waslead, tab));
if (waslead) { if (waslead) {
ptemp.rValue = leadval; ptemp.rValue = leadval;
GCA(INPpName, ("resistance", &ptemp, ckt, type, fast)); GCA(INPpName, ("resistance", &ptemp, ckt, type, fast));
} }
return; return;