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

RKM for C: Revert reading f, it is again femto 

Examples files include expected results
This commit is contained in:
Holger Vogt 2021-09-27 17:56:12 +02:00
parent 4bb1d84f9f
commit 22a878e49e
3 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,16 +2,18 @@ RKM Capacitors
V1 2 0 1 V1 2 0 1
R1 2 1 4K7 R1 2 1 4K7
C1 1 0 4p7 C1 1 0 4p7 ; 4.7p
C2 1 0 4n7 C2 1 0 4n7 ; 4.7n
C3 1 0 4u7 C3 1 0 4u7 ; 4.7u
C4 1 0 4m7 C4 1 0 4m7 ; 4.7m
C5 1 0 4F7 C5 1 0 4F7 ; 4.7f <-- This deviates fom the RKM notation
C6 1 0 47p3 C6 1 0 47p3 ; 4.73p
C7 1 0 470p C7 1 0 470p ; 470p
C8 1 0 4µ76 tc1=1e-6 tc2=1e-9 dtemp=6 C8 1 0 4u76 tc1=1e-6 tc2=1e-9 dtemp=6
C9 1 0 4m7 * ; 4.76u
C10 1 0 470nF C9 1 0 4m7 ; 4.7m
C10 1 0 470nF ; 470n
C11 1 0 47fF ; 47f <-- This deviates fom the RKM notation
.control .control
show c show c

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

@ -1,17 +1,18 @@
RKM Resistors RKM Resistors
V1 1 0 1 V1 1 0 1
R1 1 0 4K7 R1 1 0 4K7 ; 4.7k
R2 1 0 4R7 R2 1 0 4R7 ; 4.7
R3 1 0 R47 R3 1 0 R47 ; 0.47
R4 1 0 470R R4 1 0 470R ; 470
R5 1 0 47K R5 1 0 47K ; 47k
R6 1 0 47K3 R6 1 0 47K3 ; 47.3k
R7 1 0 470K R7 1 0 470K ; 470k
R8 1 0 4Meg7 tc1=1e-6 tc2=1e-9 dtemp=6 R8 1 0 4Meg7 tc1=1e-6 tc2=1e-9 dtemp=6
R9 1 0 4L7 * ; 4.7Meg <-- Not defined in the RKM notation
R10 1 0 470L R9 1 0 4L7 ; 4.7m
R11 1 0 4M7 R10 1 0 470L ; 470m
R11 1 0 4M7 ; 4.7m <-- This deviates fom the RKM notation
.control .control
show r show r

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

@ -593,8 +593,7 @@ INPevaluateRKM_C(char** line, int* error, int gobble)
break; break;
case 'r': case 'r':
case 'R': case 'R':
case 'f':
case 'F': /* no femto when compat LT */
expo1 = expo1; expo1 = expo1;
hasmulti = TRUE; hasmulti = TRUE;
break; break;
@ -608,6 +607,11 @@ INPevaluateRKM_C(char** line, int* error, int gobble)
expo1 = expo1 - 12; expo1 = expo1 - 12;
hasmulti = TRUE; hasmulti = TRUE;
break; break;
case 'f':
case 'F':
expo1 = expo1 - 15;
hasmulti = TRUE;
break;
case 'm': case 'm':
case 'M': case 'M':
if (((here[1] == 'E') || (here[1] == 'e')) && if (((here[1] == 'E') || (here[1] == 'e')) &&