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

Enable RKM notation for R and C, when ngbehavior LT is selected. 

Add 2 evaluation functions specific for R and C respectively.
R has code letters L, R, K, M, G, T enabled. M here is Meg!
C has code letters p, n, u or µ, m, F. F here is unity, femto is
not available, m is still milli!
Two examples files show all cases.
pre-master-46
Holger Vogt 5 years ago
parent
df5e7e36f6
commit
daa3609e58
6 changed files with 280 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      examples/various/RKM-C-1.cir
  2. 19
      examples/various/RKM-R-1.cir
  3. 3
      src/include/ngspice/inpdefs.h
  4. 2
      src/spicelib/parser/inp2c.c
  5. 2
      src/spicelib/parser/inp2r.c
  6. 244
      src/spicelib/parser/inpeval.c

19
examples/various/RKM-C-1.cir
View File

@ -0,0 +1,19 @@
RKM Capacitors
V1 2 0 1
R1 2 1 4K7
C1 1 0 4p7
C2 1 0 4n7
C3 1 0 4u7
C4 1 0 4m7
C5 1 0 4F7
C6 1 0 47p3
C7 1 0 470p
C8 1 0 4µ76 tc1=1e-6 tc2=1e-9 dtemp=6
C9 1 0 4m7
.control
show c
.endc
.end

19
examples/various/RKM-R-1.cir
View File

@ -0,0 +1,19 @@
RKM Resistors
V1 1 0 1
R1 1 0 4K7
R2 1 0 4R7
R3 1 0 R47
R4 1 0 470R
R5 1 0 47K
R6 1 0 47K3
R7 1 0 470K
R8 1 0 4M7 tc1=1e-6 tc2=1e-9 dtemp=6
R9 1 0 4L7
R10 1 0 470L
.control
show r
.endc
.end

3
src/include/ngspice/inpdefs.h
View File

@ -116,7 +116,8 @@ char *INPerrCat(char *, char *);
char *INPstrCat(char *, char, char *);
char *INPerror(int);
double INPevaluate(char **, int *, int);
double INPevaluateRKM(char **, int *, int);
double INPevaluateRKM_R(char **, int *, int);
double INPevaluateRKM_C(char **, int *, int);
char *INPfindLev(char *, int *);
char *INPgetMod(CKTcircuit *, char *, INPmodel **, INPtables *);
char *INPgetModBin(CKTcircuit *, char *, INPmodel **, INPtables *, char *);

2
src/spicelib/parser/inp2c.c
View File

@ -58,7 +58,7 @@ void INP2C(CKTcircuit *ckt, INPtables * tab, struct card *current)
/* enable reading values like 4u7 */
if (newcompat.lt)
val = INPevaluateRKM(&line, &error1, 1); /* [<val>] */
val = INPevaluateRKM_C(&line, &error1, 1); /* [<val>] */
else
val = INPevaluate(&line, &error1, 1); /* [<val>] */

2
src/spicelib/parser/inp2r.c
View File

@ -67,7 +67,7 @@ void INP2R(CKTcircuit *ckt, INPtables * tab, struct card *current)
/* enable reading values like 4k7 */
if (newcompat.lt)
val = INPevaluateRKM(&line, &error1, 1); /* [<val>] */
val = INPevaluateRKM_R(&line, &error1, 1); /* [<val>] */
else
val = INPevaluate(&line, &error1, 1); /* [<val>] */

244
src/spicelib/parser/inpeval.c
View File

@ -200,9 +200,9 @@ INPevaluate(char **line, int *error, int gobble)
/* In addition to fcn INPevaluate() above, allow values like 4k7,
similar to the RKM code (used bei inp2c and inp2r) */
similar to the RKM code (used by inp2r) */
double
INPevaluateRKM(char** line, int* error, int gobble)
INPevaluateRKM_R(char** line, int* error, int gobble)
/* gobble: non-zero to gobble rest of token, zero to leave it alone */
{
char* token;
@ -250,7 +250,7 @@ INPevaluateRKM(char** line, int* error, int gobble)
sign = -1;
}
if ((*here == '\0') || ((!(isdigit_c(*here))) && (*here != '.'))) {
if ((*here == '\0') || ((!(isdigit_c(*here))) && (*here != '.') && (*here != 'r'))) {
/* number looks like just a sign! */
*error = 1;
if (gobble) {
@ -363,6 +363,8 @@ INPevaluateRKM(char** line, int* error, int gobble)
break;
case 'r':
case 'R':
case 'f':
case 'F': /* no femto when compat LT */
expo1 = expo1;
hasmulti = TRUE;
break;
@ -376,9 +378,234 @@ INPevaluateRKM(char** line, int* error, int gobble)
expo1 = expo1 - 12;
hasmulti = TRUE;
break;
case 'm':
case 'M':
if (((here[1] == 'E') || (here[1] == 'e')) &&
((here[2] == 'G') || (here[2] == 'g')))
{
expo1 = expo1 + 6; /* Meg */
here += 2;
hasmulti = TRUE;
}
else if (((here[1] == 'I') || (here[1] == 'i')) &&
((here[2] == 'L') || (here[2] == 'l')))
{
expo1 = expo1 - 6;
mantis *= 25.4; /* Mil */
}
else {
expo1 = expo1 + 6; /* Meg as well */
hasmulti = TRUE;
}
break;
case 'l':
case 'L':
expo1 = expo1 - 3; /* m, milli */
hasmulti = TRUE;
break;
default:
break;
}
/* read a digit after multiplier */
if (hasmulti) {
here++;
while (isdigit_c(*here)) {
deci = 10 * deci + *here - '0';
expo3 = expo3 - 1;
here++;
}
mantis = mantis + deci * pow(10.0, (double)expo3);
}
if (gobble) {
FREE(token);
}
else {
*line = here;
}
return (sign * mantis *
pow(10.0, (double)(expo1 + expsgn * expo2)));
}
/* In addition to fcn INPevaluate() above, allow values like 4k7,
similar to the RKM code (used by inp2r) */
double
INPevaluateRKM_C(char** line, int* error, int gobble)
/* gobble: non-zero to gobble rest of token, zero to leave it alone */
{
char* token;
char* here;
double mantis;
double deci;
int expo1;
int expo2;
int expo3;
int sign;
int expsgn;
char* tmpline;
bool hasmulti = FALSE;
/* setup */
tmpline = *line;
if (gobble) {
/* MW. INPgetUTok should be called with gobble=0 or it make
* errors in v(1,2) exp */
*error = INPgetUTok(line, &token, 0);
if (*error)
return (0.0);
}
else {
token = *line;
*error = 0;
}
mantis = 0;
deci = 0;
expo1 = 0;
expo2 = 0;
expo3 = 0;
sign = 1;
expsgn = 1;
/* loop through all of the input token */
here = token;
if (*here == '+')
here++; /* plus, so do nothing except skip it */
else if (*here == '-') { /* minus, so skip it, and change sign */
here++;
sign = -1;
}
if ((*here == '\0') || ((!(isdigit_c(*here))) && (*here != '.') && (*here != 'r'))) {
/* number looks like just a sign! */
*error = 1;
if (gobble) {
FREE(token);
/* back out the 'gettok' operation */
*line = tmpline;
}
return (0);
}
while (isdigit_c(*here)) {
/* digit, so accumulate it. */
mantis = 10 * mantis + *here - '0';
here++;
}
if (*here == '\0') {
/* reached the end of token - done. */
if (gobble) {
FREE(token);
}
else {
*line = here;
}
return ((double)mantis * sign);
}
if (*here == ':') {
/* ':' is no longer used for subcircuit node numbering
but is part of ternary function a?b:c
FIXME : subcircuit models still use ':' for model numbering
Will this hurt somewhere? */
if (gobble) {
FREE(token);
}
else {
*line = here;
}
return ((double)mantis * sign);
}
/* after decimal point! */
if (*here == '.') {
/* found a decimal point! */
here++; /* skip to next character */
if (*here == '\0') {
/* number ends in the decimal point */
if (gobble) {
FREE(token);
}
else {
*line = here;
}
return ((double)mantis * sign);
}
while (isdigit_c(*here)) {
/* digit, so accumulate it. */
mantis = 10 * mantis + *here - '0';
expo1 = expo1 - 1;
here++;
}
}
/* now look for "E","e",etc to indicate an exponent */
if ((*here == 'E') || (*here == 'e') || (*here == 'D') || (*here == 'd')) {
/* have an exponent, so skip the e */
here++;
/* now look for exponent sign */
if (*here == '+')
here++; /* just skip + */
else if (*here == '-') {
here++; /* skip over minus sign */
expsgn = -1; /* and make a negative exponent */
/* now look for the digits of the exponent */
}
while (isdigit_c(*here)) {
expo2 = 10 * expo2 + *here - '0';
here++;
}
}
/* now we have all of the numeric part of the number, time to
* look for the scale factor (alphabetic)
*/
switch (*here) {
case 't':
case 'T':
expo1 = expo1 + 12;
hasmulti = TRUE;
break;
case 'g':
case 'G':
expo1 = expo1 + 9;
hasmulti = TRUE;
break;
case 'k':
case 'K':
expo1 = expo1 + 3;
hasmulti = TRUE;
break;
case 'u':
case 'U':
expo1 = expo1 - 6;
hasmulti = TRUE;
break;
case 'r':
case 'R':
case 'f':
case 'F':
expo1 = expo1 - 15;
case 'F': /* no femto when compat LT */
expo1 = expo1;
hasmulti = TRUE;
break;
case 'n':
case 'N':
expo1 = expo1 - 9;
hasmulti = TRUE;
break;
case 'p':
case 'P':
expo1 = expo1 - 12;
hasmulti = TRUE;
break;
case 'm':
@ -397,10 +624,15 @@ INPevaluateRKM(char** line, int* error, int gobble)
mantis *= 25.4; /* Mil */
}
else {
expo1 = expo1 - 3; /* m, milli */
expo1 = expo1 - 3; /* Meg as well */
hasmulti = TRUE;
}
break;
case 'l':
case 'L':
expo1 = expo1 - 3; /* m, milli */
hasmulti = TRUE;
break;
default:
break;
}

Write Preview
Loading…
Cancel
Save