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

Update to V/I sources, SFFM and AM 

Enable more AM functions.
Unify the settings of both sources.
pre-master-46
Holger Vogt 2 years ago
parent
5dbb25f667
commit
e6d6f8e928
2 changed files with 98 additions and 78 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. 84
      src/spicelib/devices/isrc/isrcload.c
  2. 92
      src/spicelib/devices/vsrc/vsrcload.c

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

@ -205,76 +205,84 @@ ISRCload(GENmodel *inModel, CKTcircuit *ckt)
case SFFM: { case SFFM: {
double VO, VA, FC, MDI, FS;
double PHASEC, PHASES;
double VO, VA, FM, MDI, FC, TD, PHASEM, PHASEC;
double phasec; double phasec;
double phases;
double phasem;
static bool warn1 = FALSE, warn2 = FALSE;
PHASEC = here->ISRCfunctionOrder > 5
VO = here->ISRCcoeffs[0];
VA = here->ISRCcoeffs[1];
FM = here->ISRCfunctionOrder > 2
? here->ISRCcoeffs[2] : (5./ckt->CKTfinalTime);
MDI = here->ISRCfunctionOrder > 3
? here->ISRCcoeffs[3] : 90.0;
FC = here->ISRCfunctionOrder > 4
&& here->ISRCcoeffs[4]
? here->ISRCcoeffs[4] : (500./ckt->CKTfinalTime);
TD = here->ISRCfunctionOrder > 5
? here->ISRCcoeffs[5] : 0;
PHASEM = here->ISRCfunctionOrder > 5
? here->ISRCcoeffs[5] : 0.0; ? here->ISRCcoeffs[5] : 0.0;
PHASES = here->ISRCfunctionOrder > 6
PHASEC = here->ISRCfunctionOrder > 6
? here->ISRCcoeffs[6] : 0.0; ? here->ISRCcoeffs[6] : 0.0;
/* limit the modulation index */
if (MDI > FC / FM) {
MDI = FC / FM;
if (!warn1){
fprintf(stderr, "Warning: MDI in %s limited to FC/FM\n", here->gen.GENname);
warn1 = TRUE;
}
}
else if (MDI < 0) {
MDI = 0;
if (!warn2) {
fprintf(stderr, "Warning: MDI in %s set to 0\n", here->gen.GENname);
warn2 = TRUE;
}
}
/* compute phases in radians */ /* compute phases in radians */
phasec = PHASEC * M_PI / 180.0; phasec = PHASEC * M_PI / 180.0;
phases = PHASES * M_PI / 180.0;
VO = here->ISRCcoeffs[0];
VA = here->ISRCcoeffs[1];
FC = here->ISRCfunctionOrder > 2
&& here->ISRCcoeffs[2]
? here->ISRCcoeffs[2] : (1/ckt->CKTfinalTime);
MDI = here->ISRCfunctionOrder > 3
? here->ISRCcoeffs[3] : 0.0;
FS = here->ISRCfunctionOrder > 4
&& here->ISRCcoeffs[4]
? here->ISRCcoeffs[4] : (1/ckt->CKTfinalTime);
phasem = PHASEM * M_PI / 180.0;
/* compute waveform value */ /* compute waveform value */
value = VO + VA * value = VO + VA *
sin((2.0 * M_PI * FC * time + phasec) + sin((2.0 * M_PI * FC * time + phasec) +
MDI * sin(2.0 * M_PI * FS * time + phases));
MDI * sin(2.0 * M_PI * FM * time + phasem));
} }
break; break;
case AM: { case AM: {
double VO, VA, FM, MD, FC, TD, PHASEM, PHASEC;
double VO, VMO, VMA, FM, FC, TD, PHASEM, PHASEC;
double phasec, phasem; double phasec, phasem;
VO = here->ISRCcoeffs[0]; VO = here->ISRCcoeffs[0];
VA = here->ISRCcoeffs[1];
FM = here->ISRCfunctionOrder > 2
&& here->ISRCcoeffs[2]
? here->ISRCcoeffs[2] : (5. / ckt->CKTfinalTime);
MD = here->ISRCfunctionOrder > 3
? here->ISRCcoeffs[3] : 0.5;
VMO = here->ISRCcoeffs[1];
VMA = here->ISRCfunctionOrder > 2
? here->ISRCcoeffs[2] : 1.;
FM = here->ISRCfunctionOrder > 3
? here->ISRCcoeffs[3] : (5. / ckt->CKTfinalTime);
FC = here->ISRCfunctionOrder > 4 FC = here->ISRCfunctionOrder > 4
? here->ISRCcoeffs[4] : (500. / ckt->CKTfinalTime);
TD = here->ISRCfunctionOrder > 5
&& here->ISRCcoeffs[5]
? here->ISRCcoeffs[5] : 0.0;
PHASEC = here->ISRCfunctionOrder > 6
? here->ISRCcoeffs[4] : (500. / ckt->CKTfinalTime);
TD = here->ISRCfunctionOrder > 5
? here->ISRCcoeffs[5] : 0.0;
PHASEM = here->ISRCfunctionOrder > 6
? here->ISRCcoeffs[6] : 0.0; ? here->ISRCcoeffs[6] : 0.0;
PHASEM = here->ISRCfunctionOrder > 7
PHASEC = here->ISRCfunctionOrder > 7
? here->ISRCcoeffs[7] : 0.0; ? here->ISRCcoeffs[7] : 0.0;
/* compute phases in radians */ /* compute phases in radians */
phasec = PHASEC * M_PI / 180.0; phasec = PHASEC * M_PI / 180.0;
phasem = PHASEM * M_PI / 180.0; phasem = PHASEM * M_PI / 180.0;
/* limit the modulation depth */
if (MD > 1)
MD = 1;
else if (MD < 0)
MD = 0;
time -= TD; time -= TD;
if (time <= 0) { if (time <= 0) {
value = 0; value = 0;
} else { } else {
/* compute waveform value */ /* compute waveform value */
value = VO + VA * (1 + MD * sin(2.0 * M_PI * FM * time + phasem)) *
value = VO + (VMO + VMA * sin(2.0 * M_PI * FM * time + phasem)) *
sin(2.0 * M_PI * FC * time + phasec); sin(2.0 * M_PI * FC * time + phasec);
} }
} }

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

@ -227,55 +227,73 @@ VSRCload(GENmodel *inModel, CKTcircuit *ckt)
case SFFM: { case SFFM: {
double VO, VA, FC, MDI, FS;
double PHASEC, PHASES;
double VO, VA, FM, MDI, FC, TD, PHASEM, PHASEC;
double phasec; double phasec;
double phases;
double phasem;
static bool warn1 = FALSE, warn2 = FALSE;
PHASEC = here->VSRCfunctionOrder > 5
? here->VSRCcoeffs[5] : 0.0;
PHASES = here->VSRCfunctionOrder > 6
VO = here->VSRCcoeffs[0];
VA = here->VSRCcoeffs[1];
FM = here->VSRCfunctionOrder > 2
? here->VSRCcoeffs[2] : (5./ckt->CKTfinalTime);
MDI = here->VSRCfunctionOrder > 3
? here->VSRCcoeffs[3] : 90.0; /* 0.9 * FC / FM */
FC = here->VSRCfunctionOrder > 4
&& here->VSRCcoeffs[4] /* test if not 0 */
? here->VSRCcoeffs[4] : (500./ckt->CKTfinalTime);
TD = here->VSRCfunctionOrder > 5
? here->VSRCcoeffs[5] : 0;
PHASEM = here->VSRCfunctionOrder > 6
? here->VSRCcoeffs[6] : 0.0; ? here->VSRCcoeffs[6] : 0.0;
PHASEC = here->VSRCfunctionOrder > 7
? here->VSRCcoeffs[7] : 0.0;
/* compute phases in radians */ /* compute phases in radians */
phasec = PHASEC * M_PI / 180.0; phasec = PHASEC * M_PI / 180.0;
phases = PHASES * M_PI / 180.0;
phasem = PHASEM * M_PI / 180.0;
VO = here->VSRCcoeffs[0];
VA = here->VSRCcoeffs[1];
FC = here->VSRCfunctionOrder > 2
&& here->VSRCcoeffs[2]
? here->VSRCcoeffs[2] : (1/ckt->CKTfinalTime);
MDI = here->VSRCfunctionOrder > 3
? here->VSRCcoeffs[3] : 0.0;
FS = here->VSRCfunctionOrder > 4
&& here->VSRCcoeffs[4]
? here->VSRCcoeffs[4] : (1/ckt->CKTfinalTime);
/* compute waveform value */
value = VO + VA *
sin((2.0 * M_PI * FC * time + phasec) +
MDI * sin(2.0 * M_PI * FS * time + phases));
/* limit the modulation index */
if (MDI > FC / FM) {
MDI = FC / FM;
if (!warn1){
fprintf(stderr, "Warning: MDI in %s limited to FC/FM\n", here->gen.GENname);
warn1 = TRUE;
}
}
else if (MDI < 0) {
MDI = 0;
if (!warn2) {
fprintf(stderr, "Warning: MDI in %s set to 0\n", here->gen.GENname);
warn2 = TRUE;
}
}
time -= TD;
if (time <= 0) {
value = 0;
}
else {
/* compute waveform value */
value = VO + VA *
sin((2.0 * M_PI * FC * time + phasec) +
MDI * sin(2.0 * M_PI * FM * time + phasem));
}
} }
break; break;
case AM: { case AM: {
double VO, VA, FM, MD, FC, TD, PHASEM, PHASEC;
double phasec;
double phasem;
double VO, VMO, VMA, FM, FC, TD, PHASEM, PHASEC;
double phasem, phasec;
VO = here->VSRCcoeffs[0]; VO = here->VSRCcoeffs[0];
VA = here->VSRCcoeffs[1];
FM = here->VSRCfunctionOrder > 2
&& here->VSRCcoeffs[2]
? here->VSRCcoeffs[2] : (5. / ckt->CKTfinalTime);
MD = here->VSRCfunctionOrder > 3
? here->VSRCcoeffs[3] : 0.5;
VMO = here->VSRCcoeffs[1];
VMA = here->VSRCfunctionOrder > 2
? here->VSRCcoeffs[2] : 1.;
FM = here->VSRCfunctionOrder > 3
? here->VSRCcoeffs[3] : (5. / ckt->CKTfinalTime);
FC = here->VSRCfunctionOrder > 4 FC = here->VSRCfunctionOrder > 4
? here->VSRCcoeffs[4] : (500. / ckt->CKTfinalTime); ? here->VSRCcoeffs[4] : (500. / ckt->CKTfinalTime);
TD = here->VSRCfunctionOrder > 5 TD = here->VSRCfunctionOrder > 5
&& here->VSRCcoeffs[5]
? here->VSRCcoeffs[5] : 0.0; ? here->VSRCcoeffs[5] : 0.0;
PHASEM = here->VSRCfunctionOrder > 6 PHASEM = here->VSRCfunctionOrder > 6
? here->VSRCcoeffs[6] : 0.0; ? here->VSRCcoeffs[6] : 0.0;
@ -286,18 +304,12 @@ VSRCload(GENmodel *inModel, CKTcircuit *ckt)
phasec = PHASEC * M_PI / 180.0; phasec = PHASEC * M_PI / 180.0;
phasem = PHASEM * M_PI / 180.0; phasem = PHASEM * M_PI / 180.0;
/* limit the modulation depth */
if (MD > 1)
MD = 1;
else if (MD < 0)
MD = 0;
time -= TD; time -= TD;
if (time <= 0) { if (time <= 0) {
value = 0; value = 0;
} else { } else {
/* compute waveform value */ /* compute waveform value */
value = VO + VA * (1 + MD * sin(2.0 * M_PI * FM * time + phasem)) *
value = VO + (VMO + VMA * sin(2.0 * M_PI * FM * time + phasem)) *
sin(2.0 * M_PI * FC * time + phasec); sin(2.0 * M_PI * FC * time + phasec);
} }
} }

Write Preview
Loading…
Cancel
Save