From de5e2acceaeb4eadec057d018fdab7d99556092a Mon Sep 17 00:00:00 2001
From: Francesco Lannutti <nicolati@users.sourceforge.net>
Date: Fri, 2 Nov 2012 16:59:31 +0100
Subject: [PATCH] Reverted the previous commit "Corrected a possible bug..."

---
 src/maths/KLU/klusmp.c | 18 ++++++++++--------
 src/maths/ni/niiter.c  | 14 +++++++-------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/maths/KLU/klusmp.c b/src/maths/KLU/klusmp.c
index 7fb97b85e..0bc56d488 100644
--- a/src/maths/KLU/klusmp.c
+++ b/src/maths/KLU/klusmp.c
@@ -232,14 +232,16 @@ SMPluFac (SMPmatrix *Matrix, double PivTol, double Gmin)
         LoadGmin_CSC (Matrix->CKTdiag_CSC, Matrix->CKTkluN, Gmin) ;
         ret = klu_refactor (Matrix->CKTkluAp, Matrix->CKTkluAi, Matrix->CKTkluAx,
                             Matrix->CKTkluSymbolic, Matrix->CKTkluNumeric, Matrix->CKTkluCommon) ;
-        if (ret == 1)
-            return 0 ;
-        else if (ret == 0)
-            return (E_SINGULAR) ;
-        else {
-            fprintf (stderr, "KLU Error in re-factor!") ;
-            return 1 ;
-        }
+        return (!ret) ;
+
+//        if (ret == 1)
+//            return 0 ;
+//        else if (ret == 0)
+//            return (E_SINGULAR) ;
+//        else {
+//            fprintf (stderr, "KLU Error in re-factor!") ;
+//            return 1 ;
+//        }
     } else {
         spSetReal (Matrix->SPmatrix) ;
         LoadGmin (Matrix, Gmin) ;
diff --git a/src/maths/ni/niiter.c b/src/maths/ni/niiter.c
index f10aafab0..a5610eb3b 100644
--- a/src/maths/ni/niiter.c
+++ b/src/maths/ni/niiter.c
@@ -26,8 +26,8 @@ int
 NIiter(CKTcircuit *ckt, int maxIter)
 {
     /* Francesco Lannutti - NEED TO PIVOT Fix */
-    int SMPreorderFromSMPluFac ;
-    SMPreorderFromSMPluFac = 0 ;
+//    int SMPreorderFromSMPluFac ;
+//    SMPreorderFromSMPluFac = 0 ;
 
     int iterno;
     int ipass;
@@ -84,12 +84,12 @@ NIiter(CKTcircuit *ckt, int maxIter)
 #endif /* NEWPRED */
 
             /* Francesco Lannutti - NEED TO PIVOT Fix */
-            error = 0 ;
-            if (!SMPreorderFromSMPluFac)
-            {
+//            error = 0 ;
+//            if (!SMPreorderFromSMPluFac)
+//            {
                 error = CKTload (ckt) ;
                 iterno++ ;
-            }
+//            }
 
             /*printf("loaded, noncon is %d\n",ckt->CKTnoncon);*/
             /*fflush(stdout);*/
@@ -156,7 +156,7 @@ NIiter(CKTcircuit *ckt, int maxIter)
                     if( error == E_SINGULAR ) {
 
                         /* Francesco Lannutti - NEED TO PIVOT Fix */
-                        SMPreorderFromSMPluFac = 1 ;
+//                        SMPreorderFromSMPluFac = 1 ;
 
                         ckt->CKTniState |= NISHOULDREORDER;
                         DEBUGMSG(" forced reordering....\n");