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

use type `runDesc'

rlar 14 years ago
parent
5df8e981e5
commit
f70fd8ea1b
14 changed files with 68 additions and 52 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. 16
      ChangeLog
  2. 28
      src/frontend/outitf.c
  3. 18
      src/frontend/outitf.h
  4. 20
      src/include/ngspice/ifsim.h
  5. 2
      src/include/ngspice/noisedef.h
  6. 2
      src/include/ngspice/trandefs.h
  7. 16
      src/main.c
  8. 4
      src/spicelib/analysis/acan.c
  9. 2
      src/spicelib/analysis/cktsens.c
  10. 2
      src/spicelib/analysis/dcop.c
  11. 2
      src/spicelib/analysis/dctrcurv.c
  12. 2
      src/spicelib/analysis/distoan.c
  13. 4
      src/spicelib/analysis/pzan.c
  14. 2
      src/spicelib/analysis/tfanal.c

16
ChangeLog
View File

@ -1,3 +1,19 @@
2012-02-07 Robert Larice
* src/main.c ,
* src/frontend/outitf.c ,
* src/frontend/outitf.h ,
* src/include/ngspice/ifsim.h ,
* src/include/ngspice/noisedef.h ,
* src/include/ngspice/trandefs.h ,
* src/spicelib/analysis/acan.c ,
* src/spicelib/analysis/cktsens.c ,
* src/spicelib/analysis/dcop.c ,
* src/spicelib/analysis/dctrcurv.c ,
* src/spicelib/analysis/distoan.c ,
* src/spicelib/analysis/pzan.c ,
* src/spicelib/analysis/tfanal.c :
use type `runDesc'
2012-02-07 Robert Larice 2012-02-07 Robert Larice
* src/frontend/outitf.h , * src/frontend/outitf.h ,
* src/include/ngspice/typedefs.h : * src/include/ngspice/typedefs.h :

28
src/frontend/outitf.c
View File

@ -90,7 +90,7 @@ int
OUTpBeginPlot(CKTcircuit *circuitPtr, JOB *analysisPtr, OUTpBeginPlot(CKTcircuit *circuitPtr, JOB *analysisPtr,
IFuid analName, IFuid analName,
IFuid refName, int refType, IFuid refName, int refType,
int numNames, IFuid *dataNames, int dataType, void **plotPtr)
int numNames, IFuid *dataNames, int dataType, runDesc **plotPtr)
{ {
char *name; char *name;
@ -107,14 +107,14 @@ if (ARCHme != 0) return(OK);
return (beginPlot(analysisPtr, circuitPtr, name, return (beginPlot(analysisPtr, circuitPtr, name,
analName, refName, refType, numNames, analName, refName, refType, numNames,
dataNames, dataType, FALSE, dataNames, dataType, FALSE,
(runDesc **) plotPtr));
plotPtr));
} }
int int
OUTwBeginPlot(CKTcircuit *circuitPtr, JOB *analysisPtr, OUTwBeginPlot(CKTcircuit *circuitPtr, JOB *analysisPtr,
IFuid analName, IFuid analName,
IFuid refName, int refType, IFuid refName, int refType,
int numNames, IFuid *dataNames, int dataType, void **plotPtr)
int numNames, IFuid *dataNames, int dataType, runDesc **plotPtr)
{ {
#ifdef PARALLEL_ARCH #ifdef PARALLEL_ARCH
if (ARCHme != 0) return(OK); if (ARCHme != 0) return(OK);
@ -123,7 +123,7 @@ OUTwBeginPlot(CKTcircuit *circuitPtr, JOB *analysisPtr,
return (beginPlot(analysisPtr, circuitPtr, "circuit name", return (beginPlot(analysisPtr, circuitPtr, "circuit name",
analName, refName, refType, numNames, analName, refName, refType, numNames,
dataNames, dataType, TRUE, dataNames, dataType, TRUE,
(runDesc **) plotPtr));
plotPtr));
} }
static int static int
@ -447,9 +447,9 @@ addSpecialDesc(runDesc *run, char *name, char *devname, char *param, int depind)
int int
OUTpData(void *plotPtr, IFvalue *refValue, IFvalue *valuePtr)
OUTpData(runDesc *plotPtr, IFvalue *refValue, IFvalue *valuePtr)
{ {
runDesc *run = (runDesc *) plotPtr;
runDesc *run = plotPtr; // FIXME
IFvalue val; IFvalue val;
int i; int i;
#ifdef PARALLEL_ARCH #ifdef PARALLEL_ARCH
@ -637,7 +637,7 @@ OUTwReference(void *plotPtr, IFvalue *valuePtr, void **refPtr)
} }
/* ARGSUSED */ /* until some code gets written */ /* ARGSUSED */ /* until some code gets written */
int int
OUTwData(void *plotPtr, int dataIndex, IFvalue *valuePtr, void *refPtr)
OUTwData(runDesc *plotPtr, int dataIndex, IFvalue *valuePtr, void *refPtr)
{ {
NG_IGNORE(refPtr); NG_IGNORE(refPtr);
NG_IGNORE(valuePtr); NG_IGNORE(valuePtr);
@ -649,7 +649,7 @@ OUTwData(void *plotPtr, int dataIndex, IFvalue *valuePtr, void *refPtr)
/* ARGSUSED */ /* until some code gets written */ /* ARGSUSED */ /* until some code gets written */
int int
OUTwEnd(void *plotPtr)
OUTwEnd(runDesc *plotPtr)
{ {
NG_IGNORE(plotPtr); NG_IGNORE(plotPtr);
return (OK); return (OK);
@ -658,9 +658,9 @@ OUTwEnd(void *plotPtr)
int int
OUTendPlot(void *plotPtr)
OUTendPlot(runDesc *plotPtr)
{ {
runDesc *run = (runDesc *) plotPtr;
runDesc *run = plotPtr; // FIXME
#ifdef PARALLEL_ARCH #ifdef PARALLEL_ARCH
if (ARCHme != 0) return(OK); if (ARCHme != 0) return(OK);
@ -682,7 +682,7 @@ OUTendPlot(void *plotPtr)
/* ARGSUSED */ /* until some code gets written */ /* ARGSUSED */ /* until some code gets written */
int int
OUTbeginDomain(void *plotPtr, IFuid refName, int refType, IFvalue *outerRefValue)
OUTbeginDomain(runDesc *plotPtr, IFuid refName, int refType, IFvalue *outerRefValue)
{ {
NG_IGNORE(outerRefValue); NG_IGNORE(outerRefValue);
NG_IGNORE(refType); NG_IGNORE(refType);
@ -694,7 +694,7 @@ OUTbeginDomain(void *plotPtr, IFuid refName, int refType, IFvalue *outerRefValue
/* ARGSUSED */ /* until some code gets written */ /* ARGSUSED */ /* until some code gets written */
int int
OUTendDomain(void *plotPtr)
OUTendDomain(runDesc *plotPtr)
{ {
NG_IGNORE(plotPtr); NG_IGNORE(plotPtr);
return (OK); return (OK);
@ -704,9 +704,9 @@ OUTendDomain(void *plotPtr)
/* ARGSUSED */ /* until some code gets written */ /* ARGSUSED */ /* until some code gets written */
int int
OUTattributes(void *plotPtr, IFuid varName, int param, IFvalue *value)
OUTattributes(runDesc *plotPtr, IFuid varName, int param, IFvalue *value)
{ {
runDesc *run = (runDesc *) plotPtr;
runDesc *run = plotPtr; // FIXME
struct dvec *d; struct dvec *d;
GRIDTYPE type; GRIDTYPE type;
int i; int i;

18
src/frontend/outitf.h
View File

@ -46,19 +46,19 @@ struct runDesc {
int OUTpBeginPlot(CKTcircuit *circuitPtr, JOB *analysisPtr, int OUTpBeginPlot(CKTcircuit *circuitPtr, JOB *analysisPtr,
IFuid analName, IFuid analName,
IFuid refName, int refType, IFuid refName, int refType,
int numNames, IFuid *dataNames, int dataType, void **plotPtr);
int numNames, IFuid *dataNames, int dataType, runDesc **plotPtr);
int OUTwBeginPlot(CKTcircuit *circuitPtr, JOB *analysisPtr, int OUTwBeginPlot(CKTcircuit *circuitPtr, JOB *analysisPtr,
IFuid analName, IFuid analName,
IFuid refName, int refType, IFuid refName, int refType,
int numNames, IFuid *dataNames, int dataType, void **plotPtr);
int OUTpData(void *plotPtr, IFvalue *refValue, IFvalue *valuePtr);
int numNames, IFuid *dataNames, int dataType, runDesc **plotPtr);
int OUTpData(runDesc *plotPtr, IFvalue *refValue, IFvalue *valuePtr);
int OUTwReference(void *plotPtr, IFvalue *valuePtr, void **refPtr); int OUTwReference(void *plotPtr, IFvalue *valuePtr, void **refPtr);
int OUTwData(void *plotPtr, int dataIndex, IFvalue *valuePtr, void *refPtr);
int OUTwEnd(void *plotPtr);
int OUTendPlot(void *plotPtr);
int OUTbeginDomain(void *plotPtr, IFuid refName, int refType, IFvalue *outerRefValue);
int OUTendDomain(void *plotPtr);
int OUTattributes(void *plotPtr, IFuid varName, int param, IFvalue *value);
int OUTwData(runDesc *plotPtr, int dataIndex, IFvalue *valuePtr, void *refPtr);
int OUTwEnd(runDesc *plotPtr);
int OUTendPlot(runDesc *plotPtr);
int OUTbeginDomain(runDesc *plotPtr, IFuid refName, int refType, IFvalue *outerRefValue);
int OUTendDomain(runDesc *plotPtr);
int OUTattributes(runDesc *plotPtr, IFuid varName, int param, IFvalue *value);
int OUTstopnow(void); int OUTstopnow(void);
void OUTerror(int flags, char *format, IFuid *names); void OUTerror(int flags, char *format, IFuid *names);

20
src/include/ngspice/ifsim.h
View File

@ -442,28 +442,28 @@ struct IFfrontEnd {
int (*OUTpBeginPlot) (CKTcircuit *, JOB *, int (*OUTpBeginPlot) (CKTcircuit *, JOB *,
IFuid, IFuid,
IFuid, int, IFuid, int,
int, IFuid *, int, void **);
int, IFuid *, int, runDesc **);
/* start pointwise output plot */ /* start pointwise output plot */
int (*OUTpData) (void *, IFvalue *, IFvalue *);
int (*OUTpData) (runDesc *, IFvalue *, IFvalue *);
/* data for pointwise plot */ /* data for pointwise plot */
int (*OUTwBeginPlot) (CKTcircuit *, JOB *, int (*OUTwBeginPlot) (CKTcircuit *, JOB *,
IFuid, IFuid,
IFuid, int, IFuid, int,
int, IFuid *, int, void **);
int, IFuid *, int, runDesc **);
/* start windowed output plot */ /* start windowed output plot */
int (*OUTwReference) (void *, IFvalue *, void **);
int (*OUTwReference) (runDesc *, IFvalue *, void **);
/* independent vector for windowed plot */ /* independent vector for windowed plot */
int (*OUTwData) (void *, int, IFvalue *, void *);
int (*OUTwData) (runDesc *, int, IFvalue *, void *);
/* data for windowed plot */ /* data for windowed plot */
int (*OUTwEnd) (void *);
int (*OUTwEnd) (runDesc *);
/* signal end of windows */ /* signal end of windows */
int (*OUTendPlot) (void *);
int (*OUTendPlot) (runDesc *);
/* end of plot */ /* end of plot */
int (*OUTbeginDomain) (void *, IFuid, int, IFvalue *);
int (*OUTbeginDomain) (runDesc *, IFuid, int, IFvalue *);
/* start nested domain */ /* start nested domain */
int (*OUTendDomain) (void *);
int (*OUTendDomain) (runDesc *);
/* end nested domain */ /* end nested domain */
int (*OUTattributes) (void *, IFuid, int, IFvalue *);
int (*OUTattributes) (runDesc *, IFuid, int, IFvalue *);
/* specify output attributes of node */ /* specify output attributes of node */
}; };

2
src/include/ngspice/noisedef.h
View File

@ -49,7 +49,7 @@ typedef struct {
/* a do loop. */ /* a do loop. */
unsigned int prtSummary; unsigned int prtSummary;
double *outpVector; /* pointer to our array of noise outputs */ double *outpVector; /* pointer to our array of noise outputs */
void *NplotPtr; /* the plot pointer */
runDesc *NplotPtr; /* the plot pointer */
IFuid *namelist; /* list of plot names */ IFuid *namelist; /* list of plot names */
} Ndata; } Ndata;

2
src/include/ngspice/trandefs.h
View File

@ -24,7 +24,7 @@ typedef struct {
double TRANmaxStep; double TRANmaxStep;
double TRANinitTime; double TRANinitTime;
long TRANmode; long TRANmode;
void * TRANplot;
runDesc *TRANplot;
} TRANan; } TRANan;
#define TRAN_TSTART 1 #define TRAN_TSTART 1

16
src/main.c
View File

@ -201,14 +201,14 @@ const bool ft_nutmeg = FALSE;
extern struct comm spcp_coms[ ]; extern struct comm spcp_coms[ ];
struct comm *cp_coms = spcp_coms; struct comm *cp_coms = spcp_coms;
extern int OUTpBeginPlot(CKTcircuit *,JOB *,IFuid,IFuid,int,int,IFuid *,int,void **);
extern int OUTpData(void *,IFvalue *,IFvalue *);
extern int OUTwBeginPlot(CKTcircuit *,JOB *,IFuid,IFuid,int,int,IFuid *,int,void **);
extern int OUTwReference(void *,IFvalue *,void **);
extern int OUTwData(void *,int,IFvalue *,void *), OUTwEnd(void *), OUTendPlot(void *);
extern int OUTbeginDomain(void *,IFuid,int,IFvalue *);
extern int OUTendDomain(void *), OUTstopnow(void), OUTerror(int,char *,IFuid *);
extern int OUTattributes(void *,IFuid,int,IFvalue *);
extern int OUTpBeginPlot(CKTcircuit *,JOB *,IFuid,IFuid,int,int,IFuid *,int,runDesc **);
extern int OUTpData(runDesc *,IFvalue *,IFvalue *);
extern int OUTwBeginPlot(CKTcircuit *,JOB *,IFuid,IFuid,int,int,IFuid *,int,runDesc **);
extern int OUTwReference(runDesc *,IFvalue *,void **);
extern int OUTwData(runDesc *,int,IFvalue *,void *), OUTwEnd(runDesc *), OUTendPlot(runDesc *);
extern int OUTbeginDomain(runDesc *,IFuid,int,IFvalue *);
extern int OUTendDomain(runDesc *), OUTstopnow(void), OUTerror(int,char *,IFuid *);
extern int OUTattributes(runDesc *,IFuid,int,IFvalue *);
extern void initw(void); extern void initw(void);

4
src/spicelib/analysis/acan.c
View File

@ -62,8 +62,8 @@ ACan(CKTcircuit *ckt, int restart)
int numNames; int numNames;
IFuid *nameList; /* va: tmalloc'ed list of names */ IFuid *nameList; /* va: tmalloc'ed list of names */
IFuid freqUid; IFuid freqUid;
static void *acPlot = NULL;
void *plot = NULL;
static runDesc *acPlot = NULL;
runDesc *plot = NULL;
#ifdef XSPICE #ifdef XSPICE

2
src/spicelib/analysis/cktsens.c
View File

@ -81,7 +81,7 @@ int sens_sens(CKTcircuit *ckt, int restart)
static int is_dc; static int is_dc;
int k, j, n; int k, j, n;
int num_vars, branch_eq=0; int num_vars, branch_eq=0;
void *sen_data = NULL;
runDesc *sen_data = NULL;
char namebuf[513]; char namebuf[513];
IFuid *output_names, freq_name; IFuid *output_names, freq_name;
int bypass; int bypass;

2
src/spicelib/analysis/dcop.c
View File

@ -25,7 +25,7 @@ DCop(CKTcircuit *ckt, int notused)
int error; int error;
IFuid *nameList; /* va: tmalloc'ed list */ IFuid *nameList; /* va: tmalloc'ed list */
int numNames; int numNames;
void *plot = NULL;
runDesc *plot = NULL;
NG_IGNORE(notused); NG_IGNORE(notused);

2
src/spicelib/analysis/dctrcurv.c
View File

@ -48,7 +48,7 @@ DCtrCurv(CKTcircuit *ckt, int restart)
IFuid *nameList; IFuid *nameList;
int numNames; int numNames;
int firstTime=1; int firstTime=1;
static void *plot=NULL;
static runDesc *plot = NULL;
#ifdef WANT_SENSE2 #ifdef WANT_SENSE2
#ifdef SENSDEBUG #ifdef SENSDEBUG

2
src/spicelib/analysis/distoan.c
View File

@ -49,7 +49,7 @@ DISTOan(CKTcircuit *ckt, int restart)
int numNames; int numNames;
IFuid *nameList; IFuid *nameList;
IFuid freqUid; IFuid freqUid;
void *acPlot=NULL;
runDesc *acPlot = NULL;
DISTOAN *job = (DISTOAN *) ckt->CKTcurJob; DISTOAN *job = (DISTOAN *) ckt->CKTcurJob;
static char *nof2src = "No source with f2 distortion input"; static char *nof2src = "No source with f2 distortion input";
#ifdef DISTODEBUG #ifdef DISTODEBUG

4
src/spicelib/analysis/pzan.c
View File

@ -22,7 +22,7 @@ PZan(CKTcircuit *ckt, int reset)
int error; int error;
int numNames; int numNames;
IFuid *nameList; IFuid *nameList;
void *plot = NULL;
runDesc *plot = NULL;
NG_IGNORE(reset); NG_IGNORE(reset);
@ -127,7 +127,7 @@ int
PZpost(CKTcircuit *ckt) PZpost(CKTcircuit *ckt)
{ {
PZAN *job = (PZAN *) ckt->CKTcurJob; PZAN *job = (PZAN *) ckt->CKTcurJob;
void *pzPlotPtr = NULL; /* the plot pointer for front end */
runDesc *pzPlotPtr = NULL; /* the plot pointer for front end */
IFcomplex *out_list; IFcomplex *out_list;
IFvalue outData; /* output variable (points to out_list) */ IFvalue outData; /* output variable (points to out_list) */
IFuid *namelist; IFuid *namelist;

2
src/spicelib/analysis/tfanal.c
View File

@ -30,7 +30,7 @@ TFanal(CKTcircuit *ckt, int restart)
int error; int error;
int converged; int converged;
int i; int i;
void *plotptr = NULL; /* pointer to out plot */
runDesc *plotptr = NULL; /* pointer to out plot */
GENinstance *ptr = NULL; GENinstance *ptr = NULL;
IFuid uids[3]; IFuid uids[3];
int Itype; int Itype;

Write Preview
Loading…
Cancel
Save