From 02e7c1c5b0182454c8a55d96f8ad67c629df2be3 Mon Sep 17 00:00:00 2001 From: Francesco Lannutti Date: Fri, 4 Feb 2022 01:12:42 +0100 Subject: [PATCH] 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 | 2 +- src/ciderlib/twod/twoncont.c | 2 +- src/ciderlib/twod/twopcont.c | 2 +- src/spicelib/devices/cpl/cplsetup.c | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/ciderlib/twod/twocont.c b/src/ciderlib/twod/twocont.c index c1673c6f8..a92955578 100644 --- a/src/ciderlib/twod/twocont.c +++ b/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) ; diff --git a/src/ciderlib/twod/twoncont.c b/src/ciderlib/twod/twoncont.c index be782b390..066a12e71 100644 --- a/src/ciderlib/twod/twoncont.c +++ b/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) ; diff --git a/src/ciderlib/twod/twopcont.c b/src/ciderlib/twod/twopcont.c index 60053ec6d..f64726d44 100644 --- a/src/ciderlib/twod/twopcont.c +++ b/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) ; diff --git a/src/spicelib/devices/cpl/cplsetup.c b/src/spicelib/devices/cpl/cplsetup.c index 9dbfc91b4..ccefe901f 100644 --- a/src/spicelib/devices/cpl/cplsetup.c +++ b/src/spicelib/devices/cpl/cplsetup.c @@ -347,7 +347,6 @@ do { if((here->ptr = SMPmakeElt(matrix, here->first, here->second)) == NULL){\ } return(OK); - } }