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

prevent warnings for double declared variables

This commit is contained in:
dwarning 2017-04-17 20:53:30 +02:00
parent 2f329bd8b4
commit 78cc48575b
4 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/spicelib/devices/hisim2/hsm2eval.c
View File

@ -298,10 +298,10 @@ static double CeilingPow
double xmax2 = (xmax) * (xmax) ; \
double xp = 1.0 , xmp = 1.0 ; \
int m , mm ; \
double arg , dnm ; \
double arg_cp , dnm ; \
for ( m = 0 ; m < pw ; m ++ ) { xp *= x2 ; xmp *= xmax2 ; } \
arg = xp + xmp ; \
dnm = arg ; \
arg_cp = xp + xmp ; \
dnm = arg_cp ; \
if ( pw == 1 || pw == 2 || pw == 4 || pw == 8 ) { \
if ( pw == 1 ) { mm = 1 ; \
} else if ( pw == 2 ) { mm = 2 ; \
@ -311,7 +311,7 @@ static double CeilingPow
} else { dnm = Fn_Pow( dnm , 1.0 / ( 2.0 * pw ) ) ; } \
dnm = 1.0 / dnm ; \
y = (x) * (xmax) * dnm ; \
dx = (xmax) * xmp * dnm / arg ; \
dx = (xmax) * xmp * dnm / arg_cp ; \
}
#define Fn_SU_CP2( y , x , xmax , delta , pw , dx , dxmax ) { \
@ -334,10 +334,10 @@ static double CeilingPow
double xmax2 = (xmax) * (xmax) ; \
double xp = 1.0 , xmp = 1.0 ; \
int m =0, mm =0; \
double arg =0.0, dnm =0.0; \
double arg_cp2 =0.0, dnm =0.0; \
for ( m = 0 ; m < pw ; m ++ ) { xp *= x2 ; xmp *= xmax2 ; } \
arg = xp + xmp ; \
dnm = arg ; \
arg_cp2 = xp + xmp ; \
dnm = arg_cp2 ; \
if ( pw == 1 || pw == 2 || pw == 4 || pw == 8 ) { \
if ( pw == 1 ) { mm = 1 ; \
} else if ( pw == 2 ) { mm = 2 ; \
@ -347,8 +347,8 @@ static double CeilingPow
} else { dnm = Fn_Pow( dnm , 1.0 / ( 2.0 * pw ) ) ; } \
dnm = 1.0 / dnm ; \
y = (x) * (xmax) * dnm ; \
dx = (xmax) * xmp * dnm / arg ; \
dxmax = (x) * xp * dnm / arg ; \
dx = (xmax) * xmp * dnm / arg_cp2 ; \
dxmax = (x) * xp * dnm / arg_cp2 ; \
}
#define Fn_SU_CP3( y , x , xmax , delta , pw , dx , dxmax , ddelta ) { \

3
src/spicelib/devices/hisim2/hsm2eval_dep.h
View File

@ -142,7 +142,7 @@ June 2008 (revised October 2011)
double C_QE2, C_ESI2, Tn2 ;
double q_Nsub, Ndepm2, q_Ndepm ;
double Ndepm2, q_Ndepm ;
double C_2ESIpq_Ndepm, C_2ESIpq_Ndepm_inv , C_2ESI_q_Ndepm ;
double C_2ESIpq_Nsub , C_2ESIpq_Nsub_inv ;
double ps_conv3 , ps_conv23 ;
@ -168,7 +168,6 @@ June 2008 (revised October 2011)
double Qn_drift, Qn_drift_dVgs, Qn_drift_dVds, Qn_drift_dVbs ;
double Ey_suf, Ey_suf_dVgs, Ey_suf_dVds, Ey_suf_dVbs ;
double Vbsc , Vbsc_dVbse ;
double DEPQFN1 = 2.0 ;
double DEPQFN3 = 0.3 ;

8
src/spicelib/devices/hisimhv1/hsmhveval.c
View File

@ -272,10 +272,10 @@ static double TMF0 , TMF1 , TMF2 , TMF3 , TMF4 ;
double xmax2 = (xmax) * (xmax) ; \
double xp = 1.0 , xmp = 1.0 ; \
int m =0, mm =0; \
double arg =0.0, dnm =0.0; \
double arg_cp =0.0, dnm =0.0; \
for ( m = 0 ; m < pw ; m ++ ) { xp *= x2 ; xmp *= xmax2 ; } \
arg = xp + xmp ; \
dnm = arg ; \
arg_cp = xp + xmp ; \
dnm = arg_cp ; \
if ( pw == 1 || pw == 2 || pw == 4 || pw == 8 ) { \
if ( pw == 1 ) { mm = 1 ; \
} else if ( pw == 2 ) { mm = 2 ; \
@ -285,7 +285,7 @@ static double TMF0 , TMF1 , TMF2 , TMF3 , TMF4 ;
} else { dnm = Fn_Pow( dnm , 1.0 / ( 2.0 * pw ) ) ; } \
dnm = 1.0 / dnm ; \
y = (x) * (xmax) * dnm ; \
dx = (xmax) * xmp * dnm / arg ; \
dx = (xmax) * xmp * dnm / arg_cp ; \
}
/*---------------------------------------------------*

2
src/spicelib/devices/hisimhv2/hsmhv2eval_dep.h
View File

@ -142,7 +142,7 @@ June 2008 (revised October 2011)
double C_QE2, C_ESI2, Tn2 ;
double q_Nsub, Ndepm2, q_Ndepm ;
double Ndepm2, q_Ndepm ;
double C_2ESIpq_Ndepm, C_2ESIpq_Ndepm_inv , C_2ESI_q_Ndepm ;
double C_2ESIpq_Nsub , C_2ESIpq_Nsub_inv ;
double ps_conv3 , ps_conv23 ;