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

rm obsolete casts

This commit is contained in:
dwarning 2023-06-08 12:28:20 +02:00
parent db7b9ecae4
commit 302ac1bd19
7 changed files with 90 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/maths/sparse/spAllocate.c
View File

@ -675,8 +675,8 @@ spErrorState( MatrixPtr Matrix )
/* Begin `spErrorState'. */ /* Begin `spErrorState'. */
if (Matrix != NULL) if (Matrix != NULL)
{ ASSERT_IS_SPARSE( (MatrixPtr)Matrix ); { ASSERT_IS_SPARSE( Matrix );
return ((MatrixPtr)Matrix)->Error; return (Matrix)->Error;
} }
else return spNO_MEMORY; /* This error may actually be spPANIC, else return spNO_MEMORY; /* This error may actually be spPANIC,
* no way to tell. */ * no way to tell. */
@ -779,9 +779,9 @@ spSetReal( MatrixPtr Matrix )
{ {
/* Begin `spSetReal'. */ /* Begin `spSetReal'. */
ASSERT_IS_SPARSE( (MatrixPtr)Matrix ); ASSERT_IS_SPARSE( Matrix );
vASSERT( REAL, "Sparse not compiled to handle real matrices" ); vASSERT( REAL, "Sparse not compiled to handle real matrices" );
((MatrixPtr)Matrix)->Complex = NO; Matrix->Complex = NO;
return; return;
} }
@ -798,9 +798,9 @@ spSetComplex( MatrixPtr Matrix )
{ {
/* Begin `spSetComplex'. */ /* Begin `spSetComplex'. */
ASSERT_IS_SPARSE( (MatrixPtr)Matrix ); ASSERT_IS_SPARSE( Matrix );
vASSERT( spCOMPLEX, "Sparse not compiled to handle complex matrices" ); vASSERT( spCOMPLEX, "Sparse not compiled to handle complex matrices" );
((MatrixPtr)Matrix)->Complex = YES; Matrix->Complex = YES;
return; return;
} }
@ -824,8 +824,8 @@ spFillinCount( MatrixPtr Matrix )
{ {
/* Begin `spFillinCount'. */ /* Begin `spFillinCount'. */
ASSERT_IS_SPARSE( (MatrixPtr)Matrix ); ASSERT_IS_SPARSE( Matrix );
return ((MatrixPtr)Matrix)->Fillins; return Matrix->Fillins;
} }
@ -843,8 +843,8 @@ spElementCount( MatrixPtr Matrix )
{ {
/* Begin `spElementCount'. */ /* Begin `spElementCount'. */
ASSERT_IS_SPARSE( (MatrixPtr)Matrix ); ASSERT_IS_SPARSE( Matrix );
return ((MatrixPtr)Matrix)->Elements; return Matrix->Elements;
} }
int int
@ -852,7 +852,7 @@ spOriginalCount( MatrixPtr Matrix )
{ {
/* Begin `spOriginalCount'. */ /* Begin `spOriginalCount'. */
ASSERT_IS_SPARSE( (MatrixPtr)Matrix ); ASSERT_IS_SPARSE( Matrix );
return ((MatrixPtr)Matrix)->Elements; return Matrix->Elements;
} }

7
src/maths/sparse/spBuild.c
View File

@ -75,8 +75,9 @@
static void Translate( MatrixPtr, int*, int* ); static void Translate( MatrixPtr, int*, int* );
static void ExpandTranslationArrays( MatrixPtr, int ); static void ExpandTranslationArrays( MatrixPtr, int );
#endif #endif
#if EXPANDABLE
static void EnlargeMatrix( MatrixPtr, int ); static void EnlargeMatrix( MatrixPtr, int );
#endif
@ -969,7 +970,7 @@ register int Col;
#if EXPANDABLE
/* /*
* ENLARGE MATRIX * ENLARGE MATRIX
@ -1049,7 +1050,7 @@ register int I, OldAllocatedSize = Matrix->AllocatedSize;
return; return;
} }
#endif

19
src/maths/sparse/spFactor.c
View File

@ -69,14 +69,18 @@
* Function declarations * Function declarations
*/ */
#if spCOMPLEX
static int FactorComplexMatrix( MatrixPtr ); static int FactorComplexMatrix( MatrixPtr );
#endif
//static void CreateInternalVectors( MatrixPtr ); //static void CreateInternalVectors( MatrixPtr );
static void CountMarkowitz( MatrixPtr, RealVector, int ); static void CountMarkowitz( MatrixPtr, RealVector, int );
static void MarkowitzProducts( MatrixPtr, int ); static void MarkowitzProducts( MatrixPtr, int );
static ElementPtr SearchForPivot( MatrixPtr, int, int ); static ElementPtr SearchForPivot( MatrixPtr, int, int );
static ElementPtr SearchForSingleton( MatrixPtr, int ); static ElementPtr SearchForSingleton( MatrixPtr, int );
#if DIAGONAL_PIVOTING
static ElementPtr QuicklySearchDiagonal( MatrixPtr, int ); static ElementPtr QuicklySearchDiagonal( MatrixPtr, int );
static ElementPtr SearchDiagonal( MatrixPtr, int ); static ElementPtr SearchDiagonal( MatrixPtr, int );
#endif
static ElementPtr SearchEntireMatrix( MatrixPtr, int ); static ElementPtr SearchEntireMatrix( MatrixPtr, int );
static RealNumber FindLargestInCol( ElementPtr ); static RealNumber FindLargestInCol( ElementPtr );
static RealNumber FindBiggestInColExclude( MatrixPtr, ElementPtr, int ); static RealNumber FindBiggestInColExclude( MatrixPtr, ElementPtr, int );
@ -325,11 +329,12 @@ Done:
spError spError
spFactor( MatrixPtr Matrix ) spFactor( MatrixPtr Matrix )
{ {
#if REAL
register ElementPtr pElement; register ElementPtr pElement;
register ElementPtr pColumn; register ElementPtr pColumn;
register int Step, Size; register int Step, Size;
RealNumber Mult; RealNumber Mult;
#endif
/* Begin `spFactor'. */ /* Begin `spFactor'. */
ASSERT_IS_SPARSE( Matrix ); ASSERT_IS_SPARSE( Matrix );
ASSERT_NO_ERRORS( Matrix ); ASSERT_NO_ERRORS( Matrix );
@ -585,15 +590,23 @@ register ElementPtr pElement, pColumn;
register int Step, Size; register int Step, Size;
register int *Nc, *No; register int *Nc, *No;
register long *Nm; register long *Nm;
BOOLEAN *DoRealDirect, *DoCmplxDirect; #if spCOMPLEX
BOOLEAN *DoCmplxDirect;
#endif
#if REAL
BOOLEAN *DoRealDirect;
#endif
/* Begin `spPartition'. */ /* Begin `spPartition'. */
ASSERT_IS_SPARSE( Matrix ); ASSERT_IS_SPARSE( Matrix );
if (Matrix->Partitioned) return; if (Matrix->Partitioned) return;
Size = Matrix->Size; Size = Matrix->Size;
#if REAL
DoRealDirect = Matrix->DoRealDirect; DoRealDirect = Matrix->DoRealDirect;
#endif
#if spCOMPLEX
DoCmplxDirect = Matrix->DoCmplxDirect; DoCmplxDirect = Matrix->DoCmplxDirect;
#endif
Matrix->Partitioned = YES; Matrix->Partitioned = YES;
/* If partition is specified by the user, this is easy. */ /* If partition is specified by the user, this is easy. */

12
src/maths/sparse/spOutput.c
View File

@ -139,7 +139,10 @@ register int J = 0;
int I, Row, Col, Size, Top, StartCol = 1, StopCol, Columns, ElementCount = 0; int I, Row, Col, Size, Top, StartCol = 1, StopCol, Columns, ElementCount = 0;
double Magnitude, SmallestDiag, SmallestElement; double Magnitude, SmallestDiag, SmallestElement;
double LargestElement = 0.0, LargestDiag = 0.0; double LargestElement = 0.0, LargestDiag = 0.0;
ElementPtr pElement, pImagElements[PRINTER_WIDTH/10+1]; ElementPtr pElement;
#if spCOMPLEX
ElementPtr pImagElements[PRINTER_WIDTH/10+1];
#endif
int *PrintOrdToIntRowMap, *PrintOrdToIntColMap; int *PrintOrdToIntRowMap, *PrintOrdToIntColMap;
/* Begin `spPrint'. */ /* Begin `spPrint'. */
@ -258,8 +261,10 @@ int *PrintOrdToIntRowMap, *PrintOrdToIntColMap;
while(pElement != NULL AND pElement->Row != Row) while(pElement != NULL AND pElement->Row != Row)
pElement = pElement->NextInCol; pElement = pElement->NextInCol;
#if spCOMPLEX
if (Data) if (Data)
pImagElements[J - StartCol] = pElement; pImagElements[J - StartCol] = pElement;
#endif
if (pElement != NULL) if (pElement != NULL)
@ -557,7 +562,10 @@ spFileVector(
#endif #endif
) )
{ {
register int I, Size, Err; register int I, Size;
#if spCOMPLEX
register int Err;
#endif
FILE *pMatrixFile; FILE *pMatrixFile;
/* Begin `spFileVector'. */ /* Begin `spFileVector'. */

34
src/maths/sparse/spSMP.c
View File

@ -208,7 +208,11 @@ SMPcaSolve(
SMPmatrix *Matrix, SMPmatrix *Matrix,
double RHS[], double iRHS[], double Spare[], double iSpare[]) double RHS[], double iRHS[], double Spare[], double iSpare[])
{ {
#if spCOMPLEX
spSolveTransposed( Matrix, RHS, RHS, iRHS, iRHS ); spSolveTransposed( Matrix, RHS, RHS, iRHS, iRHS );
#else
spSolveTransposed( Matrix, RHS, RHS );
#endif
} }
/* /*
@ -219,7 +223,11 @@ SMPcSolve(
SMPmatrix *Matrix, SMPmatrix *Matrix,
double RHS[], double iRHS[], double Spare[], double iSpare[]) double RHS[], double iRHS[], double Spare[], double iSpare[])
{ {
#if spCOMPLEX
spSolve( Matrix, RHS, RHS, iRHS, iRHS ); spSolve( Matrix, RHS, RHS, iRHS, iRHS );
#else
spSolve( Matrix, RHS, RHS );
#endif
} }
/* /*
@ -230,7 +238,11 @@ SMPsolve(
SMPmatrix *Matrix, SMPmatrix *Matrix,
double RHS[], double Spare[]) double RHS[], double Spare[])
{ {
#if spCOMPLEX
spSolve( Matrix, RHS, RHS, (spREAL*)NULL, (spREAL*)NULL ); spSolve( Matrix, RHS, RHS, (spREAL*)NULL, (spREAL*)NULL );
#else
spSolve( Matrix, RHS, RHS );
#endif
} }
/* /*
@ -283,7 +295,11 @@ SMPmatrix *Matrix)
void void
SMPprintRHS(SMPmatrix *Matrix, char *Filename, RealVector RHS, RealVector iRHS) SMPprintRHS(SMPmatrix *Matrix, char *Filename, RealVector RHS, RealVector iRHS)
{ {
#if spCOMPLEX
spFileVector( Matrix, Filename, RHS, iRHS ); spFileVector( Matrix, Filename, RHS, iRHS );
#else
spFileVector( Matrix, Filename, RHS );
#endif
} }
/* /*
@ -318,8 +334,12 @@ SMPmatrix *Matrix,
SPcomplex *pMantissa, SPcomplex *pMantissa,
int *pExponent) int *pExponent)
{ {
#if spCOMPLEX
spDeterminant( Matrix, pExponent, &(pMantissa->real), spDeterminant( Matrix, pExponent, &(pMantissa->real),
&(pMantissa->imag) ); &(pMantissa->imag) );
#else
spDeterminant( Matrix, pExponent, &(pMantissa->real) );
#endif
return spErrorState( Matrix ); return spErrorState( Matrix );
} }
@ -332,8 +352,12 @@ SMPcDProd(SMPmatrix *Matrix, SPcomplex *pMantissa, int *pExponent)
double re, im, x, y, z; double re, im, x, y, z;
int p; int p;
#if spCOMPLEX
spDeterminant( Matrix, &p, &re, &im); spDeterminant( Matrix, &p, &re, &im);
#else
spDeterminant( Matrix, &p, &re );
im = 0.0;
#endif
#ifndef M_LN2 #ifndef M_LN2
#define M_LN2 0.69314718055994530942 #define M_LN2 0.69314718055994530942
#endif #endif
@ -504,7 +528,9 @@ SMPcZeroCol(SMPmatrix *Matrix, int Col)
Element = Element->NextInCol) Element = Element->NextInCol)
{ {
Element->Real = 0.0; Element->Real = 0.0;
#if spCOMPLEX
Element->Imag = 0.0; Element->Imag = 0.0;
#endif
} }
return spErrorState( Matrix ); return spErrorState( Matrix );
@ -534,7 +560,9 @@ SMPcAddCol(SMPmatrix *Matrix, int Accum_Col, int Addend_Col)
Accum = spcCreateElement(Matrix, Addend->Row, Accum_Col, Prev, 0, 0); Accum = spcCreateElement(Matrix, Addend->Row, Accum_Col, Prev, 0, 0);
} }
Accum->Real += Addend->Real; Accum->Real += Addend->Real;
#if spCOMPLEX
Accum->Imag += Addend->Imag; Accum->Imag += Addend->Imag;
#endif
Addend = Addend->NextInCol; Addend = Addend->NextInCol;
} }
@ -548,7 +576,11 @@ SMPcAddCol(SMPmatrix *Matrix, int Accum_Col, int Addend_Col)
void void
SMPmultiply(SMPmatrix *Matrix, double *RHS, double *Solution, double *iRHS, double *iSolution) SMPmultiply(SMPmatrix *Matrix, double *RHS, double *Solution, double *iRHS, double *iSolution)
{ {
#if spCOMPLEX
spMultiply(Matrix, RHS, Solution, iRHS, iSolution); spMultiply(Matrix, RHS, Solution, iRHS, iSolution);
#else
spMultiply(Matrix, RHS, Solution);
#endif
} }
/* /*

6
src/maths/sparse/spSolve.c
View File

@ -60,10 +60,12 @@
*/ */
#if spSEPARATED_COMPLEX_VECTORS #if spSEPARATED_COMPLEX_VECTORS
#if spCOMPLEX
static void SolveComplexMatrix( MatrixPtr, static void SolveComplexMatrix( MatrixPtr,
RealVector, RealVector, RealVector, RealVector ); RealVector, RealVector, RealVector, RealVector );
static void SolveComplexTransposedMatrix( MatrixPtr, static void SolveComplexTransposedMatrix( MatrixPtr,
RealVector, RealVector, RealVector, RealVector ); RealVector, RealVector, RealVector, RealVector );
#endif
#else #else
static void SolveComplexMatrix( MatrixPtr, RealVector, RealVector ); static void SolveComplexMatrix( MatrixPtr, RealVector, RealVector );
static void SolveComplexTransposedMatrix( MatrixPtr, static void SolveComplexTransposedMatrix( MatrixPtr,
@ -146,11 +148,13 @@ spSolve(
# endif # endif
) )
{ {
#if REAL
register ElementPtr pElement; register ElementPtr pElement;
register RealVector Intermediate; register RealVector Intermediate;
register RealNumber Temp; register RealNumber Temp;
register int I, *pExtOrder, Size; register int I, *pExtOrder, Size;
ElementPtr pPivot; ElementPtr pPivot;
#endif
void SolveComplexMatrix(); void SolveComplexMatrix();
/* Begin `spSolve'. */ /* Begin `spSolve'. */
@ -459,11 +463,13 @@ spSolveTransposed(
# endif # endif
) )
{ {
#if REAL
register ElementPtr pElement; register ElementPtr pElement;
register RealVector Intermediate; register RealVector Intermediate;
register int I, *pExtOrder, Size; register int I, *pExtOrder, Size;
ElementPtr pPivot; ElementPtr pPivot;
RealNumber Temp; RealNumber Temp;
#endif
void SolveComplexTransposedMatrix(); void SolveComplexTransposedMatrix();
/* Begin `spSolveTransposed'. */ /* Begin `spSolveTransposed'. */

13
src/maths/sparse/spUtils.c
View File

@ -71,9 +71,10 @@
/* /*
* Function declarations * Function declarations
*/ */
#if MODIFIED_NODAL
static int CountTwins( MatrixPtr, int, ElementPtr*, ElementPtr* ); static int CountTwins( MatrixPtr, int, ElementPtr*, ElementPtr* );
static void SwapCols( MatrixPtr, ElementPtr, ElementPtr ); static void SwapCols( MatrixPtr, ElementPtr, ElementPtr );
#endif
#if spCOMPLEX AND SCALING #if spCOMPLEX AND SCALING
static void ScaleComplexMatrix( MatrixPtr, RealVector, RealVector ); static void ScaleComplexMatrix( MatrixPtr, RealVector, RealVector );
#endif #endif
@ -604,10 +605,12 @@ spMultiply(
#endif #endif
) )
{ {
#if REAL
register ElementPtr pElement; register ElementPtr pElement;
register RealVector Vector; register RealVector Vector;
register RealNumber Sum; register RealNumber Sum;
register int I, *pExtOrder; register int I, *pExtOrder;
#endif
extern void ComplexMatrixMultiply(); extern void ComplexMatrixMultiply();
/* Begin `spMultiply'. */ /* Begin `spMultiply'. */
@ -794,11 +797,13 @@ spMultTransposed(
#endif #endif
) )
{ {
#if REAL
register ElementPtr pElement; register ElementPtr pElement;
register RealVector Vector; register RealVector Vector;
register RealNumber Sum; register RealNumber Sum;
register int I, *pExtOrder; register int I, *pExtOrder;
extern void ComplexTransposedMatrixMultiply(); extern void ComplexTransposedMatrixMultiply();
#endif
/* Begin `spMultTransposed'. */ /* Begin `spMultTransposed'. */
ASSERT_IS_SPARSE( Matrix ); ASSERT_IS_SPARSE( Matrix );
@ -2149,8 +2154,8 @@ int Row, Col, Error;
if (Matrix == NULL) if (Matrix == NULL)
Error = spNO_MEMORY; Error = spNO_MEMORY;
else else
{ ASSERT_IS_SPARSE( (MatrixPtr)Matrix ); { ASSERT_IS_SPARSE( Matrix );
Error = ((MatrixPtr)Matrix)->Error; Error = Matrix->Error;
} }
if (Error == spOKAY) return; if (Error == spOKAY) return;
@ -2187,7 +2192,7 @@ int Row, Col, Error;
} }
else ABORT(); else ABORT();
((MatrixPtr)Matrix)->Error = spOKAY; Matrix->Error = spOKAY;
return; return;
} }
#endif /* DOCUMENTATION */ #endif /* DOCUMENTATION */