From caf31157338ab81dd83103e432101a0def097275 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Mon, 29 Jan 2018 17:48:17 +0100
Subject: [PATCH] cleanup, emphasise CKTrhs being an array

when accessing slot [0]
---
 src/maths/ni/niaciter.c | 12 ++++++------
 src/maths/ni/niditer.c  | 12 ++++++------
 src/maths/ni/niiter.c   | 18 +++++++++---------
 src/maths/ni/niniter.c  |  5 +++--
 4 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/maths/ni/niaciter.c b/src/maths/ni/niaciter.c
index fe4aec3da..676d2cef9 100644
--- a/src/maths/ni/niaciter.c
+++ b/src/maths/ni/niaciter.c
@@ -69,12 +69,12 @@ retry:
             ckt->CKTirhsSpare);
     ckt->CKTstat->STATsolveTime += SPfrontEnd->IFseconds() - startTime;
 
-    *ckt->CKTrhs = 0;
-    *ckt->CKTrhsSpare = 0;
-    *ckt->CKTrhsOld = 0;
-    *ckt->CKTirhs = 0;
-    *ckt->CKTirhsSpare = 0;
-    *ckt->CKTirhsOld = 0;
+    ckt->CKTrhs[0] = 0;
+    ckt->CKTrhsSpare[0] = 0;
+    ckt->CKTrhsOld[0] = 0;
+    ckt->CKTirhs[0] = 0;
+    ckt->CKTirhsSpare[0] = 0;
+    ckt->CKTirhsOld[0] = 0;
 
     SWAP(double *, ckt->CKTirhs, ckt->CKTirhsOld);
 
diff --git a/src/maths/ni/niditer.c b/src/maths/ni/niditer.c
index 05611e7eb..78ee0864a 100644
--- a/src/maths/ni/niditer.c
+++ b/src/maths/ni/niditer.c
@@ -69,12 +69,12 @@ skip:
             ckt->CKTirhs, ckt->CKTrhsSpare,
             ckt->CKTirhsSpare);
 
-    *ckt->CKTrhs = 0;
-    *ckt->CKTrhsSpare = 0;
-    *ckt->CKTrhsOld = 0;
-    *ckt->CKTirhs = 0;
-    *ckt->CKTirhsSpare = 0;
-    *ckt->CKTirhsOld = 0;
+    ckt->CKTrhs[0] = 0;
+    ckt->CKTrhsSpare[0] = 0;
+    ckt->CKTrhsOld[0] = 0;
+    ckt->CKTirhs[0] = 0;
+    ckt->CKTirhsSpare[0] = 0;
+    ckt->CKTirhsOld[0] = 0;
 
     SWAP(double *, ckt->CKTirhs, ckt->CKTirhsOld);
 
diff --git a/src/maths/ni/niiter.c b/src/maths/ni/niiter.c
index 923766dd7..7611bb4a3 100644
--- a/src/maths/ni/niiter.c
+++ b/src/maths/ni/niiter.c
@@ -164,17 +164,17 @@ NIiter(CKTcircuit *ckt, int maxIter)
                 SPfrontEnd->IFseconds() - startTime;
 #ifdef STEPDEBUG
             /*XXXX*/
-            if (*ckt->CKTrhs != 0.0)
-                printf("NIiter: CKTrhs[0] = %g\n", *ckt->CKTrhs);
-            if (*ckt->CKTrhsSpare != 0.0)
-                printf("NIiter: CKTrhsSpare[0] = %g\n", *ckt->CKTrhsSpare);
-            if (*ckt->CKTrhsOld != 0.0)
-                printf("NIiter: CKTrhsOld[0] = %g\n", *ckt->CKTrhsOld);
+            if (ckt->CKTrhs[0] != 0.0)
+                printf("NIiter: CKTrhs[0] = %g\n", ckt->CKTrhs[0]);
+            if (ckt->CKTrhsSpare[0] != 0.0)
+                printf("NIiter: CKTrhsSpare[0] = %g\n", ckt->CKTrhsSpare[0]);
+            if (ckt->CKTrhsOld[0] != 0.0)
+                printf("NIiter: CKTrhsOld[0] = %g\n", ckt->CKTrhsOld[0]);
             /*XXXX*/
 #endif
-            *ckt->CKTrhs = 0;
-            *ckt->CKTrhsSpare = 0;
-            *ckt->CKTrhsOld = 0;
+            ckt->CKTrhs[0] = 0;
+            ckt->CKTrhsSpare[0] = 0;
+            ckt->CKTrhsOld[0] = 0;
 
             if (iterno > maxIter) {
                 /* fprintf(stderr, "too many iterations without convergence: %d iter's (max iter == %d)\n",
diff --git a/src/maths/ni/niniter.c b/src/maths/ni/niniter.c
index af4dc0bcc..fc83a4e86 100644
--- a/src/maths/ni/niniter.c
+++ b/src/maths/ni/niniter.c
@@ -33,6 +33,7 @@ NInzIter(CKTcircuit *ckt, int posDrive, int negDrive)
     ckt->CKTrhs [negDrive] = -1.0;
     SMPcaSolve(ckt->CKTmatrix, ckt->CKTrhs, ckt->CKTirhs, ckt->CKTrhsSpare,
 	    ckt->CKTirhsSpare);
-    *ckt->CKTrhs = 0.0;
-    *ckt->CKTirhs = 0.0;
+
+    ckt->CKTrhs [0] = 0.0;
+    ckt->CKTirhs [0] = 0.0;
 }