SIM/qucs_s
1
0
Fork 0
mirror of https://github.com/ra3xdh/qucs_s synced 2025-03-28 21:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Full implementation of .NOISE

Browse Source
This commit is contained in:
Vadim Kuznetzov 2015-05-29 15:56:22 +03:00
parent 32e35cf0a4
commit 69a11d11e3
4 changed files with 41 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qucs/components/sp_noise.cpp
View File

@ -84,7 +84,7 @@ QString SpiceNoise::spice_netlist(bool isXyce)
s = QString("NOISE %1 %2 %3 %4 %5 %6\n").arg(Props.at(4)->Value).arg(Props.at(5)->Value)
.arg(Props.at(0)->Value).arg(Props.at(3)->Value)
.arg(fstart).arg(fstop);
s += QString("PRINT inoise_total onoise_total > spice4qucs.cir.noise\n");
s += QString("PRINT inoise_total onoise_total >> spice4qucs.cir.noise\n");
} else {
s.clear();
}

33
qucs/extsimkernels/abstractspicekernel.cpp
View File

@ -373,23 +373,26 @@ void AbstractSpiceKernel::parseFourierOutput(QString ngspice_file, QList<QList<d
/*!
* \brief AbstractSpiceKernel::parseNoiseOutput Parse output of .NOISE simulation.
* \param ngspice_file Spice output file name
* \param sim_points 2D array in which simulation points should be extracted. All simulation
* \param[in] ngspice_file Spice output file name
* \param[out] sim_points 2D array in which simulation points should be extracted. All simulation
* points from all sweep variable steps are extracted in a single array
* \param var_list This list is filled by simualtion variables. There is a list of dependent
* \param[out] var_list This list is filled by simualtion variables. There is a list of dependent
* and independent varibales. An independent variable is the first in list.
* \param[out] ParSwp Set to true if there was parameter sweep
*/
void AbstractSpiceKernel::parseNoiseOutput(QString ngspice_file, QList<QList<double> > &sim_points,
QStringList &var_list)
QStringList &var_list, bool &ParSwp)
{
var_list.append(""); // dummy indep var
var_list.append("inoise_total");
var_list.append("onoise_total");
ParSwp = false;
QFile ofile(ngspice_file);
if (ofile.open(QFile::ReadOnly)) {
QTextStream ngsp_data(&ofile);
sim_points.clear();
int cnt = 0;
while (!ngsp_data.atEnd()) {
QString line = ngsp_data.readLine();
if (line.contains('=')) {
@ -399,8 +402,10 @@ void AbstractSpiceKernel::parseNoiseOutput(QString ngspice_file, QList<QList<dou
line = ngsp_data.readLine();
sim_point.append(line.section('=',1,1).toDouble());
sim_points.append(sim_point);
cnt++;
}
}
if (cnt>1) ParSwp = true;
ofile.close();
}
}
@ -607,7 +612,12 @@ void AbstractSpiceKernel::convertToQucsData(const QString &qucs_dataset, bool xy
parseFourierOutput(full_outfile,sim_points,var_list,xyce);
} else if (ngspice_output_filename.endsWith(".noise")) {
isComplex = false;
parseNoiseOutput(full_outfile,sim_points,var_list);
parseNoiseOutput(full_outfile,sim_points,var_list,hasParSweep);
if (hasParSweep) {
QString res_file = QDir::convertSeparators(workdir + QDir::separator()
+ "spice4qucs.noise.cir.res");
parseResFile(res_file,swp_var,swp_var_val);
}
} else if (ngspice_output_filename.endsWith("_swp.txt")) {
hasParSweep = true;
QString simstr = full_outfile;
@ -654,18 +664,21 @@ void AbstractSpiceKernel::convertToQucsData(const QString &qucs_dataset, bool xy
int indep_cnt;
if (hasDblParSweep) indep_cnt = sim_points.count()/(swp_var_val.count()*swp_var2_val.count());
else indep_cnt = sim_points.count()/swp_var_val.count();
ds_stream<<QString("<indep %1 %2>\n").arg(indep).arg(indep_cnt); // output indep var: TODO: parameter sweep
for (int i=0;i<indep_cnt;i++) {
ds_stream<<QString::number(sim_points.at(i).at(0),'e',12)<<endl;
if (!indep.isEmpty()) {
ds_stream<<QString("<indep %1 %2>\n").arg(indep).arg(indep_cnt); // output indep var: TODO: parameter sweep
for (int i=0;i<indep_cnt;i++) {
ds_stream<<QString::number(sim_points.at(i).at(0),'e',12)<<endl;
}
ds_stream<<"</indep>\n";
}
ds_stream<<"</indep>\n";
ds_stream<<QString("<indep %1 %2>\n").arg(swp_var).arg(swp_var_val.count());
foreach (QString val,swp_var_val) {
ds_stream<<val<<endl;
}
ds_stream<<"</indep>\n";
indep += " " + swp_var;
if (indep.isEmpty()) indep = swp_var;
else indep += " " + swp_var;
if (hasDblParSweep) {
ds_stream<<QString("<indep %1 %2>\n").arg(swp_var2).arg(swp_var2_val.count());
foreach (QString val,swp_var2_val) {

2
qucs/extsimkernels/abstractspicekernel.h
View File

@ -71,7 +71,7 @@ public:
void parseFourierOutput(QString ngspice_file, QList< QList<double> > &sim_points,
QStringList &var_list, bool xyce);
void parseNoiseOutput(QString ngspice_file, QList< QList<double> > &sim_points,
QStringList &var_list);
QStringList &var_list, bool &ParSwp);
void parseSTEPOutput(QString ngspice_file,
QList< QList<double> > &sim_points,
QStringList &var_list, bool &isComplex);

17
qucs/extsimkernels/ngspice.cpp
View File

@ -99,7 +99,8 @@ void Ngspice::createNetlist(QTextStream &stream, int ,
qDebug()<<vars;
stream<<".control\n" //execute simulations
<<"set filetype=ascii\n";
<<"set filetype=ascii\n"
<<"echo \"\" > spice4qucs.cir.noise\n";
QString sim;
outputs.clear();
@ -125,6 +126,14 @@ void Ngspice::createNetlist(QTextStream &stream, int ,
QString s2 = getParentSWPscript(pc,sim,true,hasDblSWP);
stream<<(s2+s);
hasParSWP = true;
} else if (SwpSim.startsWith("DISTO")&&(sim=="disto")) {
QString s2 = getParentSWPscript(pc,sim,true,hasDblSWP);
stream<<(s2+s);
hasParSWP = true;
} else if (SwpSim.startsWith("NOISE")&&(sim=="noise")) {
QString s2 = getParentSWPscript(pc,sim,true,hasDblSWP);
stream<<(s2+s);
hasParSWP = true;
} else if (SwpSim.startsWith("TR")&&(sim=="tran")) {
QString s2 = getParentSWPscript(pc,sim,true,hasDblSWP);
stream<<(s2+s);
@ -244,6 +253,12 @@ void Ngspice::createNetlist(QTextStream &stream, int ,
if (SwpSim.startsWith("AC")&&(sim=="ac")) {
s += getParentSWPscript(pc,sim,false,b);
stream<<s;
} else if (SwpSim.startsWith("DISTO")&&(sim=="disto")) {
s += getParentSWPscript(pc,sim,false,b);
stream<<s;
} else if (SwpSim.startsWith("NOISE")&&(sim=="noise")) {
s += getParentSWPscript(pc,sim,false,b);
stream<<s;
} else if (SwpSim.startsWith("TR")&&(sim=="tran")) {
s += getParentSWPscript(pc,sim,false,b);
stream<<s;