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

src/frontend/outif.c, introduce guess_type() for common code in plotInit() and fileInit_pass2()

This commit is contained in:
rlar 2015-03-22 11:04:43 +01:00
parent 54c0f47dde
commit 76a48c161d
1 changed files with 42 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
src/frontend/outitf.c
View File

@ -839,6 +839,44 @@ fileInit(runDesc *run)
} }
static int
guess_type(char *name)
{
int type;
if (substring("#branch", name))
type = SV_CURRENT;
else if (cieq(name, "time"))
type = SV_TIME;
else if (cieq(name, "frequency"))
type = SV_FREQUENCY;
else if (cieq(name, "onoise_spectrum"))
type = SV_OUTPUT_N_DENS;
else if (cieq(name, "onoise_integrated"))
type = SV_OUTPUT_NOISE;
else if (cieq(name, "inoise_spectrum"))
type = SV_INPUT_N_DENS;
else if (cieq(name, "inoise_integrated"))
type = SV_INPUT_NOISE;
else if (cieq(name, "temp-sweep"))
type = SV_TEMP;
else if (cieq(name, "res-sweep"))
type = SV_RES;
else if ((*name == '@') && substring("[g", name))
type = SV_ADMITTANCE;
else if ((*name == '@') && substring("[c", name))
type = SV_CAPACITANCE;
else if ((*name == '@') && substring("[i", name))
type = SV_CURRENT;
else if ((*name == '@') && substring("[q", name))
type = SV_CHARGE;
else
type = SV_VOLTAGE;
return type;
}
static void static void
fileInit_pass2(runDesc *run) fileInit_pass2(runDesc *run)
{ {
@ -848,34 +886,7 @@ fileInit_pass2(runDesc *run)
char *name = run->data[i].name; char *name = run->data[i].name;
if (substring("#branch", name)) type = guess_type(name);
type = SV_CURRENT;
else if (cieq(name, "time"))
type = SV_TIME;
else if (cieq(name, "frequency"))
type = SV_FREQUENCY;
else if (cieq(name, "onoise_spectrum"))
type = SV_OUTPUT_N_DENS;
else if (cieq(name, "onoise_integrated"))
type = SV_OUTPUT_NOISE;
else if (cieq(name, "inoise_spectrum"))
type = SV_INPUT_N_DENS;
else if (cieq(name, "inoise_integrated"))
type = SV_INPUT_NOISE;
else if (cieq(name, "temp-sweep"))
type = SV_TEMP;
else if (cieq(name, "res-sweep"))
type = SV_RES;
else if ((*name == '@') && (substring("[g", name)))
type = SV_ADMITTANCE;
else if ((*name == '@') && (substring("[c", name)))
type = SV_CAPACITANCE;
else if ((*name == '@') && (substring("[i", name)))
type = SV_CURRENT;
else if ((*name == '@') && (substring("[q", name)))
type = SV_CHARGE;
else
type = SV_VOLTAGE;
if (type == SV_CURRENT) { if (type == SV_CURRENT) {
char *branch = strstr(name, "#branch"); char *branch = strstr(name, "#branch");
@ -1020,34 +1031,9 @@ plotInit(runDesc *run)
} else { } else {
v->v_name = copy(dd->name); v->v_name = copy(dd->name);
} }
if (substring("#branch", v->v_name))
v->v_type = SV_CURRENT; v->v_type = guess_type(v->v_name);
else if (cieq(v->v_name, "time"))
v->v_type = SV_TIME;
else if (cieq(v->v_name, "frequency"))
v->v_type = SV_FREQUENCY;
else if (cieq(v->v_name, "onoise_spectrum"))
v->v_type = SV_OUTPUT_N_DENS;
else if (cieq(v->v_name, "onoise_integrated"))
v->v_type = SV_OUTPUT_NOISE;
else if (cieq(v->v_name, "inoise_spectrum"))
v->v_type = SV_INPUT_N_DENS;
else if (cieq(v->v_name, "inoise_integrated"))
v->v_type = SV_INPUT_NOISE;
else if (cieq(v->v_name, "temp-sweep"))
v->v_type = SV_TEMP;
else if (cieq(v->v_name, "res-sweep"))
v->v_type = SV_RES;
else if ((*(v->v_name) == '@') && (substring("[g", v->v_name)))
v->v_type = SV_ADMITTANCE;
else if ((*(v->v_name) == '@') && (substring("[c", v->v_name)))
v->v_type = SV_CAPACITANCE;
else if ((*(v->v_name) == '@') && (substring("[i", v->v_name)))
v->v_type = SV_CURRENT;
else if ((*(v->v_name) == '@') && (substring("[q", v->v_name)))
v->v_type = SV_CHARGE;
else
v->v_type = SV_VOLTAGE;
v->v_length = 0; v->v_length = 0;
v->v_scale = NULL; v->v_scale = NULL;
if (!run->isComplex) { if (!run->isComplex) {