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

KLU branch rebased upon master @ 3 Feb 2022 

Some merge conflicts have not been solved yet
Please look for >>>> HEAD if you want to solve them
This commit is contained in:
Francesco Lannutti 2022-02-04 01:12:42 +01:00 committed by Holger Vogt
parent b900527341
commit 02e7c1c5b0
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ciderlib/twod/twocont.c
View File

@ -769,7 +769,7 @@ void
// pNode->fPPsiOx = spGetElement( matrix, pEqn, psiEqnOxM ); // pNode->fPPsiOx = spGetElement( matrix, pEqn, psiEqnOxM );
// pNode->fPPsiOxP1 = spGetElement( matrix, pEqn, psiEqnOxP ); // pNode->fPPsiOxP1 = spGetElement( matrix, pEqn, psiEqnOxP );
// ======= // =======
// if ( nIndex <= 1 ) { /* Top Side */ if ( nIndex <= 1 ) { /* Top Side */
// //
// #ifdef KLU // #ifdef KLU
// pNode->fNPsiIn = SMPmakeEltKLUforCIDER (matrix, nEqn, psiEqnInM) ; // pNode->fNPsiIn = SMPmakeEltKLUforCIDER (matrix, nEqn, psiEqnInM) ;

2
src/ciderlib/twod/twoncont.c
View File

@ -500,7 +500,7 @@ void
// pNode->fNPsiOx = spGetElement( matrix, nEqn, psiEqnOxM ); // pNode->fNPsiOx = spGetElement( matrix, nEqn, psiEqnOxM );
// pNode->fNPsiOxP1 = spGetElement( matrix, nEqn, psiEqnOxP ); // pNode->fNPsiOxP1 = spGetElement( matrix, nEqn, psiEqnOxP );
// ======= // =======
// if ( nIndex <= 1 ) { /* Top Side */ if ( nIndex <= 1 ) { /* Top Side */
// //
// #ifdef KLU // #ifdef KLU
// pNode->fNPsiIn = SMPmakeEltKLUforCIDER (matrix, nEqn, psiEqnInM) ; // pNode->fNPsiIn = SMPmakeEltKLUforCIDER (matrix, nEqn, psiEqnInM) ;

2
src/ciderlib/twod/twopcont.c
View File

@ -500,7 +500,7 @@ void
// pNode->fPPsiOx = spGetElement( matrix, pEqn, psiEqnOxM ); // pNode->fPPsiOx = spGetElement( matrix, pEqn, psiEqnOxM );
// pNode->fPPsiOxP1 = spGetElement( matrix, pEqn, psiEqnOxP ); // pNode->fPPsiOxP1 = spGetElement( matrix, pEqn, psiEqnOxP );
// ======= // =======
// if ( nIndex <= 1 ) { /* Top Side */ if ( nIndex <= 1 ) { /* Top Side */
// //
// #ifdef KLU // #ifdef KLU
// pNode->fPPsiIn = SMPmakeEltKLUforCIDER (matrix, pEqn, psiEqnInM) ; // pNode->fPPsiIn = SMPmakeEltKLUforCIDER (matrix, pEqn, psiEqnInM) ;

1
src/spicelib/devices/cpl/cplsetup.c
View File

@ -347,7 +347,6 @@ do { if((here->ptr = SMPmakeElt(matrix, here->first, here->second)) == NULL){\
} }
return(OK); return(OK);
}
} }