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

merge vsrc PULSE -> isrc

This commit is contained in:
rlar 2011-02-28 20:35:31 +00:00
parent 2a693e2d80
commit c797dedb7c
3 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2011-02-28 Robert Larice
* src/spicelib/devices/isrc/isrcacct.c ,
* src/spicelib/devices/isrc/isrcload.c :
merge vsrc PULSE -> isrc
to fix PHASE != 0, see commit from 2010-11-21
2011-02-28 Robert Larice
* src/spicelib/devices/isrc/isrc.c ,
* src/spicelib/devices/isrc/isrcacct.c ,

63
src/spicelib/devices/isrc/isrcacct.c
View File

@ -49,17 +49,16 @@ ISRCaccept(CKTcircuit *ckt, GENmodel *inModel)
case PULSE: {
double TD, TR, TF, PW, PER;
double tshift;
double time = 0.;
double basetime = 0;
/* gtri - begin - wbk - add PHASE parameter */
#ifdef XSPICE
double PHASE;
double phase;
double deltat;
double basephase;
#endif
double time;
double basetime = 0;
TD = here->ISRCfunctionOrder > 2
? here->ISRCcoeffs[2] : 0.0;
TR = here->ISRCfunctionOrder > 3
@ -75,26 +74,23 @@ ISRCaccept(CKTcircuit *ckt, GENmodel *inModel)
&& here->ISRCcoeffs[6] != 0.0
? here->ISRCcoeffs[6] : ckt->CKTfinalTime;
#ifdef XSPICE
PHASE = here->ISRCfunctionOrder > 8
PHASE = here->ISRCfunctionOrder > 7
? here->ISRCcoeffs[7] : 0.0;
#endif
/* offset time by delay and limit to zero */
/* offset time by delay */
time = ckt->CKTtime - TD;
tshift = TD;
#ifdef XSPICE
if(time < 0.0)
time = 0.0;
#endif
#ifdef XSPICE
/* normalize phase to 0 - 2PI */
phase = PHASE * M_PI / 180.0;
basephase = 2 * M_PI * floor(phase / (2 * M_PI));
phase -= basephase;
/* compute equivalent delta time and add to time */
deltat = (phase / (2 * M_PI)) * PER;
/* normalize phase to 0 - 360° */
/* normalize phase to cycles */
phase = PHASE / 360.0;
phase = fmod(phase, 1.0);
deltat = phase * PER;
while (deltat > 0)
deltat -= PER;
time += deltat;
tshift = TD - deltat;
#endif
/* gtri - end - wbk - add PHASE parameter */
@ -107,40 +103,40 @@ ISRCaccept(CKTcircuit *ckt, GENmodel *inModel)
if( time <= 0.0 || time >= TR + PW + TF) {
if(ckt->CKTbreak && SAMETIME(time,0.0)) {
error = CKTsetBreak(ckt,basetime + TR + TD);
error = CKTsetBreak(ckt,basetime + TR + tshift);
if(error) return(error);
} else if(ckt->CKTbreak && SAMETIME(TR+PW+TF,time) ) {
error = CKTsetBreak(ckt,basetime + PER + TD);
error = CKTsetBreak(ckt,basetime + PER + tshift);
if(error) return(error);
} else if (ckt->CKTbreak && (time == -TD) ) {
error = CKTsetBreak(ckt,basetime + TD);
} else if (ckt->CKTbreak && (time == -tshift) ) {
error = CKTsetBreak(ckt,basetime + tshift);
if(error) return(error);
} else if (ckt->CKTbreak && SAMETIME(PER,time) ) {
error = CKTsetBreak(ckt,basetime + TD + TR + PER);
error = CKTsetBreak(ckt,basetime + tshift + TR + PER);
if(error) return(error);
}
} else if ( time >= TR && time <= TR + PW) {
if(ckt->CKTbreak && SAMETIME(time,TR) ) {
error = CKTsetBreak(ckt,basetime + TD+TR + PW);
error = CKTsetBreak(ckt,basetime + tshift + TR + PW);
if(error) return(error);
} else if(ckt->CKTbreak && SAMETIME(TR+PW,time) ) {
error = CKTsetBreak(ckt,basetime + TD+TR + PW + TF);
error = CKTsetBreak(ckt,basetime + tshift + TR + PW + TF);
if(error) return(error);
}
} else if (time > 0 && time < TR) {
if(ckt->CKTbreak && SAMETIME(time,0) ) {
error = CKTsetBreak(ckt,basetime + TD+TR);
error = CKTsetBreak(ckt,basetime + tshift + TR);
if(error) return(error);
} else if(ckt->CKTbreak && SAMETIME(time,TR)) {
error = CKTsetBreak(ckt,basetime + TD+TR + PW);
error = CKTsetBreak(ckt,basetime + tshift + TR + PW);
if(error) return(error);
}
} else { /* time > TR + PW && < TR + PW + TF */
if(ckt->CKTbreak && SAMETIME(time,TR+PW) ) {
error = CKTsetBreak(ckt,basetime + TD+TR + PW +TF);
error = CKTsetBreak(ckt,basetime + tshift+TR + PW +TF);
if(error) return(error);
} else if(ckt->CKTbreak && SAMETIME(time,TR+PW+TF) ) {
error = CKTsetBreak(ckt,basetime + TD+PER);
error = CKTsetBreak(ckt,basetime + tshift + PER);
if(error) return(error);
}
}
@ -176,12 +172,9 @@ ISRCaccept(CKTcircuit *ckt, GENmodel *inModel)
}
}
for(i=0;i<(here->ISRCfunctionOrder/2)-1;i++) {
if((*(here->ISRCcoeffs+2*i)==ckt->CKTtime)) {
if(ckt->CKTbreak) {
error = CKTsetBreak(ckt,
*(here->ISRCcoeffs+2*i+2));
if(error) return(error);
}
if ( ckt->CKTbreak && AlmostEqualUlps(*(here->ISRCcoeffs+2*i), ckt->CKTtime, 3 ) ) {
error = CKTsetBreak(ckt, *(here->ISRCcoeffs+2*i+2));
if(error) return(error);
goto bkptset;
}
}

21
src/spicelib/devices/isrc/isrcload.c
View File

@ -71,7 +71,6 @@ ISRCload(GENmodel *inModel, CKTcircuit *ckt)
double PHASE;
double phase;
double deltat;
double basephase;
#endif
V1 = here->ISRCcoeffs[0];
V2 = here->ISRCcoeffs[1];
@ -89,23 +88,25 @@ ISRCload(GENmodel *inModel, CKTcircuit *ckt)
PER = here->ISRCfunctionOrder > 6
&& here->ISRCcoeffs[6] != 0.0
? here->ISRCcoeffs[6] : ckt->CKTfinalTime;
/* shift time by delay time TD */
time -= TD;
#ifdef XSPICE
/* gtri - begin - wbk - add PHASE parameter */
PHASE = here->ISRCfunctionOrder > 7
? here->ISRCcoeffs[7] : 0.0;
/* normalize phase to 0 - 2PI */
phase = PHASE * M_PI / 180.0;
basephase = 2 * M_PI * floor(phase / (2 * M_PI));
phase -= basephase;
/* compute equivalent delta time and add to time */
deltat = (phase / (2 * M_PI)) * PER;
/* normalize phase to cycles */
phase = PHASE / 360.0;
phase = fmod(phase, 1.0);
deltat = phase * PER;
while (deltat > 0)
deltat -= PER;
/* shift time by pase (neg. for pos. phase value) */
time += deltat;
/* gtri - end - wbk - add PHASE parameter */
#endif
time -= TD;
if(time > PER) {
/* repeating signal - figure out where we are */
/* in period */