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

CKTfndMod(), cleanup

This commit is contained in:
rlar 2013-07-17 20:35:55 +02:00
parent b32c15d85f
commit 59309e196b
4 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/frontend/spiceif.c
View File

@ -611,19 +611,15 @@ finddev_special(
GENmodel **modptr, GENmodel **modptr,
int *device_or_model) int *device_or_model)
{ {
int type = -1;
*devptr = ft_sim->findInstance (ckt, name); *devptr = ft_sim->findInstance (ckt, name);
if (*devptr) { if (*devptr) {
*device_or_model = 0; *device_or_model = 0;
return (*devptr)->GENmodPtr->GENmodType; return (*devptr)->GENmodPtr->GENmodType;
} }
type = -1;
// assert(second && *second == -1) // assert(second && *second == -1)
// assert(third && *third == NULL) // assert(third && *third == NULL)
*modptr = ft_sim->findModel (ckt, type, modptr, name); *modptr = ft_sim->findModel (ckt, -1, NULL, name);
if (*modptr) { if (*modptr) {
*device_or_model = 1; *device_or_model = 1;
return (*modptr)->GENmodType; return (*modptr)->GENmodType;
@ -1211,17 +1207,13 @@ doset(CKTcircuit *ckt, int typecode, GENinstance *dev, GENmodel *mod, IFparm *op
static int static int
finddev(CKTcircuit *ckt, char *name, GENinstance **devptr, GENmodel **modptr) finddev(CKTcircuit *ckt, char *name, GENinstance **devptr, GENmodel **modptr)
{ {
int type = -1;
*devptr = ft_sim->findInstance (ckt, name); *devptr = ft_sim->findInstance (ckt, name);
if (*devptr) if (*devptr)
return (*devptr)->GENmodPtr->GENmodType; return (*devptr)->GENmodPtr->GENmodType;
type = -1;
// assert(second && *second == -1) // assert(second && *second == -1)
// assert(third && *third == NULL) // assert(third && *third == NULL)
*modptr = ft_sim->findModel (ckt, type, modptr, name); *modptr = ft_sim->findModel (ckt, -1, modptr, name);
if (*modptr) if (*modptr)
return (*modptr)->GENmodType; return (*modptr)->GENmodType;

2
src/spicelib/analysis/cktmcrt.c
View File

@ -24,7 +24,7 @@ CKTmodCrt(CKTcircuit *ckt, int type, GENmodel **modfast, IFuid name)
// assert(second) // assert(second)
// assert(third && *third == NULL) // assert(third && *third == NULL)
mymodfast = CKTfndMod(ckt, type, &mymodfast, name); mymodfast = CKTfndMod(ckt, type, NULL, name);
if(!mymodfast) { if(!mymodfast) {
mymodfast = (GENmodel *) tmalloc((size_t) *(DEVices[type]->DEVmodSize)); mymodfast = (GENmodel *) tmalloc((size_t) *(DEVices[type]->DEVmodSize));
if(mymodfast == NULL) return(E_NOMEM); if(mymodfast == NULL) return(E_NOMEM);

9
src/spicelib/devices/urc/urcsetup.c
View File

@ -280,7 +280,6 @@ URCunsetup(GENmodel *inModel, CKTcircuit *ckt)
URCmodel *model = (URCmodel *) inModel; URCmodel *model = (URCmodel *) inModel;
GENinstance *in; GENinstance *in;
GENmodel *modfast; GENmodel *modfast;
int type;
/* Delete models, devices, and intermediate nodes; */ /* Delete models, devices, and intermediate nodes; */
@ -306,11 +305,9 @@ URCunsetup(GENmodel *inModel, CKTcircuit *ckt)
if (error && error != E_EXISTS) if (error && error != E_EXISTS)
return error; return error;
modfast = NULL;
type = -1;
// assert(second && *second == -1) // assert(second && *second == -1)
// assert(third && *third == NULL) // assert(third && *third == NULL)
modfast = CKTfndMod(ckt, type, &modfast, varUid); modfast = CKTfndMod(ckt, -1, NULL, varUid);
if (!modfast) if (!modfast)
return E_NOMOD; return E_NOMOD;
@ -325,11 +322,9 @@ URCunsetup(GENmodel *inModel, CKTcircuit *ckt)
if (error && error != E_EXISTS) if (error && error != E_EXISTS)
return error; return error;
modfast = NULL;
type = -1;
// assert(second && *second == -1) // assert(second && *second == -1)
// assert(third && *third == NULL) // assert(third && *third == NULL)
modfast = CKTfndMod(ckt, type, &modfast, varUid); modfast = CKTfndMod(ckt, -1, NULL, varUid);
if (!modfast) if (!modfast)
return E_NOMOD; return E_NOMOD;
CKTdltMod(ckt, modfast); CKTdltMod(ckt, modfast);

4
src/tclspice.c
View File

@ -1399,10 +1399,12 @@ get_mod_param TCL_CMDPROCARGS(clientData, interp, argc, argv)
typecode = -1; typecode = -1;
// assert(second && *second == -1) // assert(second && *second == -1)
// assert(third && *third == NULL) // assert(third && *third == NULL)
modptr = ft_sim->findModel (ft_curckt->ci_ckt, typecode, &modptr, name); modptr = ft_sim->findModel (ft_curckt->ci_ckt, -1, NULL, name);
err = modptr ? OK : E_NOMOD; err = modptr ? OK : E_NOMOD;
if (modptr) if (modptr)
typecode = modptr->GENmodType; typecode = modptr->GENmodType;
else
typecode = -1;
} else { } else {
typecode = devptr->GENmodPtr->GENmodType; typecode = devptr->GENmodPtr->GENmodType;
err = OK; err = OK;