From 88074a23c9745fb5b8f068260ba12f7153bdfd20 Mon Sep 17 00:00:00 2001 From: Francesco Lannutti Date: Fri, 7 Aug 2020 16:36:04 +0200 Subject: [PATCH] Fixed 2 files due to rebasing KLU branch on the master branch - 8/7/2020 --- src/ciderlib/twod/twosolve.c | 2 +- src/spicelib/devices/cpl/cplsetup.c | 48 ++++++++++++++++++++--------- 2 files changed, 34 insertions(+), 16 deletions(-) diff --git a/src/ciderlib/twod/twosolve.c b/src/ciderlib/twod/twosolve.c index 8f75d8fb7..64617a14c 100644 --- a/src/ciderlib/twod/twosolve.c +++ b/src/ciderlib/twod/twosolve.c @@ -546,7 +546,7 @@ int TWOequilSolve(TWOdevice *pDevice) if (pDevice->matrix->SMPkluMatrix->KLUmatrixSymbolic == NULL) { printf ("CIDER: KLU Failed\n") ; if (pDevice->matrix->SMPkluMatrix->KLUmatrixCommon->status == KLU_EMPTY_MATRIX) { - return ; // Francesco Lannutti - Fix KLU return values + return E_NOMEM ; // Francesco Lannutti - Fix KLU return values } } printf ("CIDER: KLU to be fixed: spElementCount\n") ; diff --git a/src/spicelib/devices/cpl/cplsetup.c b/src/spicelib/devices/cpl/cplsetup.c index 1c55efc43..9dbfc91b4 100644 --- a/src/spicelib/devices/cpl/cplsetup.c +++ b/src/spicelib/devices/cpl/cplsetup.c @@ -234,21 +234,39 @@ do { if((here->ptr = SMPmakeElt(matrix, here->first, here->second)) == NULL){\ MATRIX_ALLOC(double, here->CPLibr2Ibr1Ptr, noL, noL); #ifdef KLU - VECTOR_ALLOC(here->CPLibr1Ibr1Binding, BindElement, noL); - VECTOR_ALLOC(here->CPLibr2Ibr2Binding, BindElement, noL); - VECTOR_ALLOC(here->CPLposIbr1Binding, BindElement, noL); - VECTOR_ALLOC(here->CPLnegIbr2Binding, BindElement, noL); - VECTOR_ALLOC(here->CPLposPosBinding, BindElement, noL); - VECTOR_ALLOC(here->CPLnegNegBinding, BindElement, noL); - VECTOR_ALLOC(here->CPLnegPosBinding, BindElement, noL); - VECTOR_ALLOC(here->CPLposNegBinding, BindElement, noL); - - MATRIX_ALLOC(here->CPLibr1PosBinding, BindElement, noL, noL); - MATRIX_ALLOC(here->CPLibr2NegBinding, BindElement, noL, noL); - MATRIX_ALLOC(here->CPLibr1NegBinding, BindElement, noL, noL); - MATRIX_ALLOC(here->CPLibr2PosBinding, BindElement, noL, noL); - MATRIX_ALLOC(here->CPLibr1Ibr2Binding, BindElement, noL, noL); - MATRIX_ALLOC(here->CPLibr2Ibr1Binding, BindElement, noL, noL); +// <<<<<<< HEAD +// VECTOR_ALLOC(here->CPLibr1Ibr1Binding, BindElement, noL); +// VECTOR_ALLOC(here->CPLibr2Ibr2Binding, BindElement, noL); +// VECTOR_ALLOC(here->CPLposIbr1Binding, BindElement, noL); +// VECTOR_ALLOC(here->CPLnegIbr2Binding, BindElement, noL); +// VECTOR_ALLOC(here->CPLposPosBinding, BindElement, noL); +// VECTOR_ALLOC(here->CPLnegNegBinding, BindElement, noL); +// VECTOR_ALLOC(here->CPLnegPosBinding, BindElement, noL); +// VECTOR_ALLOC(here->CPLposNegBinding, BindElement, noL); +// +// MATRIX_ALLOC(here->CPLibr1PosBinding, BindElement, noL, noL); +// MATRIX_ALLOC(here->CPLibr2NegBinding, BindElement, noL, noL); +// MATRIX_ALLOC(here->CPLibr1NegBinding, BindElement, noL, noL); +// MATRIX_ALLOC(here->CPLibr2PosBinding, BindElement, noL, noL); +// MATRIX_ALLOC(here->CPLibr1Ibr2Binding, BindElement, noL, noL); +// MATRIX_ALLOC(here->CPLibr2Ibr1Binding, BindElement, noL, noL); +// ======= +// VECTOR_ALLOC(BindElement, here->CPLibr1Ibr1Binding, noL); +// VECTOR_ALLOC(BindElement, here->CPLibr2Ibr2Binding, noL); +// VECTOR_ALLOC(BindElement, here->CPLposIbr1Binding, noL); +// VECTOR_ALLOC(BindElement, here->CPLnegIbr2Binding, noL); +// VECTOR_ALLOC(BindElement, here->CPLposPosBinding, noL); +// VECTOR_ALLOC(BindElement, here->CPLnegNegBinding, noL); +// VECTOR_ALLOC(BindElement, here->CPLnegPosBinding, noL); +// VECTOR_ALLOC(BindElement, here->CPLposNegBinding, noL); +// +// MATRIX_ALLOC(BindElement, here->CPLibr1PosBinding, noL, noL); +// MATRIX_ALLOC(BindElement, here->CPLibr2NegBinding, noL, noL); +// MATRIX_ALLOC(BindElement, here->CPLibr1NegBinding, noL, noL); +// MATRIX_ALLOC(BindElement, here->CPLibr2PosBinding, noL, noL); +// MATRIX_ALLOC(BindElement, here->CPLibr1Ibr2Binding, noL, noL); +// MATRIX_ALLOC(BindElement, here->CPLibr2Ibr1Binding, noL, noL); +// >>>>>>> Fixed 2 files due to rebasing KLU branch on the master branch - 8/7/2020 #endif branchname = TMALLOC(char*, here->dimension);