From 2f329bd8b472663d79fb214adfc1391dafb1f141 Mon Sep 17 00:00:00 2001 From: rlar Date: Sat, 15 Apr 2017 16:32:44 +0200 Subject: [PATCH] N_MXVLNTH, drop noise variable name limitation --- src/include/ngspice/noisedef.h | 14 +++++- src/spicelib/devices/bjt/bjtnoise.c | 33 ++------------ src/spicelib/devices/bsim1/b1noi.c | 38 ++-------------- src/spicelib/devices/bsim2/b2noi.c | 38 ++-------------- src/spicelib/devices/bsim3/b3noi.c | 38 ++-------------- src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c | 38 ++-------------- src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c | 38 ++-------------- src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c | 38 ++-------------- src/spicelib/devices/bsim3v0/b3v0noi.c | 38 ++-------------- src/spicelib/devices/bsim3v1/b3v1noi.c | 44 ++----------------- src/spicelib/devices/bsim3v32/b3v32noi.c | 38 ++-------------- src/spicelib/devices/bsim4/b4noi.c | 41 ++--------------- src/spicelib/devices/bsim4v5/b4v5noi.c | 38 ++-------------- src/spicelib/devices/bsim4v6/b4v6noi.c | 38 ++-------------- src/spicelib/devices/bsim4v7/b4v7noi.c | 41 ++--------------- src/spicelib/devices/bsimsoi/b4soinoi.c | 38 ++-------------- src/spicelib/devices/csw/cswnoise.c | 33 ++------------ src/spicelib/devices/dio/dionoise.c | 28 ++---------- src/spicelib/devices/hisim2/hsm2noi.c | 29 ++---------- src/spicelib/devices/hisimhv1/hsmhvnoi.c | 29 ++---------- src/spicelib/devices/hisimhv2/hsmhv2noi.c | 29 ++---------- src/spicelib/devices/jfet/jfetnoi.c | 31 ++----------- src/spicelib/devices/jfet2/jfet2noi.c | 36 ++------------- src/spicelib/devices/mes/mesnoise.c | 41 ++--------------- src/spicelib/devices/mos1/mos1noi.c | 36 ++------------- src/spicelib/devices/mos2/mos2noi.c | 37 ++-------------- src/spicelib/devices/mos3/mos3noi.c | 38 ++-------------- src/spicelib/devices/mos9/mos9noi.c | 38 ++-------------- src/spicelib/devices/res/resnoise.c | 36 ++------------- src/spicelib/devices/soi3/soi3nois.c | 37 ++-------------- src/spicelib/devices/sw/swnoise.c | 37 ++-------------- src/spicelib/devices/vbic/vbicnoise.c | 33 ++------------ 32 files changed, 105 insertions(+), 1034 deletions(-) diff --git a/src/include/ngspice/noisedef.h b/src/include/ngspice/noisedef.h index 182786073..49821d024 100644 --- a/src/include/ngspice/noisedef.h +++ b/src/include/ngspice/noisedef.h @@ -119,8 +119,18 @@ typedef struct { /* misc constants */ -#define N_MXVLNTH 64 /* maximum length for noise output variables we will generate */ - /* (see MAXVLENGTH in FTE/writedata.c) */ +#define NOISE_ADD_OUTVAR(ckt, data, fmt, aname, bname) \ + do { \ + data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); \ + if (!data->namelist) \ + return E_NOMEM; \ + char *name = tprintf(fmt, aname, bname); \ + if (!name) \ + return E_NOMEM; \ + SPfrontEnd->IFnewUid(ckt, &(data->namelist[data->numPlots++]), \ + NULL, name, UID_OTHER, NULL); \ + tfree(name); \ + } while(0) void NevalSrc (double *noise, double *lnNoise, CKTcircuit *ckt, int type, int node1, int node2, double param); diff --git a/src/spicelib/devices/bjt/bjtnoise.c b/src/spicelib/devices/bjt/bjtnoise.c index 17c676484..b17a40e42 100644 --- a/src/spicelib/devices/bjt/bjtnoise.c +++ b/src/spicelib/devices/bjt/bjtnoise.c @@ -30,7 +30,6 @@ BJTnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, BJTmodel *firstModel = (BJTmodel *) genmodel; BJTmodel *model; BJTinstance *inst; - char name[N_MXVLNTH]; double tempOnoise; double tempInoise; double noizDens[BJTNSRCS]; @@ -67,40 +66,14 @@ for (model=firstModel; model != NULL; model=model->BJTnextModel) { case N_DENS: for (i=0; i < BJTNSRCS; i++) { - (void)sprintf(name,"onoise_%s%s", - inst->BJTname,BJTnNames[i]); - - - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ + NOISE_ADD_OUTVAR(ckt, data, "onoise_%s%s", inst->BJTname, BJTnNames[i]); } break; case INT_NOIZ: for (i=0; i < BJTNSRCS; i++) { - (void)sprintf(name,"onoise_total_%s%s", - inst->BJTname,BJTnNames[i]); - - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - (void)sprintf(name,"inoise_total_%s%s", - inst->BJTname,BJTnNames[i]); - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ + NOISE_ADD_OUTVAR(ckt, data, "onoise_total_%s%s", inst->BJTname, BJTnNames[i]); + NOISE_ADD_OUTVAR(ckt, data, "inoise_total_%s%s", inst->BJTname, BJTnNames[i]); } break; } diff --git a/src/spicelib/devices/bsim1/b1noi.c b/src/spicelib/devices/bsim1/b1noi.c index 9863f3848..6b66b4f58 100644 --- a/src/spicelib/devices/bsim1/b1noi.c +++ b/src/spicelib/devices/bsim1/b1noi.c @@ -29,7 +29,6 @@ B1noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, B1model *firstModel = (B1model *) genmodel; B1model *model; B1instance *inst; - char name[N_MXVLNTH]; double tempOnoise; double tempInoise; double noizDens[B1NSRCS]; @@ -61,45 +60,14 @@ B1noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, case N_DENS: for (i=0; i < B1NSRCS; i++) { - (void)sprintf(name,"onoise_%s%s",inst->B1name,B1nNames[i]); - - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - + NOISE_ADD_OUTVAR(ckt, data, "onoise_%s%s", inst->B1name, B1nNames[i]); } break; case INT_NOIZ: for (i=0; i < B1NSRCS; i++) { - (void)sprintf(name,"onoise_total_%s%s",inst->B1name,B1nNames[i]); - - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - - (void)sprintf(name,"inoise_total_%s%s",inst->B1name,B1nNames[i]); - - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - - + NOISE_ADD_OUTVAR(ckt, data, "onoise_total_%s%s", inst->B1name, B1nNames[i]); + NOISE_ADD_OUTVAR(ckt, data, "inoise_total_%s%s", inst->B1name, B1nNames[i]); } break; } diff --git a/src/spicelib/devices/bsim2/b2noi.c b/src/spicelib/devices/bsim2/b2noi.c index 89e3320c5..7ff1ac9f1 100644 --- a/src/spicelib/devices/bsim2/b2noi.c +++ b/src/spicelib/devices/bsim2/b2noi.c @@ -29,7 +29,6 @@ B2noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, B2model *firstModel = (B2model *) genmodel; B2model *model; B2instance *inst; - char name[N_MXVLNTH]; double tempOnoise; double tempInoise; double noizDens[B2NSRCS]; @@ -61,45 +60,14 @@ B2noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, case N_DENS: for (i=0; i < B2NSRCS; i++) { - (void)sprintf(name,"onoise_%s%s",inst->B2name,B2nNames[i]); - - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - + NOISE_ADD_OUTVAR(ckt, data, "onoise_%s%s", inst->B2name, B2nNames[i]); } break; case INT_NOIZ: for (i=0; i < B2NSRCS; i++) { - (void)sprintf(name,"onoise_total_%s%s",inst->B2name,B2nNames[i]); - - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - - (void)sprintf(name,"inoise_total_%s%s",inst->B2name,B2nNames[i]); - - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - - + NOISE_ADD_OUTVAR(ckt, data, "onoise_total_%s%s", inst->B2name, B2nNames[i]); + NOISE_ADD_OUTVAR(ckt, data, "inoise_total_%s%s", inst->B2name, B2nNames[i]); } break; } diff --git a/src/spicelib/devices/bsim3/b3noi.c b/src/spicelib/devices/bsim3/b3noi.c index 4f6b44402..f38db144e 100644 --- a/src/spicelib/devices/bsim3/b3noi.c +++ b/src/spicelib/devices/bsim3/b3noi.c @@ -113,7 +113,6 @@ NOISEAN *job = (NOISEAN *) ckt->CKTcurJob; BSIM3model *model = (BSIM3model *)inModel; BSIM3instance *here; struct bsim3SizeDependParam *pParam; -char name[N_MXVLNTH]; double tempOnoise; double tempInoise; double noizDens[BSIM3NSRCS]; @@ -153,44 +152,13 @@ int i; { switch (mode) { case N_DENS: for (i = 0; i < BSIM3NSRCS; i++) - { (void) sprintf(name, "onoise.%s%s", - here->BSIM3name, - BSIM3nNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, - NULL); - /* we've added one more plot */ + { NOISE_ADD_OUTVAR(ckt, data, "onoise.%s%s", here->BSIM3name, BSIM3nNames[i]); } break; case INT_NOIZ: for (i = 0; i < BSIM3NSRCS; i++) - { (void) sprintf(name, "onoise_total.%s%s", - here->BSIM3name, - BSIM3nNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, - NULL); - /* we've added one more plot */ - - (void) sprintf(name, "inoise_total.%s%s", - here->BSIM3name, - BSIM3nNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, - NULL); - /* we've added one more plot */ + { NOISE_ADD_OUTVAR(ckt, data, "onoise_total.%s%s", here->BSIM3name, BSIM3nNames[i]); + NOISE_ADD_OUTVAR(ckt, data, "inoise_total.%s%s", here->BSIM3name, BSIM3nNames[i]); } break; } diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c b/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c index 830fd31ee..41036ccdb 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c @@ -103,7 +103,6 @@ NOISEAN *job = (NOISEAN *) ckt->CKTcurJob; B3SOIDDmodel *model = (B3SOIDDmodel *)inModel; B3SOIDDinstance *here; struct b3soiddSizeDependParam *pParam; -char name[N_MXVLNTH]; double tempOnoise; double tempInoise; double noizDens[B3SOIDDNSRCS]; @@ -142,44 +141,13 @@ int i; { switch (mode) { case N_DENS: for (i = 0; i < B3SOIDDNSRCS; i++) - { (void) sprintf(name, "onoise.%s%s", - here->B3SOIDDname, - B3SOIDDnNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, - NULL); - /* we've added one more plot */ + { NOISE_ADD_OUTVAR(ckt, data, "onoise.%s%s", here->B3SOIDDname, B3SOIDDnNames[i]); } break; case INT_NOIZ: for (i = 0; i < B3SOIDDNSRCS; i++) - { (void) sprintf(name, "onoise_total.%s%s", - here->B3SOIDDname, - B3SOIDDnNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, - NULL); - /* we've added one more plot */ - - (void) sprintf(name, "inoise_total.%s%s", - here->B3SOIDDname, - B3SOIDDnNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, - NULL); - /* we've added one more plot */ + { NOISE_ADD_OUTVAR(ckt, data, "onoise_total.%s%s", here->B3SOIDDname, B3SOIDDnNames[i]); + NOISE_ADD_OUTVAR(ckt, data, "inoise_total.%s%s", here->B3SOIDDname, B3SOIDDnNames[i]); } break; } diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c b/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c index 64f65e9b2..746f74f76 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c @@ -103,7 +103,6 @@ NOISEAN *job = (NOISEAN *) ckt->CKTcurJob; B3SOIFDmodel *model = (B3SOIFDmodel *)inModel; B3SOIFDinstance *here; struct b3soifdSizeDependParam *pParam; -char name[N_MXVLNTH]; double tempOnoise; double tempInoise; double noizDens[B3SOIFDNSRCS]; @@ -142,44 +141,13 @@ int i; { switch (mode) { case N_DENS: for (i = 0; i < B3SOIFDNSRCS; i++) - { (void) sprintf(name, "onoise.%s%s", - here->B3SOIFDname, - B3SOIFDnNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, - NULL); - /* we've added one more plot */ + { NOISE_ADD_OUTVAR(ckt, data, "onoise.%s%s", here->B3SOIFDname, B3SOIFDnNames[i]); } break; case INT_NOIZ: for (i = 0; i < B3SOIFDNSRCS; i++) - { (void) sprintf(name, "onoise_total.%s%s", - here->B3SOIFDname, - B3SOIFDnNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, - NULL); - /* we've added one more plot */ - - (void) sprintf(name, "inoise_total.%s%s", - here->B3SOIFDname, - B3SOIFDnNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, - NULL); - /* we've added one more plot */ + { NOISE_ADD_OUTVAR(ckt, data, "onoise_total.%s%s", here->B3SOIFDname, B3SOIFDnNames[i]); + NOISE_ADD_OUTVAR(ckt, data, "inoise_total.%s%s", here->B3SOIFDname, B3SOIFDnNames[i]); } break; } diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c b/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c index d1cec2fc8..866b310a8 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c @@ -107,7 +107,6 @@ NOISEAN *job = (NOISEAN *) ckt->CKTcurJob; B3SOIPDmodel *model = (B3SOIPDmodel *)inModel; B3SOIPDinstance *here; struct b3soipdSizeDependParam *pParam; -char name[N_MXVLNTH]; double tempOnoise; double tempInoise; double noizDens[B3SOIPDNSRCS]; @@ -146,44 +145,13 @@ int i; { switch (mode) { case N_DENS: for (i = 0; i < B3SOIPDNSRCS; i++) - { (void) sprintf(name, "onoise.%s%s", - here->B3SOIPDname, - B3SOIPDnNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, - NULL); - /* we've added one more plot */ + { NOISE_ADD_OUTVAR(ckt, data, "onoise.%s%s", here->B3SOIPDname, B3SOIPDnNames[i]); } break; case INT_NOIZ: for (i = 0; i < B3SOIPDNSRCS; i++) - { (void) sprintf(name, "onoise_total.%s%s", - here->B3SOIPDname, - B3SOIPDnNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, - NULL); - /* we've added one more plot */ - - (void) sprintf(name, "inoise_total.%s%s", - here->B3SOIPDname, - B3SOIPDnNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, - NULL); - /* we've added one more plot */ + { NOISE_ADD_OUTVAR(ckt, data, "onoise_total.%s%s", here->B3SOIPDname, B3SOIPDnNames[i]); + NOISE_ADD_OUTVAR(ckt, data, "inoise_total.%s%s", here->B3SOIPDname, B3SOIPDnNames[i]); } break; } diff --git a/src/spicelib/devices/bsim3v0/b3v0noi.c b/src/spicelib/devices/bsim3v0/b3v0noi.c index 5bdcb4688..d91bfe2d1 100644 --- a/src/spicelib/devices/bsim3v0/b3v0noi.c +++ b/src/spicelib/devices/bsim3v0/b3v0noi.c @@ -77,7 +77,6 @@ NOISEAN *job = (NOISEAN *) ckt->CKTcurJob; BSIM3v0model *model = (BSIM3v0model *)inModel; BSIM3v0instance *here; struct bsim3v0SizeDependParam *pParam; -char name[N_MXVLNTH]; double tempOnoise; double tempInoise; double noizDens[BSIM3v0NSRCS]; @@ -115,44 +114,13 @@ int i; { switch (mode) { case N_DENS: for (i = 0; i < BSIM3v0NSRCS; i++) - { (void) sprintf(name, "onoise.%s%s", - here->BSIM3v0name, - BSIM3v0nNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, - NULL); - /* we've added one more plot */ + { NOISE_ADD_OUTVAR(ckt, data, "onoise.%s%s", here->BSIM3v0name, BSIM3v0nNames[i]); } break; case INT_NOIZ: for (i = 0; i < BSIM3v0NSRCS; i++) - { (void) sprintf(name, "onoise_total.%s%s", - here->BSIM3v0name, - BSIM3v0nNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, - NULL); - /* we've added one more plot */ - - (void) sprintf(name, "inoise_total.%s%s", - here->BSIM3v0name, - BSIM3v0nNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, - NULL); - /* we've added one more plot */ + { NOISE_ADD_OUTVAR(ckt, data, "onoise_total.%s%s", here->BSIM3v0name, BSIM3v0nNames[i]); + NOISE_ADD_OUTVAR(ckt, data, "inoise_total.%s%s", here->BSIM3v0name, BSIM3v0nNames[i]); } break; } diff --git a/src/spicelib/devices/bsim3v1/b3v1noi.c b/src/spicelib/devices/bsim3v1/b3v1noi.c index 8cb4f5595..1ac3e8f5f 100644 --- a/src/spicelib/devices/bsim3v1/b3v1noi.c +++ b/src/spicelib/devices/bsim3v1/b3v1noi.c @@ -100,7 +100,6 @@ NOISEAN *job = (NOISEAN *) ckt->CKTcurJob; BSIM3v1model *model = (BSIM3v1model *)inModel; BSIM3v1instance *here; struct bsim3v1SizeDependParam *pParam; -char name[N_MXVLNTH]; double tempOnoise; double tempInoise; double noizDens[BSIM3v1NSRCS]; @@ -138,50 +137,13 @@ int i; { switch (mode) { case N_DENS: for (i = 0; i < BSIM3v1NSRCS; i++) - { (void) sprintf(name, "onoise.%s%s", - here->BSIM3v1name, - BSIM3v1nNames[i]); - data->namelist = TREALLOC( - IFuid, data->namelist, - data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, - NULL); - /* we've added one more plot */ + { NOISE_ADD_OUTVAR(ckt, data, "onoise.%s%s", here->BSIM3v1name, BSIM3v1nNames[i]); } break; case INT_NOIZ: for (i = 0; i < BSIM3v1NSRCS; i++) - { (void) sprintf(name, "onoise_total.%s%s", - here->BSIM3v1name, - BSIM3v1nNames[i]); - data->namelist = TREALLOC( - IFuid, data->namelist, - data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, - NULL); - /* we've added one more plot */ - - (void) sprintf(name, "inoise_total.%s%s", - here->BSIM3v1name, - BSIM3v1nNames[i]); - data->namelist = TREALLOC( - IFuid, data->namelist, - data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, - NULL); - /* we've added one more plot */ + { NOISE_ADD_OUTVAR(ckt, data, "onoise_total.%s%s", here->BSIM3v1name, BSIM3v1nNames[i]); + NOISE_ADD_OUTVAR(ckt, data, "inoise_total.%s%s", here->BSIM3v1name, BSIM3v1nNames[i]); } break; } diff --git a/src/spicelib/devices/bsim3v32/b3v32noi.c b/src/spicelib/devices/bsim3v32/b3v32noi.c index 7351a535e..07a8ca93f 100644 --- a/src/spicelib/devices/bsim3v32/b3v32noi.c +++ b/src/spicelib/devices/bsim3v32/b3v32noi.c @@ -183,7 +183,6 @@ NOISEAN *job = (NOISEAN *) ckt->CKTcurJob; BSIM3v32model *model = (BSIM3v32model *)inModel; BSIM3v32instance *here; struct bsim3v32SizeDependParam *pParam; -char name[N_MXVLNTH]; double tempOnoise; double tempInoise; double noizDens[BSIM3v32NSRCS]; @@ -222,44 +221,13 @@ int i; { switch (mode) { case N_DENS: for (i = 0; i < BSIM3v32NSRCS; i++) - { (void) sprintf(name, "onoise.%s%s", - here->BSIM3v32name, - BSIM3v32nNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, - NULL); - /* we've added one more plot */ + { NOISE_ADD_OUTVAR(ckt, data, "onoise.%s%s", here->BSIM3v32name, BSIM3v32nNames[i]); } break; case INT_NOIZ: for (i = 0; i < BSIM3v32NSRCS; i++) - { (void) sprintf(name, "onoise_total.%s%s", - here->BSIM3v32name, - BSIM3v32nNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, - NULL); - /* we've added one more plot */ - - (void) sprintf(name, "inoise_total.%s%s", - here->BSIM3v32name, - BSIM3v32nNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, - NULL); - /* we've added one more plot */ + { NOISE_ADD_OUTVAR(ckt, data, "onoise_total.%s%s", here->BSIM3v32name, BSIM3v32nNames[i]); + NOISE_ADD_OUTVAR(ckt, data, "inoise_total.%s%s", here->BSIM3v32name, BSIM3v32nNames[i]); } break; } diff --git a/src/spicelib/devices/bsim4/b4noi.c b/src/spicelib/devices/bsim4/b4noi.c index d47fc81e5..9875ea8b8 100644 --- a/src/spicelib/devices/bsim4/b4noi.c +++ b/src/spicelib/devices/bsim4/b4noi.c @@ -131,7 +131,6 @@ NOISEAN *job = (NOISEAN *) ckt->CKTcurJob; BSIM4model *model = (BSIM4model *)inModel; BSIM4instance *here; struct bsim4SizeDependParam *pParam; -char name[N_MXVLNTH]; double tempOnoise; double tempInoise; double noizDens[BSIM4NSRCS]; @@ -187,47 +186,13 @@ double m; { switch (mode) { case N_DENS: for (i = 0; i < BSIM4NSRCS; i++) - { (void) sprintf(name, "onoise.%s%s", - here->BSIM4name, - BSIM4nNames[i]); - data->namelist = TREALLOC(IFuid, - data->namelist, - data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ + { NOISE_ADD_OUTVAR(ckt, data, "onoise.%s%s", here->BSIM4name, BSIM4nNames[i]); } break; case INT_NOIZ: for (i = 0; i < BSIM4NSRCS; i++) - { (void) sprintf(name, "onoise_total.%s%s", - here->BSIM4name, - BSIM4nNames[i]); - data->namelist = TREALLOC(IFuid, - data->namelist, - data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - (void) sprintf(name, "inoise_total.%s%s", - here->BSIM4name, - BSIM4nNames[i]); - data->namelist = TREALLOC(IFuid, - data->namelist, - data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ + { NOISE_ADD_OUTVAR(ckt, data, "onoise_total.%s%s", here->BSIM4name, BSIM4nNames[i]); + NOISE_ADD_OUTVAR(ckt, data, "inoise_total.%s%s", here->BSIM4name, BSIM4nNames[i]); } break; } diff --git a/src/spicelib/devices/bsim4v5/b4v5noi.c b/src/spicelib/devices/bsim4v5/b4v5noi.c index 5b606f01f..58b7278b1 100644 --- a/src/spicelib/devices/bsim4v5/b4v5noi.c +++ b/src/spicelib/devices/bsim4v5/b4v5noi.c @@ -87,7 +87,6 @@ NOISEAN *job = (NOISEAN *) ckt->CKTcurJob; BSIM4v5model *model = (BSIM4v5model *)inModel; BSIM4v5instance *here; struct bsim4v5SizeDependParam *pParam; -char name[N_MXVLNTH]; double tempOnoise; double tempInoise; double noizDens[BSIM4v5NSRCS]; @@ -133,44 +132,13 @@ int i; { switch (mode) { case N_DENS: for (i = 0; i < BSIM4v5NSRCS; i++) - { (void) sprintf(name, "onoise.%s%s", - here->BSIM4v5name, - BSIM4v5nNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, - NULL); - /* we've added one more plot */ + { NOISE_ADD_OUTVAR(ckt, data, "onoise.%s%s", here->BSIM4v5name, BSIM4v5nNames[i]); } break; case INT_NOIZ: for (i = 0; i < BSIM4v5NSRCS; i++) - { (void) sprintf(name, "onoise_total.%s%s", - here->BSIM4v5name, - BSIM4v5nNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, - NULL); - /* we've added one more plot */ - - (void) sprintf(name, "inoise_total.%s%s", - here->BSIM4v5name, - BSIM4v5nNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, - NULL); - /* we've added one more plot */ + { NOISE_ADD_OUTVAR(ckt, data, "onoise_total.%s%s", here->BSIM4v5name, BSIM4v5nNames[i]); + NOISE_ADD_OUTVAR(ckt, data, "inoise_total.%s%s", here->BSIM4v5name, BSIM4v5nNames[i]); } break; } diff --git a/src/spicelib/devices/bsim4v6/b4v6noi.c b/src/spicelib/devices/bsim4v6/b4v6noi.c index e012c67e1..bb0fc455f 100644 --- a/src/spicelib/devices/bsim4v6/b4v6noi.c +++ b/src/spicelib/devices/bsim4v6/b4v6noi.c @@ -88,7 +88,6 @@ NOISEAN *job = (NOISEAN *) ckt->CKTcurJob; BSIM4v6model *model = (BSIM4v6model *)inModel; BSIM4v6instance *here; struct bsim4v6SizeDependParam *pParam; -char name[N_MXVLNTH]; double tempOnoise; double tempInoise; double noizDens[BSIM4v6NSRCS]; @@ -134,44 +133,13 @@ int i; { switch (mode) { case N_DENS: for (i = 0; i < BSIM4v6NSRCS; i++) - { (void) sprintf(name, "onoise.%s%s", - here->BSIM4v6name, - BSIM4v6nNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, - NULL); - /* we've added one more plot */ + { NOISE_ADD_OUTVAR(ckt, data, "onoise.%s%s", here->BSIM4v6name, BSIM4v6nNames[i]); } break; case INT_NOIZ: for (i = 0; i < BSIM4v6NSRCS; i++) - { (void) sprintf(name, "onoise_total.%s%s", - here->BSIM4v6name, - BSIM4v6nNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, - NULL); - /* we've added one more plot */ - - (void) sprintf(name, "inoise_total.%s%s", - here->BSIM4v6name, - BSIM4v6nNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, - NULL); - /* we've added one more plot */ + { NOISE_ADD_OUTVAR(ckt, data, "onoise_total.%s%s", here->BSIM4v6name, BSIM4v6nNames[i]); + NOISE_ADD_OUTVAR(ckt, data, "inoise_total.%s%s", here->BSIM4v6name, BSIM4v6nNames[i]); } break; } diff --git a/src/spicelib/devices/bsim4v7/b4v7noi.c b/src/spicelib/devices/bsim4v7/b4v7noi.c index 1a758348d..4ef0a2241 100644 --- a/src/spicelib/devices/bsim4v7/b4v7noi.c +++ b/src/spicelib/devices/bsim4v7/b4v7noi.c @@ -92,7 +92,6 @@ NOISEAN *job = (NOISEAN *) ckt->CKTcurJob; BSIM4v7model *model = (BSIM4v7model *)inModel; BSIM4v7instance *here; struct bsim4SizeDependParam *pParam; -char name[N_MXVLNTH]; double tempOnoise; double tempInoise; double noizDens[BSIM4v7NSRCS]; @@ -148,47 +147,13 @@ double m; { switch (mode) { case N_DENS: for (i = 0; i < BSIM4v7NSRCS; i++) - { (void) sprintf(name, "onoise.%s%s", - here->BSIM4v7name, - BSIM4v7nNames[i]); - data->namelist = TREALLOC(IFuid, - data->namelist, - data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ + { NOISE_ADD_OUTVAR(ckt, data, "onoise.%s%s", here->BSIM4v7name, BSIM4v7nNames[i]); } break; case INT_NOIZ: for (i = 0; i < BSIM4v7NSRCS; i++) - { (void) sprintf(name, "onoise_total.%s%s", - here->BSIM4v7name, - BSIM4v7nNames[i]); - data->namelist = TREALLOC(IFuid, - data->namelist, - data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - (void) sprintf(name, "inoise_total.%s%s", - here->BSIM4v7name, - BSIM4v7nNames[i]); - data->namelist = TREALLOC(IFuid, - data->namelist, - data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ + { NOISE_ADD_OUTVAR(ckt, data, "onoise_total.%s%s", here->BSIM4v7name, BSIM4v7nNames[i]); + NOISE_ADD_OUTVAR(ckt, data, "inoise_total.%s%s", here->BSIM4v7name, BSIM4v7nNames[i]); } break; } diff --git a/src/spicelib/devices/bsimsoi/b4soinoi.c b/src/spicelib/devices/bsimsoi/b4soinoi.c index 601f2ade1..bd8964311 100644 --- a/src/spicelib/devices/bsimsoi/b4soinoi.c +++ b/src/spicelib/devices/bsimsoi/b4soinoi.c @@ -106,7 +106,6 @@ double *OnDens) register B4SOImodel *model = (B4SOImodel *)inModel; register B4SOIinstance *here; struct b4soiSizeDependParam *pParam; -char name[N_MXVLNTH]; double tempOnoise; double tempInoise; double noizDens[B4SOINSRCS]; @@ -164,44 +163,13 @@ double m; { switch (mode) { case N_DENS: for (i = 0; i < B4SOINSRCS; i++) - { (void) sprintf(name, "onoise.%s%s", - here->B4SOIname, - B4SOInNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, - &(data->namelist[data->numPlots++]), - (IFuid) NULL, name, UID_OTHER, - NULL); - /* we've added one more plot */ + { NOISE_ADD_OUTVAR(ckt, data, "onoise.%s%s", here->B4SOIname, B4SOInNames[i]); } break; case INT_NOIZ: for (i = 0; i < B4SOINSRCS; i++) - { (void) sprintf(name, "onoise_total.%s%s", - here->B4SOIname, - B4SOInNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, - &(data->namelist[data->numPlots++]), - (IFuid) NULL, name, UID_OTHER, - NULL); - /* we've added one more plot */ - - (void) sprintf(name, "inoise_total.%s%s", - here->B4SOIname, - B4SOInNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, - &(data->namelist[data->numPlots++]), - (IFuid) NULL, name, UID_OTHER, - NULL); - /* we've added one more plot */ + { NOISE_ADD_OUTVAR(ckt, data, "onoise_total.%s%s", here->B4SOIname, B4SOInNames[i]); + NOISE_ADD_OUTVAR(ckt, data, "inoise_total.%s%s", here->B4SOIname, B4SOInNames[i]); } break; } diff --git a/src/spicelib/devices/csw/cswnoise.c b/src/spicelib/devices/csw/cswnoise.c index db7188b5d..a6969c499 100644 --- a/src/spicelib/devices/csw/cswnoise.c +++ b/src/spicelib/devices/csw/cswnoise.c @@ -29,7 +29,6 @@ CSWnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *d CSWmodel *firstModel = (CSWmodel *) genmodel; CSWmodel *model; CSWinstance *inst; - char name[N_MXVLNTH]; double tempOutNoise; double tempInNoise; double noizDens; @@ -51,38 +50,12 @@ CSWnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *d switch (mode) { case N_DENS: - (void)sprintf(name,"onoise_%s",inst->CSWname); - - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ + NOISE_ADD_OUTVAR(ckt, data, "onoise_%s%s", inst->CSWname, ""); break; case INT_NOIZ: - (void)sprintf(name,"onoise_total_%s",inst->CSWname); - - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - (void)sprintf(name,"inoise_total_%s",inst->CSWname); - - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - + NOISE_ADD_OUTVAR(ckt, data, "onoise_total_%s%s", inst->CSWname, ""); + NOISE_ADD_OUTVAR(ckt, data, "inoise_total_%s%s", inst->CSWname, ""); break; } } diff --git a/src/spicelib/devices/dio/dionoise.c b/src/spicelib/devices/dio/dionoise.c index 54611d8b9..3655266ca 100644 --- a/src/spicelib/devices/dio/dionoise.c +++ b/src/spicelib/devices/dio/dionoise.c @@ -31,7 +31,6 @@ DIOnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, DIOmodel *firstModel = (DIOmodel *) genmodel; DIOmodel *model; DIOinstance *inst; - char name[N_MXVLNTH]; double tempOnoise; double tempInoise; double noizDens[DIONSRCS]; @@ -62,35 +61,14 @@ DIOnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, case N_DENS: for (i=0; i < DIONSRCS; i++) { - (void)sprintf(name,"onoise_%s%s",inst->DIOname,DIOnNames[i]); - - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - + NOISE_ADD_OUTVAR(ckt, data, "onoise_%s%s", inst->DIOname, DIOnNames[i]); } break; case INT_NOIZ: for (i=0; i < DIONSRCS; i++) { - (void)sprintf(name,"onoise_total_%s%s",inst->DIOname,DIOnNames[i]); - - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - (void)sprintf(name,"inoise_total_%s%s",inst->DIOname,DIOnNames[i]); - - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - + NOISE_ADD_OUTVAR(ckt, data, "onoise_total_%s%s", inst->DIOname, DIOnNames[i]); + NOISE_ADD_OUTVAR(ckt, data, "inoise_total_%s%s", inst->DIOname, DIOnNames[i]); } break; } diff --git a/src/spicelib/devices/hisim2/hsm2noi.c b/src/spicelib/devices/hisim2/hsm2noi.c index 95a43d5ad..3746450b6 100644 --- a/src/spicelib/devices/hisim2/hsm2noi.c +++ b/src/spicelib/devices/hisim2/hsm2noi.c @@ -80,7 +80,6 @@ int HSM2noise ( { HSM2model *model = (HSM2model *)inModel; HSM2instance *here; - char name[N_MXVLNTH]; double tempOnoise; double tempInoise; double noizDens[HSM2NSRCS]; @@ -122,35 +121,13 @@ int HSM2noise ( switch (mode) { case N_DENS: for ( i = 0; i < HSM2NSRCS; i++ ) { - (void) sprintf(name, "onoise.%s%s", - (char *)here->HSM2name, HSM2nNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid - (ckt, &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); + NOISE_ADD_OUTVAR(ckt, data, "onoise.%s%s", here->HSM2name, HSM2nNames[i]); } break; case INT_NOIZ: for ( i = 0; i < HSM2NSRCS; i++ ) { - (void) sprintf(name, "onoise_total.%s%s", - (char *)here->HSM2name, HSM2nNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid - (ckt, &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - - (void) sprintf(name, "inoise_total.%s%s", - (char *)here->HSM2name, HSM2nNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid - (ckt, &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); + NOISE_ADD_OUTVAR(ckt, data, "onoise_total.%s%s", here->HSM2name, HSM2nNames[i]); + NOISE_ADD_OUTVAR(ckt, data, "inoise_total.%s%s", here->HSM2name, HSM2nNames[i]); } break; } diff --git a/src/spicelib/devices/hisimhv1/hsmhvnoi.c b/src/spicelib/devices/hisimhv1/hsmhvnoi.c index eb6bd89a7..2c8e9f576 100644 --- a/src/spicelib/devices/hisimhv1/hsmhvnoi.c +++ b/src/spicelib/devices/hisimhv1/hsmhvnoi.c @@ -43,7 +43,6 @@ int HSMHVnoise ( { register HSMHVmodel *model = (HSMHVmodel *)inModel; register HSMHVinstance *here; - char name[N_MXVLNTH]; double tempOnoise=0.0 ; double tempInoise=0.0 ; double noizDens[HSMHVNSRCS] ; @@ -77,35 +76,13 @@ int HSMHVnoise ( switch (mode) { case N_DENS: for ( i = 0; i < HSMHVNSRCS; i++ ) { - (void) sprintf(name, "onoise.%s%s", - here->HSMHVname, HSMHVnNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) - (ckt, &(data->namelist[data->numPlots++]), - (IFuid) NULL, name, UID_OTHER, NULL); + NOISE_ADD_OUTVAR(ckt, data, "onoise.%s%s", here->HSMHVname, HSMHVnNames[i]); } break; case INT_NOIZ: for ( i = 0; i < HSMHVNSRCS; i++ ) { - (void) sprintf(name, "onoise_total.%s%s", - here->HSMHVname, HSMHVnNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) - (ckt, &(data->namelist[data->numPlots++]), - (IFuid) NULL, name, UID_OTHER, NULL); - - (void) sprintf(name, "inoise_total.%s%s", - here->HSMHVname, HSMHVnNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) - (ckt, &(data->namelist[data->numPlots++]), - (IFuid) NULL, name, UID_OTHER, NULL); + NOISE_ADD_OUTVAR(ckt, data, "onoise_total.%s%s", here->HSMHVname, HSMHVnNames[i]); + NOISE_ADD_OUTVAR(ckt, data, "inoise_total.%s%s", here->HSMHVname, HSMHVnNames[i]); } break; } diff --git a/src/spicelib/devices/hisimhv2/hsmhv2noi.c b/src/spicelib/devices/hisimhv2/hsmhv2noi.c index d9d33edbf..1c1736da4 100644 --- a/src/spicelib/devices/hisimhv2/hsmhv2noi.c +++ b/src/spicelib/devices/hisimhv2/hsmhv2noi.c @@ -85,7 +85,6 @@ int HSMHV2noise ( { HSMHV2model *model = (HSMHV2model *)inModel; HSMHV2instance *here; - char name[N_MXVLNTH]; double tempOnoise=0.0 ; double tempInoise=0.0 ; double noizDens[HSMHV2NSRCS] ; @@ -119,35 +118,13 @@ int HSMHV2noise ( switch (mode) { case N_DENS: for ( i = 0; i < HSMHV2NSRCS; i++ ) { - (void) sprintf(name, "onoise.%s%s", - (char *)here->HSMHV2name, HSMHV2nNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid - (ckt, &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); + NOISE_ADD_OUTVAR(ckt, data, "onoise.%s%s", here->HSMHV2name, HSMHV2nNames[i]); } break; case INT_NOIZ: for ( i = 0; i < HSMHV2NSRCS; i++ ) { - (void) sprintf(name, "onoise_total.%s%s", - (char *)here->HSMHV2name, HSMHV2nNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid - (ckt, &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - - (void) sprintf(name, "inoise_total.%s%s", - (char *)here->HSMHV2name, HSMHV2nNames[i]); - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) - return(E_NOMEM); - SPfrontEnd->IFnewUid - (ckt, &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); + NOISE_ADD_OUTVAR(ckt, data, "onoise_total.%s%s", here->HSMHV2name, HSMHV2nNames[i]); + NOISE_ADD_OUTVAR(ckt, data, "inoise_total.%s%s", here->HSMHV2name, HSMHV2nNames[i]); } break; } diff --git a/src/spicelib/devices/jfet/jfetnoi.c b/src/spicelib/devices/jfet/jfetnoi.c index 8f9791b40..1c35cefdd 100644 --- a/src/spicelib/devices/jfet/jfetnoi.c +++ b/src/spicelib/devices/jfet/jfetnoi.c @@ -29,7 +29,6 @@ JFETnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata * JFETmodel *firstModel = (JFETmodel *) genmodel; JFETmodel *model; JFETinstance *inst; - char name[N_MXVLNTH]; double tempOnoise; double tempInoise; double noizDens[JFETNSRCS]; @@ -62,38 +61,14 @@ JFETnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata * case N_DENS: for (i=0; i < JFETNSRCS; i++) { - (void)sprintf(name,"onoise_%s%s",inst->JFETname,JFETnNames[i]); - - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - + NOISE_ADD_OUTVAR(ckt, data, "onoise_%s%s", inst->JFETname, JFETnNames[i]); } break; case INT_NOIZ: for (i=0; i < JFETNSRCS; i++) { - (void)sprintf(name,"onoise_total_%s%s",inst->JFETname,JFETnNames[i]); - - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - (void)sprintf(name,"inoise_total_%s%s",inst->JFETname,JFETnNames[i]); - - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - + NOISE_ADD_OUTVAR(ckt, data, "onoise_total_%s%s", inst->JFETname, JFETnNames[i]); + NOISE_ADD_OUTVAR(ckt, data, "inoise_total_%s%s", inst->JFETname, JFETnNames[i]); } break; } diff --git a/src/spicelib/devices/jfet2/jfet2noi.c b/src/spicelib/devices/jfet2/jfet2noi.c index 83f094356..f3ff8b14a 100644 --- a/src/spicelib/devices/jfet2/jfet2noi.c +++ b/src/spicelib/devices/jfet2/jfet2noi.c @@ -32,7 +32,6 @@ JFET2noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata JFET2model *firstModel = (JFET2model *) genmodel; JFET2model *model; JFET2instance *inst; - char name[N_MXVLNTH]; double tempOnoise; double tempInoise; double noizDens[JFET2NSRCS]; @@ -66,43 +65,14 @@ JFET2noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata case N_DENS: for (i=0; i < JFET2NSRCS; i++) { - (void)sprintf(name,"onoise_%s%s",inst->JFET2name,JFET2nNames[i]); - - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - + NOISE_ADD_OUTVAR(ckt, data, "onoise_%s%s", inst->JFET2name, JFET2nNames[i]); } break; case INT_NOIZ: for (i=0; i < JFET2NSRCS; i++) { - (void)sprintf(name,"onoise_total_%s%s",inst->JFET2name,JFET2nNames[i]); - - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - - (void)sprintf(name,"inoise_total_%s%s",inst->JFET2name,JFET2nNames[i]); - - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - + NOISE_ADD_OUTVAR(ckt, data, "onoise_total_%s%s", inst->JFET2name, JFET2nNames[i]); + NOISE_ADD_OUTVAR(ckt, data, "inoise_total_%s%s", inst->JFET2name, JFET2nNames[i]); } break; } diff --git a/src/spicelib/devices/mes/mesnoise.c b/src/spicelib/devices/mes/mesnoise.c index df2a5c764..e4193cece 100644 --- a/src/spicelib/devices/mes/mesnoise.c +++ b/src/spicelib/devices/mes/mesnoise.c @@ -29,7 +29,6 @@ MESnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *d MESmodel *firstModel = (MESmodel *) genmodel; MESmodel *model; MESinstance *inst; - char name[N_MXVLNTH]; double tempOnoise; double tempInoise; double noizDens[MESNSRCS]; @@ -61,48 +60,14 @@ MESnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *d case N_DENS: for (i=0; i < MESNSRCS; i++) { - (void)sprintf(name,"onoise_%s%s",inst->MESname,MESnNames[i]); - - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - + NOISE_ADD_OUTVAR(ckt, data, "onoise_%s%s", inst->MESname, MESnNames[i]); } break; case INT_NOIZ: for (i=0; i < MESNSRCS; i++) { - (void)sprintf(name,"onoise_total_%s%s",inst->MESname,MESnNames[i]); - - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - - (void)sprintf(name,"inoise_total_%s%s",inst->MESname,MESnNames[i]); - - /* - OUTname(name,SV_INPUT_NOISE_V_SQ); - data->numPlots += 2; - */ - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - + NOISE_ADD_OUTVAR(ckt, data, "onoise_total_%s%s", inst->MESname, MESnNames[i]); + NOISE_ADD_OUTVAR(ckt, data, "inoise_total_%s%s", inst->MESname, MESnNames[i]); } break; } diff --git a/src/spicelib/devices/mos1/mos1noi.c b/src/spicelib/devices/mos1/mos1noi.c index 43548b175..31f171966 100644 --- a/src/spicelib/devices/mos1/mos1noi.c +++ b/src/spicelib/devices/mos1/mos1noi.c @@ -30,7 +30,6 @@ MOS1noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, MOS1model *firstModel = (MOS1model *) genmodel; MOS1model *model; MOS1instance *inst; - char name[N_MXVLNTH]; double coxSquared; double tempOnoise; double tempInoise; @@ -73,43 +72,14 @@ MOS1noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, case N_DENS: for (i=0; i < MOS1NSRCS; i++) { - (void)sprintf(name,"onoise_%s%s",inst->MOS1name,MOS1nNames[i]); - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - + NOISE_ADD_OUTVAR(ckt, data, "onoise_%s%s", inst->MOS1name, MOS1nNames[i]); } break; case INT_NOIZ: for (i=0; i < MOS1NSRCS; i++) { - (void)sprintf(name,"onoise_total_%s%s",inst->MOS1name,MOS1nNames[i]); - - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - - (void)sprintf(name,"inoise_total_%s%s",inst->MOS1name,MOS1nNames[i]); - - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - + NOISE_ADD_OUTVAR(ckt, data, "onoise_total_%s%s", inst->MOS1name, MOS1nNames[i]); + NOISE_ADD_OUTVAR(ckt, data, "inoise_total_%s%s", inst->MOS1name, MOS1nNames[i]); } break; } diff --git a/src/spicelib/devices/mos2/mos2noi.c b/src/spicelib/devices/mos2/mos2noi.c index b7b81a22a..ecfbf01cc 100644 --- a/src/spicelib/devices/mos2/mos2noi.c +++ b/src/spicelib/devices/mos2/mos2noi.c @@ -30,7 +30,6 @@ MOS2noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, MOS2model *firstModel = (MOS2model *) genmodel; MOS2model *model; MOS2instance *inst; - char name[N_MXVLNTH]; double tempOnoise; double tempInoise; double noizDens[MOS2NSRCS]; @@ -62,44 +61,14 @@ MOS2noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, case N_DENS: for (i=0; i < MOS2NSRCS; i++) { - (void)sprintf(name,"onoise_%s%s",inst->MOS2name,MOS2nNames[i]); - - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - + NOISE_ADD_OUTVAR(ckt, data, "onoise_%s%s", inst->MOS2name, MOS2nNames[i]); } break; case INT_NOIZ: for (i=0; i < MOS2NSRCS; i++) { - (void)sprintf(name,"onoise_total_%s%s",inst->MOS2name,MOS2nNames[i]); - - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - - (void)sprintf(name,"inoise_total_%s%s",inst->MOS2name,MOS2nNames[i]); - - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - + NOISE_ADD_OUTVAR(ckt, data, "onoise_total_%s%s", inst->MOS2name, MOS2nNames[i]); + NOISE_ADD_OUTVAR(ckt, data, "inoise_total_%s%s", inst->MOS2name, MOS2nNames[i]); } break; } diff --git a/src/spicelib/devices/mos3/mos3noi.c b/src/spicelib/devices/mos3/mos3noi.c index ad03005fd..383c7a6f8 100644 --- a/src/spicelib/devices/mos3/mos3noi.c +++ b/src/spicelib/devices/mos3/mos3noi.c @@ -30,7 +30,6 @@ MOS3noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, MOS3model *firstModel = (MOS3model *) genmodel; MOS3model *model; MOS3instance *inst; - char name[N_MXVLNTH]; double tempOnoise; double tempInoise; double noizDens[MOS3NSRCS]; @@ -62,45 +61,14 @@ MOS3noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, case N_DENS: for (i=0; i < MOS3NSRCS; i++) { - (void)sprintf(name,"onoise_%s%s",inst->MOS3name,MOS3nNames[i]); - - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - + NOISE_ADD_OUTVAR(ckt, data, "onoise_%s%s", inst->MOS3name, MOS3nNames[i]); } break; case INT_NOIZ: for (i=0; i < MOS3NSRCS; i++) { - (void)sprintf(name,"onoise_total_%s%s",inst->MOS3name,MOS3nNames[i]); - - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - - (void)sprintf(name,"inoise_total_%s%s",inst->MOS3name,MOS3nNames[i]); - - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - - + NOISE_ADD_OUTVAR(ckt, data, "onoise_total_%s%s", inst->MOS3name, MOS3nNames[i]); + NOISE_ADD_OUTVAR(ckt, data, "inoise_total_%s%s", inst->MOS3name, MOS3nNames[i]); } break; } diff --git a/src/spicelib/devices/mos9/mos9noi.c b/src/spicelib/devices/mos9/mos9noi.c index 2cd9dd684..92b750870 100644 --- a/src/spicelib/devices/mos9/mos9noi.c +++ b/src/spicelib/devices/mos9/mos9noi.c @@ -30,7 +30,6 @@ MOS9noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, MOS9model *firstModel = (MOS9model *) genmodel; MOS9model *model; MOS9instance *inst; - char name[N_MXVLNTH]; double tempOnoise; double tempInoise; double noizDens[MOS9NSRCS]; @@ -62,45 +61,14 @@ MOS9noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, case N_DENS: for (i=0; i < MOS9NSRCS; i++) { - (void)sprintf(name,"onoise_%s%s",inst->MOS9name,MOS9nNames[i]); - - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - + NOISE_ADD_OUTVAR(ckt, data, "onoise_%s%s", inst->MOS9name, MOS9nNames[i]); } break; case INT_NOIZ: for (i=0; i < MOS9NSRCS; i++) { - (void)sprintf(name,"onoise_total_%s%s",inst->MOS9name,MOS9nNames[i]); - - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - - (void)sprintf(name,"inoise_total_%s%s",inst->MOS9name,MOS9nNames[i]); - - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - - + NOISE_ADD_OUTVAR(ckt, data, "onoise_total_%s%s", inst->MOS9name, MOS9nNames[i]); + NOISE_ADD_OUTVAR(ckt, data, "inoise_total_%s%s", inst->MOS9name, MOS9nNames[i]); } break; } diff --git a/src/spicelib/devices/res/resnoise.c b/src/spicelib/devices/res/resnoise.c index 8c538f95e..f825094ed 100644 --- a/src/spicelib/devices/res/resnoise.c +++ b/src/spicelib/devices/res/resnoise.c @@ -35,7 +35,6 @@ RESnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, RESmodel *firstModel = (RESmodel *) genmodel; RESmodel *model; RESinstance *inst; - char name[N_MXVLNTH]; double tempOutNoise; double tempInNoise; double noizDens[RESNSRCS]; @@ -73,43 +72,14 @@ RESnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, case N_DENS: for (i=0; i < RESNSRCS; i++) { - (void)sprintf(name,"onoise_%s%s", - inst->RESname, RESnNames[i]); - - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ + NOISE_ADD_OUTVAR(ckt, data, "onoise_%s%s", inst->RESname, RESnNames[i]); } break; case INT_NOIZ: for (i=0; i < RESNSRCS; i++) { - (void)sprintf(name,"onoise_total_%s%s", - inst->RESname, RESnNames[i]); - - - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - - (void)sprintf(name,"inoise_total_%s%s", - inst->RESname,RESnNames[i]); - - - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - + NOISE_ADD_OUTVAR(ckt, data, "onoise_total_%s%s", inst->RESname, RESnNames[i]); + NOISE_ADD_OUTVAR(ckt, data, "inoise_total_%s%s", inst->RESname, RESnNames[i]); } break; } diff --git a/src/spicelib/devices/soi3/soi3nois.c b/src/spicelib/devices/soi3/soi3nois.c index 14b010ba1..6f54bf596 100644 --- a/src/spicelib/devices/soi3/soi3nois.c +++ b/src/spicelib/devices/soi3/soi3nois.c @@ -49,7 +49,6 @@ SOI3noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, SOI3model *firstModel = (SOI3model *) genmodel; SOI3model *model; SOI3instance *inst; - char name[N_MXVLNTH]; double tempOnoise; double tempInoise; double noizDens[SOI3NSRCS]; @@ -85,44 +84,14 @@ SOI3noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, case N_DENS: for (i=0; i < SOI3NSRCS; i++) { - - (void)sprintf(name,"onoise_%s%s",inst->SOI3name,SOI3nNames[i]); - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - + NOISE_ADD_OUTVAR(ckt, data, "onoise_%s%s", inst->SOI3name, SOI3nNames[i]); } break; case INT_NOIZ: for (i=0; i < SOI3NSRCS; i++) { - - (void)sprintf(name,"onoise_total_%s%s",inst->SOI3name,SOI3nNames[i]); - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - (void)sprintf(name,"inoise_total_%s%s",inst->SOI3name,SOI3nNames[i]); - - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - - + NOISE_ADD_OUTVAR(ckt, data, "onoise_total_%s%s", inst->SOI3name, SOI3nNames[i]); + NOISE_ADD_OUTVAR(ckt, data, "inoise_total_%s%s", inst->SOI3name, SOI3nNames[i]); } break; } diff --git a/src/spicelib/devices/sw/swnoise.c b/src/spicelib/devices/sw/swnoise.c index b7f1e7b3a..1d6e79e5a 100644 --- a/src/spicelib/devices/sw/swnoise.c +++ b/src/spicelib/devices/sw/swnoise.c @@ -29,7 +29,6 @@ SWnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *da SWmodel *firstModel = (SWmodel *) genmodel; SWmodel *model; SWinstance *inst; - char name[N_MXVLNTH]; double tempOutNoise; double tempInNoise; double noizDens; @@ -51,42 +50,12 @@ SWnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *da switch (mode) { case N_DENS: - (void)sprintf(name,"onoise_%s",inst->SWname); - - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - + NOISE_ADD_OUTVAR(ckt, data, "onoise_%s%s", inst->SWname, ""); break; case INT_NOIZ: - (void)sprintf(name,"onoise_total_%s",inst->SWname); - - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - - (void)sprintf(name,"inoise_total_%s",inst->SWname); - - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - + NOISE_ADD_OUTVAR(ckt, data, "onoise_total_%s%s", inst->SWname, ""); + NOISE_ADD_OUTVAR(ckt, data, "inoise_total_%s%s", inst->SWname, ""); break; } } diff --git a/src/spicelib/devices/vbic/vbicnoise.c b/src/spicelib/devices/vbic/vbicnoise.c index 367d55cc7..04383cab3 100644 --- a/src/spicelib/devices/vbic/vbicnoise.c +++ b/src/spicelib/devices/vbic/vbicnoise.c @@ -31,7 +31,6 @@ VBICnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata * VBICmodel *firstModel = (VBICmodel *) genmodel; VBICmodel *model; VBICinstance *inst; - char name[N_MXVLNTH]; double tempOnoise; double tempInoise; double noizDens[VBICNSRCS]; @@ -75,40 +74,14 @@ VBICnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata * case N_DENS: for (i=0; i < VBICNSRCS; i++) { - (void)sprintf(name,"onoise_%s%s", - inst->VBICname,VBICnNames[i]); - - - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ + NOISE_ADD_OUTVAR(ckt, data, "onoise_%s%s", inst->VBICname, VBICnNames[i]); } break; case INT_NOIZ: for (i=0; i < VBICNSRCS; i++) { - (void)sprintf(name,"onoise_total_%s%s", - inst->VBICname,VBICnNames[i]); - - data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ - - (void)sprintf(name,"inoise_total_%s%s", - inst->VBICname,VBICnNames[i]); - -data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); -if (!data->namelist) return(E_NOMEM); - SPfrontEnd->IFnewUid (ckt, - &(data->namelist[data->numPlots++]), - NULL, name, UID_OTHER, NULL); - /* we've added one more plot */ + NOISE_ADD_OUTVAR(ckt, data, "onoise_total_%s%s", inst->VBICname, VBICnNames[i]); + NOISE_ADD_OUTVAR(ckt, data, "inoise_total_%s%s", inst->VBICname, VBICnNames[i]); } break; }