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

outif.c, typesdef.c, sim.h: correct labeling of cap, cur, and charge data

This commit is contained in:
h_vogt 2012-10-03 15:01:36 +02:00
parent 7d82367666
commit c336f5ec9d
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/frontend/outitf.c
View File

@ -826,6 +826,12 @@ fileInit_pass2(runDesc *run)
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;
@ -992,6 +998,12 @@ plotInit(runDesc *run)
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;

3
src/frontend/typesdef.c
View File

@ -50,7 +50,8 @@ struct type types[NUMTYPES] = {
{ "power", "W" } , /* Added by A.Roldan */
{ "phase", "Degree" } , /* Added by A.Roldan */
{ "decibel", "dB" } , /* Added by A.Roldan */
{ "capacitance", "F" } ,
{ "charge", "C" } ,
};
/* The stuff for plot names. */

6
src/include/ngspice/sim.h
View File

@ -18,7 +18,11 @@ enum simulation_types {
SV_RES,
SV_IMPEDANCE,
SV_ADMITTANCE,
SV_POWER
SV_POWER,
SV_PHASE,
SV_DB,
SV_CAPACITANCE,
SV_CHARGE
};
#endif