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

hsm2eval.c, hsmhveval.c, swallow type conversion warnings

This commit is contained in:
rlar 2011-06-30 18:37:56 +00:00
parent 50da26feb6
commit 046dc4410b
3 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,6 +1,11 @@
2011-06-30 Robert Larice
* src/spicelib/devices/hisim2/hsm2eval.c ,
* src/spicelib/devices/hisimhv/hsmhveval.c :
hsm2eval.c, hsmhveval.c, swallow type conversion warnings
2011-06-30 Dietmar Warning
* src/spicelib/devices/hisim2/hsm2eval.c: use macros for CeilingPow
and smoothZero instead of static functions
* src/spicelib/devices/hisim2/hsm2eval.c:
use macros for CeilingPow() and smoothZero() instead of static functions
2011-06-30 Robert Larice
* src/ciderlib/oned/oneadmit.c ,

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

@ -239,7 +239,7 @@ double TMF1 , TMF2 , TMF3 , TMF4 ;
* smoothZero: flooring to zero.
* y = 0.5 ( x + sqrt( x^2 + 4 delta^2 ) )
*-----------------*/
/*
#if 0
static double smoothZero
(
double x,
@ -251,7 +251,7 @@ static double smoothZero
if (dx) *dx = 0.5 * ( 1.0 + x / sqr ) ;
return 0.5 * ( x + sqr ) ;
}
*/
#endif
/*---------------------------------------------------*
* CeilingPow: ceiling for positive x, flooring for negative x.
* y = x * xmax / ( x^{2m} + xmax^{2m} )^{1/(2m)}
@ -260,7 +260,7 @@ static double smoothZero
* - -xmax < y < xmax.
* - dy/dx|_{x=0} = 1.
*-----------------*/
/*
#if 0
static double CeilingPow
(
double x,
@ -303,7 +303,7 @@ static double CeilingPow
(*dx) = xmax * xmp * dnm / arg ;
return result ;
}
*/
#endif
/*---------------------------------------------------*
* CeilingPow: ceiling for positive x, flooring for negative x.
* y = x * xmax / ( x^{2m} + xmax^{2m} )^{1/(2m)}
@ -5331,8 +5331,8 @@ start_of_mobility:
Vdbgmt = Vdsgmt - Vbsgmt ;
Vgbgmt = Vgsgmt - Vbsgmt ;
Vsbgmt = - Vbsgmt ;
flg_overs = flg_ovloops * ModeNML + flg_ovloopd * ModeRVS ; /* geometrical source */
flg_overd = flg_ovloops * ModeRVS + flg_ovloopd * ModeNML ; /* geometrical drain */
flg_overs = flg_ovloops * (int)ModeNML + flg_ovloopd * (int)ModeRVS ; /* geometrical source */
flg_overd = flg_ovloops * (int)ModeRVS + flg_ovloopd * (int)ModeNML ; /* geometrical drain */
Vxbgmt = flg_overs * Vsbgmt + flg_overd * Vdbgmt ;
/*---------------------------------------------------*
@ -5931,8 +5931,8 @@ start_of_mobility:
/*-----------------------------------*
* Additional constant capacitance model
*-----------------*/
flg_overgiven = ( ModeRVS * model->HSM2_cgso_Given
+ ModeNML * model->HSM2_cgdo_Given ) ;
flg_overgiven = ( (int)ModeRVS * model->HSM2_cgso_Given
+ (int)ModeNML * model->HSM2_cgdo_Given ) ;
if ( flg_overgiven ) {
Cgdo = ModeRVS * pParam->HSM2_cgso + ModeNML * pParam->HSM2_cgdo ;
Cgdo *= - here->HSM2_weff_nf ;
@ -5942,8 +5942,8 @@ start_of_mobility:
Qgod_dVgs += -Cgdo ;
}
flg_overgiven = ( ModeNML * model->HSM2_cgso_Given
+ ModeRVS * model->HSM2_cgdo_Given ) ;
flg_overgiven = ( (int)ModeNML * model->HSM2_cgso_Given
+ (int)ModeRVS * model->HSM2_cgdo_Given ) ;
if(flg_overgiven) {
Cgso = ModeNML * pParam->HSM2_cgso + ModeRVS * pParam->HSM2_cgdo ;
Cgso *= - here->HSM2_weff_nf ;

20
src/spicelib/devices/hisimhv/hsmhveval.c
View File

@ -4942,8 +4942,8 @@ start_of_mobility:
/*-----------------------------------------------------------*
* Overlap charges
*-----------------*/
Coovlps = ModeNML * model->HSMHV_coovlps + ModeRVS * model->HSMHV_coovlp ;
Coovlpd = ModeRVS * model->HSMHV_coovlps + ModeNML * model->HSMHV_coovlp ;
Coovlps = (int)ModeNML * model->HSMHV_coovlps + (int)ModeRVS * model->HSMHV_coovlp ;
Coovlpd = (int)ModeRVS * model->HSMHV_coovlps + (int)ModeNML * model->HSMHV_coovlp ;
Lovers = ModeNML * here->HSMHV_lovers + ModeRVS * here->HSMHV_loverld ;
Loverd = ModeRVS * here->HSMHV_lovers + ModeNML * here->HSMHV_loverld ;
Novers = ModeNML * pParam->HSMHV_novers + ModeRVS * pParam->HSMHV_nover ;
@ -4957,8 +4957,8 @@ start_of_mobility:
* Constant capacitance model
*-----------------*/
if ( Coovlps == 0 ) {
flg_overgiven = ( ModeNML * model->HSMHV_cgso_Given
+ ModeRVS * model->HSMHV_cgdo_Given ) ;
flg_overgiven = ( (int)ModeNML * model->HSMHV_cgso_Given
+ (int)ModeRVS * model->HSMHV_cgdo_Given ) ;
if ( flg_overgiven ) {
Cgso = ModeNML * pParam->HSMHV_cgso + ModeRVS * pParam->HSMHV_cgdo ;
Cgso *= - here->HSMHV_weffcv_nf ;
@ -5060,8 +5060,8 @@ start_of_mobility:
/*-----------------------------------*
* Additional constant capacitance model
*-----------------*/
flg_overgiven = ( ModeNML * model->HSMHV_cgso_Given
+ ModeRVS * model->HSMHV_cgdo_Given ) ;
flg_overgiven = ( (int)ModeNML * model->HSMHV_cgso_Given
+ (int)ModeRVS * model->HSMHV_cgdo_Given ) ;
if ( flg_overgiven ) {
Cgso = ModeNML * pParam->HSMHV_cgso + ModeRVS * pParam->HSMHV_cgdo ;
Cgso *= - here->HSMHV_weffcv_nf ;
@ -5079,8 +5079,8 @@ start_of_mobility:
* Constant capacitance model
*-----------------*/
if ( Coovlpd == 0 ) {
flg_overgiven = ( ModeRVS * model->HSMHV_cgso_Given
+ ModeNML * model->HSMHV_cgdo_Given ) ;
flg_overgiven = ( (int)ModeRVS * model->HSMHV_cgso_Given
+ (int)ModeNML * model->HSMHV_cgdo_Given ) ;
if ( flg_overgiven ) {
Cgdo = ModeRVS * pParam->HSMHV_cgso + ModeNML * pParam->HSMHV_cgdo ;
Cgdo *= - here->HSMHV_weffcv_nf ;
@ -5180,8 +5180,8 @@ start_of_mobility:
/*-----------------------------------*
* Additional constant capacitance model
*-----------------*/
flg_overgiven = ( ModeRVS * model->HSMHV_cgso_Given
+ ModeNML * model->HSMHV_cgdo_Given ) ;
flg_overgiven = ( (int)ModeRVS * model->HSMHV_cgso_Given
+ (int)ModeNML * model->HSMHV_cgdo_Given ) ;
if ( flg_overgiven ) {
Cgdo = ModeRVS * pParam->HSMHV_cgso + ModeNML * pParam->HSMHV_cgdo ;
Cgdo *= - here->HSMHV_weffcv_nf ;