Make previous KLU support check more transparent.

src/include/ngspice/cidersupt.h

@@ -89,15 +89,4 @@ extern BOOLEAN hasSORConverged(double *, double *, int);
 extern BOOLEAN foundError(int );
 extern BOOLEAN compareFiletypeVar(char *);
 
-#ifdef KLU
-#define klu_support_for_cider \
-    if (ckt->CKTkluMODE) { \
-        fprintf(stderr, "Error: CIDER simulation is not (yet) supported with 'option klu'.\n"); \
-        fprintf(stderr, "    Use 'option sparse' instead.\n"); \
-        controlled_exit(1); \
-    }
-#else
-#define klu_support_for_cider
-#endif
-
 #endif

src/spicelib/devices/nbjt/nbjtset.c

@@ -44,7 +44,13 @@ NBJTsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
   ONEmaterial *pM, *pMaterial = NULL, *materialList = NULL;
   double startTime;
 
-  klu_support_for_cider
+#ifdef KLU
+    if (ckt->CKTkluMODE) {
+        fprintf(stderr, "Error: CIDER simulation is not (yet) supported with 'option klu'.\n");
+        fprintf(stderr, "    Use 'option sparse' instead.\n");
+        controlled_exit(1);
+    }
+#endif
 
   /* loop through all the diode models */
   for (; model != NULL; model = NBJTnextModel(model)) {

src/spicelib/devices/nbjt2/nbt2set.c

@@ -47,7 +47,13 @@ NBJT2setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
   DOPtable *dopTableList = NULL;
   double startTime;
 
-   klu_support_for_cider
+#ifdef KLU
+    if (ckt->CKTkluMODE) {
+        fprintf(stderr, "Error: CIDER simulation is not (yet) supported with 'option klu'.\n");
+        fprintf(stderr, "    Use 'option sparse' instead.\n");
+        controlled_exit(1);
+    }
+#endif
 
   /* loop through all the models */
   for (; model != NULL; model = NBJT2nextModel(model)) {

src/spicelib/devices/numd/numdset.c

@@ -45,7 +45,14 @@ NUMDsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
   DOPtable *dopTableList = NULL;
   double startTime;
 
-  klu_support_for_cider
+
+#ifdef KLU
+    if (ckt->CKTkluMODE) {
+        fprintf(stderr, "Error: CIDER simulation is not (yet) supported with 'option klu'.\n");
+        fprintf(stderr, "    Use 'option sparse' instead.\n");
+        controlled_exit(1);
+    }
+#endif
 
   /* loop through all the models */
   for (; model != NULL; model = NUMDnextModel(model)) {

src/spicelib/devices/numd2/nud2set.c

@@ -47,7 +47,13 @@ NUMD2setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
   DOPtable *dopTableList = NULL;
   double startTime;
 
-  klu_support_for_cider
+#ifdef KLU
+    if (ckt->CKTkluMODE) {
+        fprintf(stderr, "Error: CIDER simulation is not (yet) supported with 'option klu'.\n");
+        fprintf(stderr, "    Use 'option sparse' instead.\n");
+        controlled_exit(1);
+    }
+#endif
 
   /* loop through all the models */
   for (; model != NULL; model = NUMD2nextModel(model)) {

src/spicelib/devices/numos/nummset.c

@@ -47,7 +47,13 @@ NUMOSsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
   DOPtable *dopTableList = NULL;
   double startTime;
 
-  klu_support_for_cider
+#ifdef KLU
+    if (ckt->CKTkluMODE) {
+        fprintf(stderr, "Error: CIDER simulation is not (yet) supported with 'option klu'.\n");
+        fprintf(stderr, "    Use 'option sparse' instead.\n");
+        controlled_exit(1);
+    }
+#endif
 
   /* loop through all the models */
   for (; model != NULL; model = NUMOSnextModel(model)) {