From 7ec1d5d3d1ae6ceb085ef2a497d2a2999bbed1fd Mon Sep 17 00:00:00 2001 From: pnenzi Date: Tue, 30 Jan 2001 08:43:38 +0000 Subject: [PATCH] Some bux fixes: in ASRC device (B) ASRC ask was not included in interface structure. --- src/spicelib/analysis/cktdojob.c | 2 ++ src/spicelib/analysis/noisean.c | 8 +++++++- src/spicelib/devices/asrc/asrcinit.c | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/spicelib/analysis/cktdojob.c b/src/spicelib/analysis/cktdojob.c index 99a4a3353..45f36fafd 100644 --- a/src/spicelib/analysis/cktdojob.c +++ b/src/spicelib/analysis/cktdojob.c @@ -84,6 +84,8 @@ CKTdoJob(void *inCkt, int reset, void *inTask) ckt->CKTlteAbstol = task->TSKlteAbstol; #endif /* NEWTRUNC */ +printf("Doing analysis at TEMP = %f and TNOM = %f\n", + ckt->CKTtemp, ckt->CKTnomTemp); error = 0; if (reset) { diff --git a/src/spicelib/analysis/noisean.c b/src/spicelib/analysis/noisean.c index dae2d89f3..87f439cc0 100644 --- a/src/spicelib/analysis/noisean.c +++ b/src/spicelib/analysis/noisean.c @@ -100,7 +100,13 @@ NOISEan (CKTcircuit *ckt, int restart) ckt->CKTdcMaxIter); if (error) return(error); - data = (Ndata*)MALLOC(sizeof(Ndata)); + + /* Patch to noisean.c by Richard D. McRoberts. */ + ckt->CKTmode = (ckt->CKTmode & MODEUIC) | MODEDCOP | MODEINITSMSIG; + error = CKTload(ckt); + if(error) return(error); + + data = (Ndata*)MALLOC(sizeof(Ndata)); step = 0; data->freq = job->NstartFreq; data->outNoiz = 0.0; diff --git a/src/spicelib/devices/asrc/asrcinit.c b/src/spicelib/devices/asrc/asrcinit.c index 0d997f39f..85abf9816 100644 --- a/src/spicelib/devices/asrc/asrcinit.c +++ b/src/spicelib/devices/asrc/asrcinit.c @@ -39,7 +39,7 @@ SPICEdev ASRCinfo = { DEVmodDelete : ASRCmDelete, DEVdelete : ASRCdelete, DEVsetic : NULL, - DEVask : NULL, + DEVask : ASRCask, DEVmodAsk : NULL, DEVpzLoad : ASRCpzLoad, DEVconvTest : ASRCconvTest,