epilectrik
/
pyNgSpice
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

noisean.c, beautify the code

pre-master-46
Holger Vogt 8 years ago
parent
f640ef68c3
commit
66c468087d
1 changed files with 166 additions and 168 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 334
      src/spicelib/analysis/noisean.c

334
src/spicelib/analysis/noisean.c
View File

@ -30,10 +30,10 @@ extern int fixme_inoise_type;
int int
NOISEan (CKTcircuit *ckt, int restart) NOISEan (CKTcircuit *ckt, int restart)
{ {
static Ndata *data; /* va, must be static, for continuation of
* interrupted(Ctrl-C), longer lasting noise
* analysis
*/
/* variable must be static, for continuation of interrupted (Ctrl-C),
longer lasting noise anlysis */
static Ndata *data;
double realVal; double realVal;
double imagVal; double imagVal;
int error; int error;
@ -51,37 +51,35 @@ NOISEan (CKTcircuit *ckt, int restart)
posOutNode = (job->output) -> number; posOutNode = (job->output) -> number;
negOutNode = (job->outputRef) -> number; negOutNode = (job->outputRef) -> number;
if (job->NnumSteps < 1) {
SPfrontEnd->IFerrorf(ERR_WARNING,
"Number of steps for noise measurement has to be larger than 0,\n but currently is %d\n",
job->NnumSteps);
return(E_PARMVAL);
}
else if ((job->NnumSteps == 1) && (job->NstpType == LINEAR)) {
if (!frequequal) {
job->NstopFreq = job->NstartFreq;
SPfrontEnd->IFerrorf(ERR_WARNING,
"Noise measurement at a single frequency %g only!\n",
job->NstartFreq);
}
}
else {
if (frequequal) {
job->NstopFreq = job->NstartFreq;
job->NnumSteps = 1;
SPfrontEnd->IFerrorf(ERR_WARNING,
"Noise measurement at a single frequency %g only!\n",
job->NstartFreq);
}
}
if (job->NnumSteps < 1) {
SPfrontEnd->IFerrorf(ERR_WARNING,
"Number of steps for noise measurement has to be larger than 0,\n but currently is %d\n",
job->NnumSteps);
return(E_PARMVAL);
} else if ((job->NnumSteps == 1) && (job->NstpType == LINEAR)) {
if (!frequequal) {
job->NstopFreq = job->NstartFreq;
SPfrontEnd->IFerrorf(ERR_WARNING,
"Noise measurement at a single frequency %g only!\n",
job->NstartFreq);
}
} else {
if (frequequal) {
job->NstopFreq = job->NstartFreq;
job->NnumSteps = 1;
SPfrontEnd->IFerrorf(ERR_WARNING,
"Noise measurement at a single frequency %g only!\n",
job->NstartFreq);
}
}
/* see if the source specified is AC */ /* see if the source specified is AC */
{ {
bool ac_given = FALSE; bool ac_given = FALSE;
if (!inst || inst->GENmodPtr->GENmodType < 0) { if (!inst || inst->GENmodPtr->GENmodType < 0) {
SPfrontEnd->IFerrorf (ERR_WARNING, SPfrontEnd->IFerrorf (ERR_WARNING,
"Noise input source %s not in circuit",
job->input);
"Noise input source %s not in circuit",
job->input);
return E_NOTFOUND; return E_NOTFOUND;
} }
@ -93,93 +91,93 @@ NOISEan (CKTcircuit *ckt, int restart)
src_type = SV_CURRENT; src_type = SV_CURRENT;
} else { } else {
SPfrontEnd->IFerrorf (ERR_WARNING, SPfrontEnd->IFerrorf (ERR_WARNING,
"Noise input source %s is not of proper type",
job->input);
"Noise input source %s is not of proper type",
job->input);
return E_NOTFOUND; return E_NOTFOUND;
} }
if (!ac_given) { if (!ac_given) {
SPfrontEnd->IFerrorf (ERR_WARNING, SPfrontEnd->IFerrorf (ERR_WARNING,
"Noise input source %s has no AC value",
job->input);
"Noise input source %s has no AC value",
job->input);
return E_NOACINPUT; return E_NOACINPUT;
} }
} }
if ( (job->NsavFstp == 0.0) || restart) { /* va, NsavFstp is double */ if ( (job->NsavFstp == 0.0) || restart) { /* va, NsavFstp is double */
switch (job->NstpType) {
switch (job->NstpType) {
case DECADE: case DECADE:
job->NfreqDelta = exp(log(10.0)/ job->NfreqDelta = exp(log(10.0)/
job->NnumSteps);
job->NnumSteps);
break; break;
case OCTAVE: case OCTAVE:
job->NfreqDelta = exp(log(2.0)/ job->NfreqDelta = exp(log(2.0)/
job->NnumSteps);
job->NnumSteps);
break; break;
case LINEAR: case LINEAR:
if (job->NnumSteps == 1)
job->NfreqDelta = 0;
else
if (job->NnumSteps == 1)
job->NfreqDelta = 0;
else
job->NfreqDelta = (job->NstopFreq - job->NfreqDelta = (job->NstopFreq -
job->NstartFreq) / (job->NnumSteps - 1);
job->NstartFreq) / (job->NnumSteps - 1);
break; break;
default: default:
return(E_BADPARM); return(E_BADPARM);
} }
/* error = DCop(ckt); */
error = CKTop(ckt, (ckt->CKTmode & MODEUIC) | MODEDCOP | MODEINITJCT,
(ckt->CKTmode & MODEUIC) | MODEDCOP | MODEINITFLOAT,
ckt->CKTdcMaxIter);
/* error = DCop(ckt); */
error = CKTop(ckt, (ckt->CKTmode & MODEUIC) | MODEDCOP | MODEINITJCT,
(ckt->CKTmode & MODEUIC) | MODEDCOP | MODEINITFLOAT,
ckt->CKTdcMaxIter);
if (error) return(error);
if (error) return(error);
/* Patch to noisean.c by Richard D. McRoberts. */
ckt->CKTmode = (ckt->CKTmode & MODEUIC) | MODEDCOP | MODEINITSMSIG;
error = CKTload(ckt);
if(error) return(error);
/* Patch to noisean.c by Richard D. McRoberts. */
ckt->CKTmode = (ckt->CKTmode & MODEUIC) | MODEDCOP | MODEINITSMSIG;
error = CKTload(ckt);
if(error) return(error);
data = TMALLOC(Ndata, 1);
step = 0;
data->freq = job->NstartFreq;
data->outNoiz = 0.0;
data->inNoise = 0.0;
data->squared = cp_getvar("sqrnoise", CP_BOOL, NULL, 0) ? 1 : 0;
data = TMALLOC(Ndata, 1);
step = 0;
data->freq = job->NstartFreq;
data->outNoiz = 0.0;
data->inNoise = 0.0;
data->squared = cp_getvar("sqrnoise", CP_BOOL, NULL, 0) ? 1 : 0;
/* the current front-end needs the namelist to be fully
declared before an OUTpBeginplot */
/* the current front-end needs the namelist to be fully
declared before an OUTpBeginplot */
SPfrontEnd->IFnewUid (ckt, &freqUid, NULL, "frequency", UID_OTHER, NULL);
SPfrontEnd->IFnewUid (ckt, &freqUid, NULL, "frequency", UID_OTHER, NULL);
data->numPlots = 0; /* we don't have any plots yet */
data->numPlots = 0; /* we don't have any plots yet */
error = CKTnoise(ckt,N_DENS,N_OPEN,data); error = CKTnoise(ckt,N_DENS,N_OPEN,data);
if (error) return(error); if (error) return(error);
/*
* all names in the namelist have been declared. now start the
* plot
*/
/*
* all names in the namelist have been declared. now start the
* plot
*/
if (src_type == SV_VOLTAGE)
fixme_inoise_type =
if (src_type == SV_VOLTAGE)
fixme_inoise_type =
data->squared ? SV_SQR_VOLTAGE_DENSITY : SV_VOLTAGE_DENSITY; data->squared ? SV_SQR_VOLTAGE_DENSITY : SV_VOLTAGE_DENSITY;
else
fixme_inoise_type =
else
fixme_inoise_type =
data->squared ? SV_SQR_CURRENT_DENSITY : SV_CURRENT_DENSITY; data->squared ? SV_SQR_CURRENT_DENSITY : SV_CURRENT_DENSITY;
fixme_onoise_type =
fixme_onoise_type =
data->squared ? SV_SQR_VOLTAGE_DENSITY : SV_VOLTAGE_DENSITY; data->squared ? SV_SQR_VOLTAGE_DENSITY : SV_VOLTAGE_DENSITY;
if (!data->squared)
for (i = 0; i < data->numPlots; i++)
data->squared_value[i] =
ciprefix("inoise", data->namelist[i]) ||
ciprefix("onoise", data->namelist[i]);
if (!data->squared)
for (i = 0; i < data->numPlots; i++)
data->squared_value[i] =
ciprefix("inoise", data->namelist[i]) ||
ciprefix("onoise", data->namelist[i]);
error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob, error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
data->squared data->squared
@ -189,41 +187,41 @@ NOISEan (CKTcircuit *ckt, int restart)
freqUid, IF_REAL, freqUid, IF_REAL,
data->numPlots, data->namelist, IF_REAL, data->numPlots, data->namelist, IF_REAL,
&(data->NplotPtr)); &(data->NplotPtr));
if (error) return(error);
if (error) return(error);
if (job->NstpType != LINEAR) { if (job->NstpType != LINEAR) {
SPfrontEnd->OUTattributes (data->NplotPtr, NULL, OUT_SCALE_LOG, NULL);
}
SPfrontEnd->OUTattributes (data->NplotPtr, NULL, OUT_SCALE_LOG, NULL);
}
} else { /* we must have paused before. pick up where we left off */ } else { /* we must have paused before. pick up where we left off */
step = (int)(job->NsavFstp);
switch (job->NstpType) {
step = (int)(job->NsavFstp);
switch (job->NstpType) {
case DECADE:
case DECADE:
case OCTAVE: case OCTAVE:
data->freq = job->NstartFreq * exp (step *
log (job->NfreqDelta));
data->freq = job->NstartFreq * exp (step *
log (job->NfreqDelta));
break; break;
case LINEAR: case LINEAR:
data->freq = job->NstartFreq + step *
job->NfreqDelta;
data->freq = job->NstartFreq + step *
job->NfreqDelta;
break; break;
default: default:
return(E_BADPARM); return(E_BADPARM);
} }
job->NsavFstp = 0;
data->outNoiz = job->NsavOnoise;
data->inNoise = job->NsavInoise;
/* saj resume rawfile fix*/
job->NsavFstp = 0;
data->outNoiz = job->NsavOnoise;
data->inNoise = job->NsavInoise;
/* saj resume rawfile fix*/
error = SPfrontEnd->OUTpBeginPlot (NULL, NULL, error = SPfrontEnd->OUTpBeginPlot (NULL, NULL,
NULL, NULL,
NULL, 0, NULL, 0,
666, NULL, 666, 666, NULL, 666,
&(data->NplotPtr)); &(data->NplotPtr));
/*saj*/
/*saj*/
} }
switch (job->NstpType) { switch (job->NstpType) {
@ -244,111 +242,111 @@ NOISEan (CKTcircuit *ckt, int restart)
while (data->freq <= job->NstopFreq + freqTol) { while (data->freq <= job->NstopFreq + freqTol) {
if(SPfrontEnd->IFpauseTest()) { if(SPfrontEnd->IFpauseTest()) {
job->NsavFstp = step; /* save our results */
job->NsavOnoise = data->outNoiz; /* up until now */
job->NsavInoise = data->inNoise;
return (E_PAUSE);
job->NsavFstp = step; /* save our results */
job->NsavOnoise = data->outNoiz; /* up until now */
job->NsavInoise = data->inNoise;
return (E_PAUSE);
} }
ckt->CKTomega = 2.0 * M_PI * data->freq;
ckt->CKTmode = (ckt->CKTmode & MODEUIC) | MODEAC | MODEACNOISE;
ckt->noise_input = inst;
/*
* solve the original AC system to get the transfer
* function between the input and output
*/
NIacIter(ckt);
realVal = ckt->CKTrhsOld [posOutNode]
- ckt->CKTrhsOld [negOutNode];
imagVal = ckt->CKTirhsOld [posOutNode]
- ckt->CKTirhsOld [negOutNode];
data->GainSqInv = 1.0 / MAX(((realVal*realVal)
+ (imagVal*imagVal)),N_MINGAIN);
data->lnGainInv = log(data->GainSqInv);
/* set up a block of "common" data so we don't have to
* recalculate it for every device
*/
data->delFreq = data->freq - data->lstFreq;
data->lnFreq = log(MAX(data->freq,N_MINLOG));
data->lnLastFreq = log(MAX(data->lstFreq,N_MINLOG));
ckt->CKTomega = 2.0 * M_PI * data->freq;
ckt->CKTmode = (ckt->CKTmode & MODEUIC) | MODEAC | MODEACNOISE;
ckt->noise_input = inst;
/*
* solve the original AC system to get the transfer
* function between the input and output
*/
NIacIter(ckt);
realVal = ckt->CKTrhsOld [posOutNode]
- ckt->CKTrhsOld [negOutNode];
imagVal = ckt->CKTirhsOld [posOutNode]
- ckt->CKTirhsOld [negOutNode];
data->GainSqInv = 1.0 / MAX(((realVal*realVal)
+ (imagVal*imagVal)),N_MINGAIN);
data->lnGainInv = log(data->GainSqInv);
/* set up a block of "common" data so we don't have to
* recalculate it for every device
*/
data->delFreq = data->freq - data->lstFreq;
data->lnFreq = log(MAX(data->freq,N_MINLOG));
data->lnLastFreq = log(MAX(data->lstFreq,N_MINLOG));
data->delLnFreq = data->lnFreq - data->lnLastFreq; data->delLnFreq = data->lnFreq - data->lnLastFreq;
if ((job->NStpsSm != 0) && ((step % (job->NStpsSm)) == 0)) {
data->prtSummary = TRUE;
if ((job->NStpsSm != 0) && ((step % (job->NStpsSm)) == 0)) {
data->prtSummary = TRUE;
} else { } else {
data->prtSummary = FALSE;
data->prtSummary = FALSE;
} }
/*
data->outNumber = 1;
*/
/*
data->outNumber = 1;
*/
data->outNumber = 0;
/* the frequency will NOT be stored in array[0] as before; instead,
* it will be given in refVal.rValue (see later)
*/
data->outNumber = 0;
/* the frequency will NOT be stored in array[0] as before; instead,
* it will be given in refVal.rValue (see later)
*/
NInzIter(ckt,posOutNode,negOutNode); /* solve the adjoint system */
NInzIter(ckt,posOutNode,negOutNode); /* solve the adjoint system */
/* now we use the adjoint system to calculate the noise
* contributions of each generator in the circuit
*/
/* now we use the adjoint system to calculate the noise
* contributions of each generator in the circuit
*/
error = CKTnoise(ckt,N_DENS,N_CALC,data);
if (error) return(error);
data->lstFreq = data->freq;
error = CKTnoise(ckt,N_DENS,N_CALC,data);
if (error) return(error);
data->lstFreq = data->freq;
/* update the frequency */
/* update the frequency */
switch (job->NstpType) {
switch (job->NstpType) {
case DECADE:
case OCTAVE:
data->freq *= job->NfreqDelta;
break;
case DECADE:
case OCTAVE:
data->freq *= job->NfreqDelta;
break;
case LINEAR: case LINEAR:
data->freq += job->NfreqDelta;
break;
default:
return(E_INTERN);
data->freq += job->NfreqDelta;
break;
default:
return(E_INTERN);
} }
step++;
step++;
if ((job->NnumSteps == 1) && (job->NstpType == LINEAR))
break;
if ((job->NnumSteps == 1) && (job->NstpType == LINEAR))
break;
} }
error = CKTnoise(ckt,N_DENS,N_CLOSE,data); error = CKTnoise(ckt,N_DENS,N_CLOSE,data);
if (error) return(error); if (error) return(error);
data->numPlots = 0; data->numPlots = 0;
data->outNumber = 0; data->outNumber = 0;
if (job->NstartFreq != job->NstopFreq) { if (job->NstartFreq != job->NstopFreq) {
error = CKTnoise(ckt,INT_NOIZ,N_OPEN,data);
error = CKTnoise(ckt,INT_NOIZ,N_OPEN,data);
if (error) return(error);
if (error) return(error);
if (src_type == SV_VOLTAGE)
fixme_inoise_type =
if (src_type == SV_VOLTAGE)
fixme_inoise_type =
data->squared ? SV_SQR_VOLTAGE : SV_VOLTAGE; data->squared ? SV_SQR_VOLTAGE : SV_VOLTAGE;
else
fixme_inoise_type =
else
fixme_inoise_type =
data->squared ? SV_SQR_CURRENT : SV_CURRENT; data->squared ? SV_SQR_CURRENT : SV_CURRENT;
fixme_onoise_type =
data->squared ? SV_SQR_VOLTAGE : SV_VOLTAGE;
fixme_onoise_type =
data->squared ? SV_SQR_VOLTAGE : SV_VOLTAGE;
if (!data->squared)
for (i = 0; i < data->numPlots; i++)
data->squared_value[i] =
ciprefix("inoise", data->namelist[i]) ||
ciprefix("onoise", data->namelist[i]);
if (!data->squared)
for (i = 0; i < data->numPlots; i++)
data->squared_value[i] =
ciprefix("inoise", data->namelist[i]) ||
ciprefix("onoise", data->namelist[i]);
SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob, SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
data->squared data->squared
@ -358,11 +356,11 @@ NOISEan (CKTcircuit *ckt, int restart)
data->numPlots, data->namelist, IF_REAL, data->numPlots, data->namelist, IF_REAL,
&(data->NplotPtr)); &(data->NplotPtr));
error = CKTnoise(ckt,INT_NOIZ,N_CALC,data);
if (error) return(error);
error = CKTnoise(ckt,INT_NOIZ,N_CALC,data);
if (error) return(error);
error = CKTnoise(ckt,INT_NOIZ,N_CLOSE,data);
if (error) return(error);
error = CKTnoise(ckt,INT_NOIZ,N_CLOSE,data);
if (error) return(error);
} }
FREE(data); FREE(data);

Write Preview
Loading…
Cancel
Save