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

2004-05-19 Stefan Jones <stefan.jones@multigig.com> 

* src/tclspice.c:
    Made the trigger time more exact
This commit is contained in:
stefanjones 2004-05-21 18:37:54 +00:00
parent 6389b0fcb0
commit 596a434652
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2004-05-19 Stefan Jones <stefan.jones@multigig.com>
* src/tclspice.c:
Made the trigger time more exact
2004-05-03 Stefan Jones <stefan.jones@multigig.com> 2004-05-03 Stefan Jones <stefan.jones@multigig.com>
* src/spicelib/analysis/acan.c: * src/spicelib/analysis/acan.c:

36
src/tclspice.c
View File

@ -804,8 +804,8 @@ static int get_param TCL_CMDPROCARGS(clientData,interp,argc,argv) {
int get_mod_param TCL_CMDPROCARGS(clientData,interp,argc,argv) { int get_mod_param TCL_CMDPROCARGS(clientData,interp,argc,argv) {
char *name; char *name;
char *paramname; char *paramname;
GENinstance *devptr=(GENinstance *)NULL; void *devptr=NULL;
GENmodel *modptr=(GENmodel *)NULL; void *modptr=NULL;
IFdevice *device; IFdevice *device;
IFparm *opt; IFparm *opt;
IFvalue pv; IFvalue pv;
@ -836,11 +836,11 @@ int get_mod_param TCL_CMDPROCARGS(clientData,interp,argc,argv) {
/* get the unique IFuid for name (device/model) */ /* get the unique IFuid for name (device/model) */
INPretrieve(&name,(INPtables *)ft_curckt->ci_symtab); INPretrieve(&name,(INPtables *)ft_curckt->ci_symtab);
err = (*(ft_sim->findInstance))(ft_curckt->ci_ckt,&typecode,(void **)&devptr,name,NULL,NULL); err = (*(ft_sim->findInstance))(ft_curckt->ci_ckt,&typecode,&devptr,name,NULL,NULL);
if (err != OK) { if (err != OK) {
typecode = -1; typecode = -1;
devptr = (void *)NULL; devptr = (void *)NULL;
err = (*(ft_sim->findModel))(ft_curckt->ci_ckt,&typecode,(void **)&modptr,name); err = (*(ft_sim->findModel))(ft_curckt->ci_ckt,&typecode,&modptr,name);
} }
if (err != OK) { if (err != OK) {
sprintf(buf,"No such device or model name %s",name); sprintf(buf,"No such device or model name %s",name);
@ -857,10 +857,10 @@ int get_mod_param TCL_CMDPROCARGS(clientData,interp,argc,argv) {
found=TRUE; found=TRUE;
} else if (strcmp(paramname,opt->keyword)==0) { } else if (strcmp(paramname,opt->keyword)==0) {
if (devptr) if (devptr)
err = (*(ft_sim->askInstanceQuest))(ft_curckt->ci_ckt, (void *)devptr, err = (*(ft_sim->askInstanceQuest))(ft_curckt->ci_ckt, devptr,
opt->id, &pv, (IFvalue *)NULL); opt->id, &pv, (IFvalue *)NULL);
else else
err = (*(ft_sim->askModelQuest))(ft_curckt->ci_ckt, (void *)modptr, err = (*(ft_sim->askModelQuest))(ft_curckt->ci_ckt, modptr,
opt->id, &pv, (IFvalue *)NULL); opt->id, &pv, (IFvalue *)NULL);
if (err==OK) { if (err==OK) {
sprintf(buf,"%g",pv.rValue); /* dataType is here always real */ sprintf(buf,"%g",pv.rValue); /* dataType is here always real */
@ -1157,6 +1157,10 @@ struct watch {
int state; /* pretriggered or not */ int state; /* pretriggered or not */
double Vmin; /* the boundaries */ double Vmin; /* the boundaries */
double Vmax; double Vmax;
/* To get the exact trigger time */
double Vavg;
double oT;
double oV;
}; };
struct watch *watches=NULL; struct watch *watches=NULL;
@ -1184,10 +1188,10 @@ int Tcl_ExecutePerLoop() {
tmp->next = NULL; tmp->next = NULL;
if(eventQueue) { if(eventQueue) {
eventQueueEnd->next = tmp; eventQueueEnd->next = tmp;
eventQueueEnd = tmp; eventQueueEnd = tmp;
} else { } else {
eventQueue = tmp; eventQueue = tmp;
} }
eventQueueEnd = tmp; eventQueueEnd = tmp;
@ -1195,7 +1199,14 @@ int Tcl_ExecutePerLoop() {
tmp->vector = current->vector; tmp->vector = current->vector;
tmp->type = current->type; tmp->type = current->type;
tmp->stepNumber = vectors[0].length; tmp->stepNumber = vectors[0].length;
tmp->time = vectors[0].data[vectors[0].length-1];
{
double T = vectors[0].data[vectors[0].length-1];
double V = v->data[v->length-1];
tmp->time = current->oT +
(current->Vavg - current->oV) * (T - current->oT) / (V - current->oV);
}
current->state = 0; current->state = 0;
@ -1203,6 +1214,10 @@ int Tcl_ExecutePerLoop() {
if((current->type > 0 && v->data[v->length-1] < current->Vmin) || if((current->type > 0 && v->data[v->length-1] < current->Vmin) ||
(current->type < 0 && v->data[v->length-1] > current->Vmax)) (current->type < 0 && v->data[v->length-1] > current->Vmax))
current->state = 1; current->state = 1;
current->oT = vectors[0].data[vectors[0].length-1];
current->oV = v->data[v->length-1];
#ifdef HAVE_LIBPTHREAD #ifdef HAVE_LIBPTHREAD
pthread_mutex_unlock(&v->mutex); pthread_mutex_unlock(&v->mutex);
#endif #endif
@ -1287,6 +1302,7 @@ static int registerTrigger TCL_CMDPROCARGS(clientData,interp,argc,argv){
watches->state = 0; watches->state = 0;
watches->Vmin = atof(argv[2]); watches->Vmin = atof(argv[2]);
watches->Vmax = atof(argv[3]); watches->Vmax = atof(argv[3]);
watches->Vavg = (watches->Vmin + watches->Vmax) / 2 ;
#ifdef HAVE_LIBPTHREAD #ifdef HAVE_LIBPTHREAD
pthread_mutex_unlock(&triggerMutex); pthread_mutex_unlock(&triggerMutex);