change atof to INPevaluate to allow 10p
This commit is contained in:
dwarning
parent
59f1c840a5
commit
13f737c32d
|
|
@ -5,7 +5,6 @@ Author: 1992 Charles Hough
|
|||
**********/
|
||||
|
||||
#include "ngspice.h"
|
||||
#include <stdio.h>
|
||||
#include "ifsim.h"
|
||||
#include "inpdefs.h"
|
||||
#include "inpmacs.h"
|
||||
|
|
@ -32,7 +31,7 @@ void **node1; /* the first node's node pointer */
|
|||
void **node2; /* the second node's node pointer */
|
||||
void *groundnode;
|
||||
int error; /* error code temporary */
|
||||
int error1; /* secondary error code temporary */
|
||||
int error1=0; /* secondary error code temporary */
|
||||
INPmodel *thismodel; /* pointer to model structure describing our model */
|
||||
void *mdfast; /* pointer to the actual model */
|
||||
void *fast; /* pointer to the actual instance */
|
||||
|
|
@ -50,82 +49,82 @@ int num, i;
|
|||
line = current->line;
|
||||
INPgetTok(&line,&name,1);
|
||||
INPinsert(&name,tab);
|
||||
/* num = (int) INPevaluate(&line,&error1,1); */
|
||||
num = 0;
|
||||
/* num = (int) INPevaluate(&line,&error1,1); */
|
||||
num = 0;
|
||||
|
||||
/* first pass to determine the dimension */
|
||||
while (*line != '\0') {
|
||||
INPgetTok(&line, &tempname,1);
|
||||
if (strcmp(tempname, "len") == 0) break;
|
||||
num ++;
|
||||
}
|
||||
num = (num - 2) / 2;
|
||||
line = current->line;
|
||||
INPgetTok(&line,&name,1);
|
||||
/* first pass to determine the dimension */
|
||||
while (*line != '\0') {
|
||||
INPgetTok(&line, &tempname,1);
|
||||
if (strcmp(tempname, "len") == 0) break;
|
||||
num ++;
|
||||
}
|
||||
num = (num - 2) / 2;
|
||||
line = current->line;
|
||||
INPgetTok(&line,&name,1);
|
||||
|
||||
nname1 = (char **) tmalloc(num * sizeof(char *));
|
||||
nname2 = (char **) tmalloc(num * sizeof(char *));
|
||||
node1 = (void **) tmalloc(num * sizeof(void *));
|
||||
node2 = (void **) tmalloc(num * sizeof(void *));
|
||||
nname1 = (char **) tmalloc(num * sizeof(char *));
|
||||
nname2 = (char **) tmalloc(num * sizeof(char *));
|
||||
node1 = (void **) tmalloc(num * sizeof(void *));
|
||||
node2 = (void **) tmalloc(num * sizeof(void *));
|
||||
|
||||
|
||||
for (i = 0; i < num; i++) {
|
||||
INPgetNetTok(&line,&(nname1[i]),1);
|
||||
INPtermInsert(ckt,&(nname1[i]),tab,&(node1[i]));
|
||||
}
|
||||
for (i = 0; i < num; i++) {
|
||||
INPgetNetTok(&line,&(nname1[i]),1);
|
||||
INPtermInsert(ckt,&(nname1[i]),tab,&(node1[i]));
|
||||
}
|
||||
INPgetTok(&line,&ground,1);
|
||||
INPtermInsert(ckt,&ground,tab,&groundnode);
|
||||
for (i = 0; i < num; i++) {
|
||||
INPgetNetTok(&line,&(nname2[i]),1);
|
||||
INPtermInsert(ckt,&(nname2[i]),tab,&(node2[i]));
|
||||
}
|
||||
for (i = 0; i < num; i++) {
|
||||
INPgetNetTok(&line,&(nname2[i]),1);
|
||||
INPtermInsert(ckt,&(nname2[i]),tab,&(node2[i]));
|
||||
}
|
||||
INPgetTok(&line,&ground,1);
|
||||
INPtermInsert(ckt,&ground,tab,&groundnode);
|
||||
|
||||
INPgetTok(&line,&model,1);
|
||||
if (strcmp(model, "len") == 0) {
|
||||
lenval = INPevaluate(&line,&error1,1);
|
||||
lenvalgiven = 1;
|
||||
INPgetTok(&line,&model,1);
|
||||
}
|
||||
if(*model) { /* token isn't null */
|
||||
INPinsert(&model,tab);
|
||||
thismodel = (INPmodel *)NULL;
|
||||
current->error = INPgetMod(ckt,model,&thismodel,tab);
|
||||
if(thismodel != NULL) {
|
||||
if(mytype != thismodel->INPmodType) {
|
||||
LITERR("incorrect model type")
|
||||
return;
|
||||
}
|
||||
mdfast = thismodel->INPmodfast;
|
||||
type = thismodel->INPmodType;
|
||||
} else {
|
||||
type = mytype;
|
||||
if(!tab->defPmod) {
|
||||
/* create default P model */
|
||||
IFnewUid(ckt,&uid,(IFuid)NULL,"P",UID_MODEL,(void**)NULL);
|
||||
IFC(newModel, (ckt,type,&(tab->defPmod),uid))
|
||||
}
|
||||
mdfast = tab->defPmod;
|
||||
}
|
||||
IFC(newInstance,(ckt,mdfast,&fast,name))
|
||||
} else {
|
||||
LITERR("model name is not found")
|
||||
return;
|
||||
}
|
||||
INPgetTok(&line,&model,1);
|
||||
if (strcmp(model, "len") == 0) {
|
||||
lenval = INPevaluate(&line,&error1,1);
|
||||
lenvalgiven = 1;
|
||||
INPgetTok(&line,&model,1);
|
||||
}
|
||||
if(*model) { /* token isn't null */
|
||||
INPinsert(&model,tab);
|
||||
thismodel = (INPmodel *)NULL;
|
||||
current->error = INPgetMod(ckt,model,&thismodel,tab);
|
||||
if(thismodel != NULL) {
|
||||
if(mytype != thismodel->INPmodType) {
|
||||
LITERR("incorrect model type")
|
||||
return;
|
||||
}
|
||||
mdfast = thismodel->INPmodfast;
|
||||
type = thismodel->INPmodType;
|
||||
} else {
|
||||
type = mytype;
|
||||
if(!tab->defPmod) {
|
||||
/* create default P model */
|
||||
IFnewUid(ckt,&uid,(IFuid)NULL,"P",UID_MODEL,(void**)NULL);
|
||||
IFC(newModel, (ckt,type,&(tab->defPmod),uid))
|
||||
}
|
||||
mdfast = tab->defPmod;
|
||||
}
|
||||
IFC(newInstance,(ckt,mdfast,&fast,name))
|
||||
} else {
|
||||
LITERR("model name is not found")
|
||||
return;
|
||||
}
|
||||
|
||||
/* IFC(bindNode,(ckt,fast,1,fakename)) */
|
||||
|
||||
ptemp.iValue = num;
|
||||
GCA(INPpName,("dimension", &ptemp,ckt,type,fast))
|
||||
ptemp.v.vec.sVec = nname1;
|
||||
GCA(INPpName,("pos_nodes", &ptemp,ckt,type,fast))
|
||||
ptemp.v.vec.sVec = nname2;
|
||||
GCA(INPpName,("neg_nodes", &ptemp,ckt,type,fast))
|
||||
if (error1 == 0 && lenvalgiven) {
|
||||
ptemp.rValue = lenval;
|
||||
GCA(INPpName,("length",&ptemp,ckt,type,fast))
|
||||
}
|
||||
ptemp.iValue = num;
|
||||
GCA(INPpName,("dimension", &ptemp,ckt,type,fast))
|
||||
ptemp.v.vec.sVec = nname1;
|
||||
GCA(INPpName,("pos_nodes", &ptemp,ckt,type,fast))
|
||||
ptemp.v.vec.sVec = nname2;
|
||||
GCA(INPpName,("neg_nodes", &ptemp,ckt,type,fast))
|
||||
if (error1 == 0 && lenvalgiven) {
|
||||
ptemp.rValue = lenval;
|
||||
GCA(INPpName,("length",&ptemp,ckt,type,fast))
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ Author: 1992 Charles Hough
|
|||
**********/
|
||||
|
||||
#include "ngspice.h"
|
||||
#include <stdio.h>
|
||||
#include "ifsim.h"
|
||||
#include "inpdefs.h"
|
||||
#include "inpmacs.h"
|
||||
|
|
@ -20,7 +19,7 @@ INP2Y(
|
|||
|
||||
{
|
||||
/* parse a txl card */
|
||||
/* Yxxxx node1 node2 name */
|
||||
/* Yxxxx node1 gnode node2 gnode name */
|
||||
|
||||
int mytype; /* the type to determine txl */
|
||||
int mytype2; /* the type to determine cpl */
|
||||
|
|
@ -39,7 +38,7 @@ void *node1; /* the first node's node pointer */
|
|||
void *node2; /* the second node's node pointer */
|
||||
void *gnode1, *gnode2, *inode1, *inode2;
|
||||
int error; /* error code temporary */
|
||||
int error1; /* secondary error code temporary */
|
||||
int error1=0; /* secondary error code temporary */
|
||||
INPmodel *thismodel; /* pointer to model structure describing our model */
|
||||
void *mdfast; /* pointer to the actual model */
|
||||
void *fast; /* pointer to the actual instance */
|
||||
|
|
@ -69,168 +68,168 @@ int lenvalgiven = 0;
|
|||
INPtermInsert(ckt,&nname2,tab,&node2);
|
||||
INPgetNetTok(&line,&ground2,1);
|
||||
INPtermInsert(ckt,&ground2,tab,&gnode2);
|
||||
|
||||
|
||||
INPgetTok(&line,&model,1);
|
||||
if (strcmp(model, "len") == 0) {
|
||||
lenval = INPevaluate(&line,&error1,1);
|
||||
lenvalgiven = 1;
|
||||
INPgetTok(&line,&model,1);
|
||||
}
|
||||
if(*model) { /* token isn't null */
|
||||
INPinsert(&model,tab);
|
||||
thismodel = (INPmodel *)NULL;
|
||||
current->error = INPgetMod(ckt,model,&thismodel,tab);
|
||||
if(thismodel != NULL) {
|
||||
if (thismodel->INPmodType == mytype2) {
|
||||
INP2P(ckt,tab,current);
|
||||
return;
|
||||
}
|
||||
else if (mytype != thismodel->INPmodType) {
|
||||
LITERR("incorrect model type")
|
||||
return;
|
||||
}
|
||||
line = thismodel->INPmodLine->line;
|
||||
INPgetTok(&line,&buf,1); /* throw out .model */
|
||||
INPgetTok(&line,&buf,1); /* throw out model name */
|
||||
INPgetTok(&line,&buf,1); /* throw out txl */
|
||||
INPgetTok(&line,&buf,1);
|
||||
while (*line != '\0') {
|
||||
if (*buf == 'R' || *buf == 'r') {
|
||||
INPgetTok(&line,&buf,1);
|
||||
rval = atof(buf);
|
||||
}
|
||||
if ((strcmp(buf,"L") == 0) || (strcmp(buf,"l") == 0)) {
|
||||
INPgetTok(&line,&buf,1);
|
||||
lval = atof(buf);
|
||||
}
|
||||
if ((strcmp(buf,"C") == 0) || (strcmp(buf,"c") == 0)) {
|
||||
INPgetTok(&line,&buf,1);
|
||||
cval = atof(buf);
|
||||
}
|
||||
if (lenvalgiven == 0) {
|
||||
if (strcmp(buf,"length")== 0) {
|
||||
INPgetTok(&line,&buf,1);
|
||||
lenval = atof(buf);
|
||||
}
|
||||
}
|
||||
INPgetTok(&line,&buf,1);
|
||||
}
|
||||
if (lenval && rval && lval && rval/lval > 1.6e10) {
|
||||
/* use 3-pi model */
|
||||
rval = 3.0 / (rval * lenval);
|
||||
cval = cval * lenval / 6.0;
|
||||
if (strcmp(model, "len") == 0) {
|
||||
lenval = INPevaluate(&line,&error1,1);
|
||||
lenvalgiven = 1;
|
||||
INPgetTok(&line,&model,1);
|
||||
}
|
||||
if(*model) { /* token isn't null */
|
||||
INPinsert(&model,tab);
|
||||
thismodel = (INPmodel *)NULL;
|
||||
current->error = INPgetMod(ckt,model,&thismodel,tab);
|
||||
if(thismodel != NULL) {
|
||||
if (thismodel->INPmodType == mytype2) {
|
||||
INP2P(ckt,tab,current);
|
||||
return;
|
||||
}
|
||||
else if (mytype != thismodel->INPmodType) {
|
||||
LITERR("incorrect model type")
|
||||
return;
|
||||
}
|
||||
line = thismodel->INPmodLine->line;
|
||||
INPgetTok(&line,&buf,1); /* throw out .model */
|
||||
INPgetTok(&line,&buf,1); /* throw out model name */
|
||||
INPgetTok(&line,&buf,1); /* throw out txl */
|
||||
INPgetTok(&line,&buf,1);
|
||||
while (*line != '\0') {
|
||||
if (*buf == 'R' || *buf == 'r') {
|
||||
INPgetTok(&line,&buf,1);
|
||||
rval = INPevaluate(&buf, &error1, 1);
|
||||
}
|
||||
if ((strcmp(buf,"L") == 0) || (strcmp(buf,"l") == 0)) {
|
||||
INPgetTok(&line,&buf,1);
|
||||
lval = INPevaluate(&buf, &error1, 1);
|
||||
}
|
||||
if ((strcmp(buf,"C") == 0) || (strcmp(buf,"c") == 0)) {
|
||||
INPgetTok(&line,&buf,1);
|
||||
cval = INPevaluate(&buf, &error1, 1);
|
||||
}
|
||||
if (lenvalgiven == 0) {
|
||||
if (strcmp(buf,"length")== 0) {
|
||||
INPgetTok(&line,&buf,1);
|
||||
lenval = INPevaluate(&buf, &error1, 1);
|
||||
}
|
||||
}
|
||||
INPgetTok(&line,&buf,1);
|
||||
}
|
||||
if (lenval && rval && lval && rval/lval > 1.6e10) {
|
||||
/* use 3-pi model */
|
||||
rval = 3.0 / (rval * lenval);
|
||||
cval = cval * lenval / 6.0;
|
||||
|
||||
type = INPtypelook("Resistor");
|
||||
type = INPtypelook("Resistor");
|
||||
|
||||
/* resistor between node1 and internal1 */
|
||||
internal1 = (char *) tmalloc (10);
|
||||
strcpy(internal1, "txlnd1");
|
||||
INPtermInsert(ckt, &internal1, tab, &inode1);
|
||||
if(!tab->defRmod) {
|
||||
/* create default R model */
|
||||
IFnewUid(ckt,&uid,(IFuid)NULL,"R",UID_MODEL,(void**)NULL);
|
||||
IFC(newModel, (ckt,type,&(tab->defRmod),uid))
|
||||
}
|
||||
mdfast = tab->defRmod;
|
||||
strcpy(rname1, "txlres1");
|
||||
IFC(newInstance,(ckt,mdfast,&fast,rname1))
|
||||
IFC(bindNode,(ckt,fast,1,node1))
|
||||
IFC(bindNode,(ckt,fast,2,inode1))
|
||||
ptemp.rValue = rval;
|
||||
GCA(INPpName,("resistance",&ptemp,ckt,type,fast))
|
||||
/* resistor between node1 and internal1 */
|
||||
internal1 = (char *) tmalloc (10);
|
||||
strcpy(internal1, "txlnd1");
|
||||
INPtermInsert(ckt, &internal1, tab, &inode1);
|
||||
if(!tab->defRmod) {
|
||||
/* create default R model */
|
||||
IFnewUid(ckt,&uid,(IFuid)NULL,"R",UID_MODEL,(void**)NULL);
|
||||
IFC(newModel, (ckt,type,&(tab->defRmod),uid))
|
||||
}
|
||||
mdfast = tab->defRmod;
|
||||
strcpy(rname1, "txlres1");
|
||||
IFC(newInstance,(ckt,mdfast,&fast,rname1))
|
||||
IFC(bindNode,(ckt,fast,1,node1))
|
||||
IFC(bindNode,(ckt,fast,2,inode1))
|
||||
ptemp.rValue = rval;
|
||||
GCA(INPpName,("resistance",&ptemp,ckt,type,fast))
|
||||
|
||||
/* resistor between internal1 and internal2 */
|
||||
internal2 = (char *) tmalloc (10);
|
||||
strcpy(internal2, "txlnd2");
|
||||
INPtermInsert(ckt, &internal2, tab, &inode2);
|
||||
strcpy(rname2, "txlres2");
|
||||
mdfast2 = tab->defRmod;
|
||||
IFC(newInstance,(ckt,mdfast2,&fast2,rname2))
|
||||
IFC(bindNode,(ckt,fast2,1,inode1))
|
||||
IFC(bindNode,(ckt,fast2,2,inode2))
|
||||
ptemp.rValue = rval;
|
||||
GCA(INPpName,("resistance",&ptemp,ckt,type,fast2))
|
||||
/* resistor between internal1 and internal2 */
|
||||
internal2 = (char *) tmalloc (10);
|
||||
strcpy(internal2, "txlnd2");
|
||||
INPtermInsert(ckt, &internal2, tab, &inode2);
|
||||
strcpy(rname2, "txlres2");
|
||||
mdfast2 = tab->defRmod;
|
||||
IFC(newInstance,(ckt,mdfast2,&fast2,rname2))
|
||||
IFC(bindNode,(ckt,fast2,1,inode1))
|
||||
IFC(bindNode,(ckt,fast2,2,inode2))
|
||||
ptemp.rValue = rval;
|
||||
GCA(INPpName,("resistance",&ptemp,ckt,type,fast2))
|
||||
|
||||
/* resistor between internal2 and node2 */
|
||||
strcpy(rname3, "txlres3");
|
||||
mdfast3 = tab->defRmod;
|
||||
IFC(newInstance,(ckt,mdfast3,&fast3,rname3))
|
||||
IFC(bindNode,(ckt,fast3,1,inode2))
|
||||
IFC(bindNode,(ckt,fast3,2,node2))
|
||||
ptemp.rValue = rval;
|
||||
GCA(INPpName,("resistance",&ptemp,ckt,type,fast3))
|
||||
/* resistor between internal2 and node2 */
|
||||
strcpy(rname3, "txlres3");
|
||||
mdfast3 = tab->defRmod;
|
||||
IFC(newInstance,(ckt,mdfast3,&fast3,rname3))
|
||||
IFC(bindNode,(ckt,fast3,1,inode2))
|
||||
IFC(bindNode,(ckt,fast3,2,node2))
|
||||
ptemp.rValue = rval;
|
||||
GCA(INPpName,("resistance",&ptemp,ckt,type,fast3))
|
||||
|
||||
/* capacitor on node1 */
|
||||
type = INPtypelook("Capacitor");
|
||||
if(!tab->defCmod) {
|
||||
IFnewUid(ckt,&uid,(IFuid)NULL,"C",UID_MODEL,(void**)NULL);
|
||||
IFC(newModel,(ckt,type,&(tab->defCmod),uid))
|
||||
}
|
||||
mdfast4 = tab->defCmod;
|
||||
strcpy(cname1, "txlcap1");
|
||||
IFC(newInstance,(ckt,mdfast4,&fast4,cname1))
|
||||
IFC(bindNode,(ckt,fast4,1,node1))
|
||||
IFC(bindNode,(ckt,fast4,2,gnode1))
|
||||
ptemp.rValue = cval;
|
||||
GCA(INPpName,("capacitance",&ptemp,ckt,type,fast4))
|
||||
/* capacitor on node1 */
|
||||
type = INPtypelook("Capacitor");
|
||||
if(!tab->defCmod) {
|
||||
IFnewUid(ckt,&uid,(IFuid)NULL,"C",UID_MODEL,(void**)NULL);
|
||||
IFC(newModel,(ckt,type,&(tab->defCmod),uid))
|
||||
}
|
||||
mdfast4 = tab->defCmod;
|
||||
strcpy(cname1, "txlcap1");
|
||||
IFC(newInstance,(ckt,mdfast4,&fast4,cname1))
|
||||
IFC(bindNode,(ckt,fast4,1,node1))
|
||||
IFC(bindNode,(ckt,fast4,2,gnode1))
|
||||
ptemp.rValue = cval;
|
||||
GCA(INPpName,("capacitance",&ptemp,ckt,type,fast4))
|
||||
|
||||
/* capacitor on internal1 */
|
||||
strcpy(cname2, "txlcap2");
|
||||
mdfast4 = tab->defCmod;
|
||||
IFC(newInstance,(ckt,mdfast4,&fast4,cname2))
|
||||
IFC(bindNode,(ckt,fast4,1,inode1))
|
||||
IFC(bindNode,(ckt,fast4,2,gnode1))
|
||||
ptemp.rValue = cval * 2;
|
||||
GCA(INPpName,("capacitance",&ptemp,ckt,type,fast4))
|
||||
/* capacitor on internal1 */
|
||||
strcpy(cname2, "txlcap2");
|
||||
mdfast4 = tab->defCmod;
|
||||
IFC(newInstance,(ckt,mdfast4,&fast4,cname2))
|
||||
IFC(bindNode,(ckt,fast4,1,inode1))
|
||||
IFC(bindNode,(ckt,fast4,2,gnode1))
|
||||
ptemp.rValue = cval * 2;
|
||||
GCA(INPpName,("capacitance",&ptemp,ckt,type,fast4))
|
||||
|
||||
/* capacitor on internal2 */
|
||||
strcpy(cname3, "txlcap3");
|
||||
mdfast5 = tab->defCmod;
|
||||
IFC(newInstance,(ckt,mdfast5,&fast5,cname3))
|
||||
IFC(bindNode,(ckt,fast5,1,inode2))
|
||||
IFC(bindNode,(ckt,fast5,2,gnode1))
|
||||
ptemp.rValue = cval * 2;
|
||||
GCA(INPpName,("capacitance",&ptemp,ckt,type,fast5))
|
||||
/* capacitor on internal2 */
|
||||
strcpy(cname3, "txlcap3");
|
||||
mdfast5 = tab->defCmod;
|
||||
IFC(newInstance,(ckt,mdfast5,&fast5,cname3))
|
||||
IFC(bindNode,(ckt,fast5,1,inode2))
|
||||
IFC(bindNode,(ckt,fast5,2,gnode1))
|
||||
ptemp.rValue = cval * 2;
|
||||
GCA(INPpName,("capacitance",&ptemp,ckt,type,fast5))
|
||||
|
||||
/* capacitor on node2 */
|
||||
strcpy(cname4, "txlcap4");
|
||||
mdfast6 = tab->defCmod;
|
||||
IFC(newInstance,(ckt,mdfast6,&fast6,cname4))
|
||||
IFC(bindNode,(ckt,fast6,1,node2))
|
||||
IFC(bindNode,(ckt,fast6,2,gnode1))
|
||||
ptemp.rValue = cval;
|
||||
GCA(INPpName,("capacitance",&ptemp,ckt,type,fast6))
|
||||
return;
|
||||
/* capacitor on node2 */
|
||||
strcpy(cname4, "txlcap4");
|
||||
mdfast6 = tab->defCmod;
|
||||
IFC(newInstance,(ckt,mdfast6,&fast6,cname4))
|
||||
IFC(bindNode,(ckt,fast6,1,node2))
|
||||
IFC(bindNode,(ckt,fast6,2,gnode1))
|
||||
ptemp.rValue = cval;
|
||||
GCA(INPpName,("capacitance",&ptemp,ckt,type,fast6))
|
||||
return;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
/* use regular txl model */
|
||||
mdfast = thismodel->INPmodfast;
|
||||
type = thismodel->INPmodType;
|
||||
} else {
|
||||
type = mytype;
|
||||
if(!tab->defYmod) {
|
||||
/* create default Y model */
|
||||
IFnewUid(ckt,&uid,(IFuid)NULL,"Y",UID_MODEL,(void**)NULL);
|
||||
IFC(newModel, (ckt,type,&(tab->defYmod),uid))
|
||||
}
|
||||
mdfast = tab->defYmod;
|
||||
}
|
||||
IFC(newInstance,(ckt,mdfast,&fast,name))
|
||||
} else {
|
||||
LITERR("model name is not found")
|
||||
return;
|
||||
}
|
||||
|
||||
if (error1 == 0 && lenvalgiven) {
|
||||
ptemp.rValue = lenval;
|
||||
GCA(INPpName,("length",&ptemp,ckt,type,fast))
|
||||
}
|
||||
/* use regular txl model */
|
||||
mdfast = thismodel->INPmodfast;
|
||||
type = thismodel->INPmodType;
|
||||
} else {
|
||||
type = mytype;
|
||||
if(!tab->defYmod) {
|
||||
/* create default Y model */
|
||||
IFnewUid(ckt,&uid,(IFuid)NULL,"Y",UID_MODEL,(void**)NULL);
|
||||
IFC(newModel, (ckt,type,&(tab->defYmod),uid))
|
||||
}
|
||||
mdfast = tab->defYmod;
|
||||
}
|
||||
IFC(newInstance,(ckt,mdfast,&fast,name))
|
||||
} else {
|
||||
LITERR("model name is not found")
|
||||
return;
|
||||
}
|
||||
|
||||
if (error1 == 0 && lenvalgiven) {
|
||||
ptemp.rValue = lenval;
|
||||
GCA(INPpName,("length",&ptemp,ckt,type,fast))
|
||||
}
|
||||
|
||||
IFC(bindNode,(ckt,fast,1,node1))
|
||||
IFC(bindNode,(ckt,fast,2,node2))
|
||||
|
||||
txl = (GENinstance *)fast;
|
||||
txl = (GENinstance *)fast;
|
||||
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,11 +20,13 @@ char *INPdomodel(void *ckt, card * image, INPtables * tab)
|
|||
|
||||
char *modname;
|
||||
int type = -1;
|
||||
int lev;
|
||||
int lev, error1=0;
|
||||
char ver[100];
|
||||
char *typename;
|
||||
char *err = (char *) NULL;
|
||||
char *line;
|
||||
char *val;
|
||||
double rval=0, lval=0;
|
||||
|
||||
line = image->line;
|
||||
|
||||
|
|
@ -464,17 +466,15 @@ char *INPdomodel(void *ckt, card * image, INPtables * tab)
|
|||
|
||||
/* -------- Check if model is a transmission line of some sort --------- */
|
||||
else if(strcmp(typename,"txl") == 0) {
|
||||
char *val;
|
||||
double rval=0, lval=0;
|
||||
INPgetTok(&line,&val,1);
|
||||
while (*line != '\0') {
|
||||
if (*val == 'R' || *val == 'r') {
|
||||
INPgetTok(&line,&val,1);
|
||||
rval = atof(val);
|
||||
rval = INPevaluate(&val, &error1, 1);
|
||||
}
|
||||
if ((strcmp(val,"L") == 0) || (strcmp(val,"l") == 0)) {
|
||||
INPgetTok(&line,&val,1);
|
||||
lval = atof(val);
|
||||
lval = INPevaluate(&val, &error1, 1);
|
||||
}
|
||||
INPgetTok(&line,&val,1);
|
||||
}
|
||||
|
|
@ -499,7 +499,7 @@ char *INPdomodel(void *ckt, card * image, INPtables * tab)
|
|||
|
||||
}
|
||||
|
||||
/* -------- Check if model is a ???? --------- */
|
||||
/* -------- Check if model is a coupled transmission line --------- */
|
||||
else if(strcmp(typename,"cpl") == 0) {
|
||||
type = INPtypelook("CplLines");
|
||||
if(type < 0) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue