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

Set new default values. 

Restructure the code a bit.

Two parameters for AM are required (offset and amplitude). Even if this
sounds needless, changing it would require a major effort.
pre-master-46
Holger Vogt 2 years ago
parent
4d0e65b3b6
commit
5dbb25f667
2 changed files with 21 additions and 24 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. 24
      src/spicelib/devices/isrc/isrcload.c
  2. 21
      src/spicelib/devices/vsrc/vsrcload.c

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

@ -240,30 +240,28 @@ ISRCload(GENmodel *inModel, CKTcircuit *ckt)
case AM: { case AM: {
double VO, VA, FM, MD, FC, TD, PHASEM, PHASEC; double VO, VA, FM, MD, FC, TD, PHASEM, PHASEC;
double phasec;
double phasem;
PHASEC = here->ISRCfunctionOrder > 6
? here->ISRCcoeffs[6] : 0.0;
PHASEM = here->ISRCfunctionOrder > 7
? here->ISRCcoeffs[7] : 0.0;
/* compute phases in radians */
phasec = PHASEC * M_PI / 180.0;
phasem = PHASEM * M_PI / 180.0;
double phasec, phasem;
VO = here->ISRCcoeffs[0]; VO = here->ISRCcoeffs[0];
VA = here->ISRCcoeffs[1]; VA = here->ISRCcoeffs[1];
FM = here->ISRCfunctionOrder > 2 FM = here->ISRCfunctionOrder > 2
&& here->ISRCcoeffs[2] && here->ISRCcoeffs[2]
? here->ISRCcoeffs[2] : (1/ckt->CKTfinalTime);
? here->ISRCcoeffs[2] : (5. / ckt->CKTfinalTime);
MD = here->ISRCfunctionOrder > 3 MD = here->ISRCfunctionOrder > 3
? here->ISRCcoeffs[3] : 0.5; ? here->ISRCcoeffs[3] : 0.5;
FC = here->ISRCfunctionOrder > 4 FC = here->ISRCfunctionOrder > 4
? here->ISRCcoeffs[4] : 0.0;
? here->ISRCcoeffs[4] : (500. / ckt->CKTfinalTime);
TD = here->ISRCfunctionOrder > 5 TD = here->ISRCfunctionOrder > 5
&& here->ISRCcoeffs[5] && here->ISRCcoeffs[5]
? here->ISRCcoeffs[5] : 0.0; ? here->ISRCcoeffs[5] : 0.0;
PHASEC = here->ISRCfunctionOrder > 6
? here->ISRCcoeffs[6] : 0.0;
PHASEM = here->ISRCfunctionOrder > 7
? here->ISRCcoeffs[7] : 0.0;
/* compute phases in radians */
phasec = PHASEC * M_PI / 180.0;
phasem = PHASEM * M_PI / 180.0;
/* limit the modulation depth */ /* limit the modulation depth */
if (MD > 1) if (MD > 1)

21
src/spicelib/devices/vsrc/vsrcload.c
View File

@ -265,27 +265,26 @@ VSRCload(GENmodel *inModel, CKTcircuit *ckt)
double phasec; double phasec;
double phasem; double phasem;
PHASEM = here->VSRCfunctionOrder > 6
? here->VSRCcoeffs[6] : 0.0;
PHASEC = here->VSRCfunctionOrder > 7
? here->VSRCcoeffs[7] : 0.0;
/* compute phases in radians */
phasec = PHASEC * M_PI / 180.0;
phasem = PHASEM * M_PI / 180.0;
VO = here->VSRCcoeffs[0]; VO = here->VSRCcoeffs[0];
VA = here->VSRCcoeffs[1]; VA = here->VSRCcoeffs[1];
FM = here->VSRCfunctionOrder > 2 FM = here->VSRCfunctionOrder > 2
&& here->VSRCcoeffs[2] && here->VSRCcoeffs[2]
? here->VSRCcoeffs[2] : (1/ckt->CKTfinalTime);
? here->VSRCcoeffs[2] : (5. / ckt->CKTfinalTime);
MD = here->VSRCfunctionOrder > 3 MD = here->VSRCfunctionOrder > 3
? here->VSRCcoeffs[3] : 0.5; ? here->VSRCcoeffs[3] : 0.5;
FC = here->VSRCfunctionOrder > 4 FC = here->VSRCfunctionOrder > 4
? here->VSRCcoeffs[4] : 0.0;
? here->VSRCcoeffs[4] : (500. / ckt->CKTfinalTime);
TD = here->VSRCfunctionOrder > 5 TD = here->VSRCfunctionOrder > 5
&& here->VSRCcoeffs[5] && here->VSRCcoeffs[5]
? here->VSRCcoeffs[5] : 0.0; ? here->VSRCcoeffs[5] : 0.0;
PHASEM = here->VSRCfunctionOrder > 6
? here->VSRCcoeffs[6] : 0.0;
PHASEC = here->VSRCfunctionOrder > 7
? here->VSRCcoeffs[7] : 0.0;
/* compute phases in radians */
phasec = PHASEC * M_PI / 180.0;
phasem = PHASEM * M_PI / 180.0;
/* limit the modulation depth */ /* limit the modulation depth */
if (MD > 1) if (MD > 1)

Write Preview
Loading…
Cancel
Save