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

comments

This commit is contained in:
h_vogt 2010-03-20 15:42:50 +00:00
parent 9e2f02fbe2
commit af4e5ebcdc
1 changed files with 48 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -220,10 +220,8 @@ ACan(CKTcircuit *ckt, int restart)
startcTime = ckt->CKTstat->STATcombineTime; startcTime = ckt->CKTstat->STATcombineTime;
startkTime = ckt->CKTstat->STATsyncTime; startkTime = ckt->CKTstat->STATsyncTime;
/* main loop through all scheduled frequencies */ /* main loop through all scheduled frequencies */
while(freq <= ((ACAN*)ckt->CKTcurJob)->ACstopFreq+freqTol) { while(freq <= ((ACAN*)ckt->CKTcurJob)->ACstopFreq+freqTol) {
if( (*(SPfrontEnd->IFpauseTest))() ) { if( (*(SPfrontEnd->IFpauseTest))() ) {
/* user asked us to pause via an interrupt */ /* user asked us to pause via an interrupt */
((ACAN*)ckt->CKTcurJob)->ACsaveFreq = freq; ((ACAN*)ckt->CKTcurJob)->ACsaveFreq = freq;
@ -231,15 +229,10 @@ ACan(CKTcircuit *ckt, int restart)
} }
ckt->CKTomega = 2.0 * M_PI *freq; ckt->CKTomega = 2.0 * M_PI *freq;
/* Update opertating point, if variable 'hertz' is given */
#define NEWOP
#ifdef NEWOP
/* this is a test! Update opertating point, if variable 'hertz' is given */
if (ckt->CKTmode & MODEINITHERTZ) { if (ckt->CKTmode & MODEINITHERTZ) {
#ifdef XSPICE #ifdef XSPICE
/* Call EVTop if event-driven instances exist */ /* Call EVTop if event-driven instances exist */
if(ckt->evt->counts.num_insts != 0) { if(ckt->evt->counts.num_insts != 0) {
error = EVTop(ckt, error = EVTop(ckt,
@ -268,9 +261,6 @@ ACan(CKTcircuit *ckt, int restart)
error = CKTload(ckt); error = CKTload(ckt);
if(error) return(error); if(error) return(error);
/* end of test */
#endif
ckt->CKTmode = (ckt->CKTmode&MODEUIC) | MODEAC; ckt->CKTmode = (ckt->CKTmode&MODEUIC) | MODEAC;
error = NIacIter(ckt); error = NIacIter(ckt);
if (error) { if (error) {
@ -350,7 +340,6 @@ ACan(CKTcircuit *ckt, int restart)
{ {
double endfreq = ((ACAN*)ckt->CKTcurJob)->ACstopFreq; double endfreq = ((ACAN*)ckt->CKTcurJob)->ACstopFreq;
double startfreq = ((ACAN*)ckt->CKTcurJob)->ACstartFreq; double startfreq = ((ACAN*)ckt->CKTcurJob)->ACstartFreq;
/* double step = ((ACAN*)ckt->CKTcurJob)->ACfreqDelta; */
endfreq = log(endfreq); endfreq = log(endfreq);
if (startfreq == 0.0) if (startfreq == 0.0)
startfreq = 1e-12; startfreq = 1e-12;