From afd5147f987f9fc1666fc80d0c96822c32b37ad9 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sat, 30 Sep 2017 22:53:15 +0200
Subject: [PATCH] devices/res, #4/6, RESacConduct, include RESm

Henceforward RESacConduct (renamed to RESacConductX) shall include factor RESm.
That's a mere rewrite and doesn't change functionality.
---
 src/spicelib/devices/res/resask.c  | 2 +-
 src/spicelib/devices/res/resdefs.h | 2 +-
 src/spicelib/devices/res/resload.c | 2 +-
 src/spicelib/devices/res/respzld.c | 2 +-
 src/spicelib/devices/res/ressacl.c | 8 ++++----
 src/spicelib/devices/res/restemp.c | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/spicelib/devices/res/resask.c b/src/spicelib/devices/res/resask.c
index f0681da46..98357ec35 100644
--- a/src/spicelib/devices/res/resask.c
+++ b/src/spicelib/devices/res/resask.c
@@ -43,7 +43,7 @@ RESask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value,
         value->rValue = fast->RESresist;
         return(OK);
     case RES_ACCONDUCT:
-        value->rValue = fast->RESm * fast->RESacConduct;
+        value->rValue = fast->RESacConductX;
         return (OK);
     case RES_ACRESIST:
         value->rValue = fast->RESacResist;
diff --git a/src/spicelib/devices/res/resdefs.h b/src/spicelib/devices/res/resdefs.h
index 0c928115b..daf0ce4bc 100644
--- a/src/spicelib/devices/res/resdefs.h
+++ b/src/spicelib/devices/res/resdefs.h
@@ -35,7 +35,7 @@ typedef struct sRESinstance {
     double REScurrentX; /* The dc current in the resistor */
     /* serban */
     double RESacResist;             /* AC resistance, useful for fancy .ac analyses */
-    double RESacConduct;            /* AC conductance */
+    double RESacConductX;           /* AC conductance */
     double RESwidth;                /* width of the resistor */
     double RESlength;               /* length of the resistor */
     double RESscale;                /* Scale factor */
diff --git a/src/spicelib/devices/res/resload.c b/src/spicelib/devices/res/resload.c
index cb16f8470..22bf49719 100644
--- a/src/spicelib/devices/res/resload.c
+++ b/src/spicelib/devices/res/resload.c
@@ -57,7 +57,7 @@ RESacload(GENmodel *inModel, CKTcircuit *ckt)
              here = here->RESnextInstance) {
 
             if (here->RESacresGiven)
-                g = here->RESm * here->RESacConduct;
+                g = here->RESacConductX;
             else
                 g = here->RESm * here->RESconduct;
 
diff --git a/src/spicelib/devices/res/respzld.c b/src/spicelib/devices/res/respzld.c
index 86d69e8d6..7a5b73c22 100644
--- a/src/spicelib/devices/res/respzld.c
+++ b/src/spicelib/devices/res/respzld.c
@@ -34,7 +34,7 @@ RESpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
                 here=here->RESnextInstance) {
 
             if (here->RESacresGiven)
-                g = here->RESm * here->RESacConduct;
+                g = here->RESacConductX;
             else
                 g = here->RESm * here->RESconduct;
 
diff --git a/src/spicelib/devices/res/ressacl.c b/src/spicelib/devices/res/ressacl.c
index b63dd0f6e..2ba514d59 100644
--- a/src/spicelib/devices/res/ressacl.c
+++ b/src/spicelib/devices/res/ressacl.c
@@ -36,10 +36,10 @@ RESsAcLoad(GENmodel *inModel, CKTcircuit *ckt)
                     *(ckt->CKTrhsOld+here->RESnegNode);
                 ivalue = *(ckt->CKTirhsOld+here->RESposNode) -
                     *(ckt->CKTirhsOld+here->RESnegNode);
-                value *= here->RESm * here->RESacConduct;
-                value *= here->RESm * here->RESacConduct;
-                ivalue *= here->RESm * here->RESacConduct;
-                ivalue *= here->RESm * here->RESacConduct;
+                value *= here->RESacConductX;
+                value *= here->RESacConductX;
+                ivalue *= here->RESacConductX;
+                ivalue *= here->RESacConductX;
 
                 /* load the RHS matrix */
                 *(ckt->CKTsenInfo->SEN_RHS[here->RESposNode] + 
diff --git a/src/spicelib/devices/res/restemp.c b/src/spicelib/devices/res/restemp.c
index fbaf28205..df111407a 100644
--- a/src/spicelib/devices/res/restemp.c
+++ b/src/spicelib/devices/res/restemp.c
@@ -102,9 +102,9 @@ RESupdate_conduct(RESinstance *here, bool spill_warnings)
 
     /* Paolo Nenzi:  AC value */
     if (here->RESacresGiven) {
-        here->RESacConduct = (1.0/(here->RESacResist * factor * here->RESscale));
+        here->RESacConductX = here->RESm / (here->RESacResist * factor * here->RESscale);
     } else {
-        here->RESacConduct = here->RESconduct;
+        here->RESacConductX = here->RESm * here->RESconduct;
         here->RESacResist = here->RESresist;
     }
 }