parent
7fc4c6b5bd
commit
77131a2a33
|
|
@ -67,7 +67,6 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Function declarations
|
* Function declarations
|
||||||
*/
|
*/
|
||||||
|
|
@ -78,7 +77,6 @@ static void ExpandTranslationArrays( MatrixPtr, int );
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* CLEAR MATRIX
|
* CLEAR MATRIX
|
||||||
*
|
*
|
||||||
|
|
@ -225,7 +223,6 @@ ElementPtr pElement;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* SINGLE ELEMENT ADDITION TO MATRIX BY INDEX
|
* SINGLE ELEMENT ADDITION TO MATRIX BY INDEX
|
||||||
*
|
*
|
||||||
|
|
@ -290,7 +287,8 @@ spGetElement(MatrixPtr Matrix, int Row, int Col)
|
||||||
/* Re-size Matrix if necessary. */
|
/* Re-size Matrix if necessary. */
|
||||||
if ((Row > Matrix->Size) || (Col > Matrix->Size))
|
if ((Row > Matrix->Size) || (Col > Matrix->Size))
|
||||||
EnlargeMatrix( Matrix, MAX(Row, Col) );
|
EnlargeMatrix( Matrix, MAX(Row, Col) );
|
||||||
if (Matrix->Error == spNO_MEMORY) return NULL;
|
if (Matrix->Error == spNO_MEMORY)
|
||||||
|
return NULL;
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
@ -321,12 +319,6 @@ spGetElement(MatrixPtr Matrix, int Row, int Col)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* FIND ELEMENT BY SEARCHING COLUMN
|
* FIND ELEMENT BY SEARCHING COLUMN
|
||||||
*
|
*
|
||||||
|
|
@ -396,11 +388,8 @@ spcFindElementInCol(MatrixPtr Matrix, ElementPtr *LastAddr,
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#if TRANSLATE
|
#if TRANSLATE
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* TRANSLATE EXTERNAL INDICES TO INTERNAL
|
* TRANSLATE EXTERNAL INDICES TO INTERNAL
|
||||||
*
|
*
|
||||||
|
|
@ -508,7 +497,6 @@ Translate(MatrixPtr Matrix, int *Row, int *Col)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#if QUAD_ELEMENT
|
#if QUAD_ELEMENT
|
||||||
/*
|
/*
|
||||||
* ADDITION OF ADMITTANCE TO MATRIX BY INDEX
|
* ADDITION OF ADMITTANCE TO MATRIX BY INDEX
|
||||||
|
|
@ -573,7 +561,6 @@ spGetAdmittance(MatrixPtr Matrix, int Node1, int Node2,
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#if QUAD_ELEMENT
|
#if QUAD_ELEMENT
|
||||||
/*
|
/*
|
||||||
* ADDITION OF FOUR ELEMENTS TO MATRIX BY INDEX
|
* ADDITION OF FOUR ELEMENTS TO MATRIX BY INDEX
|
||||||
|
|
@ -656,7 +643,6 @@ spGetQuad(MatrixPtr Matrix, int Row1, int Row2, int Col1, int Col2,
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#if QUAD_ELEMENT
|
#if QUAD_ELEMENT
|
||||||
/*
|
/*
|
||||||
* ADDITION OF FOUR STRUCTURAL ONES TO MATRIX BY INDEX
|
* ADDITION OF FOUR STRUCTURAL ONES TO MATRIX BY INDEX
|
||||||
|
|
@ -723,7 +709,6 @@ spGetOnes(MatrixPtr Matrix, int Pos, int Neg, int Eqn,
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
*
|
*
|
||||||
* CREATE AND SPLICE ELEMENT INTO MATRIX
|
* CREATE AND SPLICE ELEMENT INTO MATRIX
|
||||||
|
|
@ -790,7 +775,8 @@ spcCreateElement(MatrixPtr Matrix, int Row, int Col,
|
||||||
if (pElement == NULL) return NULL;
|
if (pElement == NULL) return NULL;
|
||||||
|
|
||||||
/* If element is on diagonal, store pointer in Diag. */
|
/* If element is on diagonal, store pointer in Diag. */
|
||||||
if (Row == Col) Matrix->Diag[Row] = pElement;
|
if (Row == Col)
|
||||||
|
Matrix->Diag[Row] = pElement;
|
||||||
|
|
||||||
/* Initialize Element. */
|
/* Initialize Element. */
|
||||||
pCreatedElement = pElement;
|
pCreatedElement = pElement;
|
||||||
|
|
@ -835,7 +821,6 @@ spcCreateElement(MatrixPtr Matrix, int Row, int Col,
|
||||||
pElement->NextInRow = pLastElement->NextInRow;
|
pElement->NextInRow = pLastElement->NextInRow;
|
||||||
pLastElement->NextInRow = pElement;
|
pLastElement->NextInRow = pElement;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
@ -876,8 +861,6 @@ spcCreateElement(MatrixPtr Matrix, int Row, int Col,
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
*
|
*
|
||||||
* LINK ROWS
|
* LINK ROWS
|
||||||
|
|
@ -937,7 +920,6 @@ spcLinkRows(MatrixPtr Matrix)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ENLARGE MATRIX
|
* ENLARGE MATRIX
|
||||||
*
|
*
|
||||||
|
|
@ -1026,7 +1008,6 @@ EnlargeMatrix(MatrixPtr Matrix, int NewSize)
|
||||||
|
|
||||||
|
|
||||||
#if TRANSLATE
|
#if TRANSLATE
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* EXPAND TRANSLATION ARRAYS
|
* EXPAND TRANSLATION ARRAYS
|
||||||
*
|
*
|
||||||
|
|
@ -1087,8 +1068,6 @@ ExpandTranslationArrays(MatrixPtr Matrix, int NewSize)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#if INITIALIZE
|
#if INITIALIZE
|
||||||
/*
|
/*
|
||||||
* INITIALIZE MATRIX
|
* INITIALIZE MATRIX
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue