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

src/ciderlib/twod/twocont.c

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

src/ciderlib/twod/twoncont.c

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

src/ciderlib/twod/twopcont.c

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

src/spicelib/devices/cpl/cplsetup.c

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