From 740987382bc68ae832247a85e7221e43b95ab9eb Mon Sep 17 00:00:00 2001
From: dwarning <dwarning>
Date: Thu, 25 Oct 2018 13:59:44 +0200
Subject: [PATCH] The 'then' statement was equivalent to the 'else' statement.

---
 src/spicelib/devices/bsim3v1/b3v1ld.c   | 24 ++++-----------
 src/spicelib/devices/bsim3v32/b3v32ld.c | 40 ++++---------------------
 src/spicelib/devices/bsimsoi/b4soild.c  |  3 +-
 3 files changed, 11 insertions(+), 56 deletions(-)

diff --git a/src/spicelib/devices/bsim3v1/b3v1ld.c b/src/spicelib/devices/bsim3v1/b3v1ld.c
index 4adc73e4a..7b751e0fb 100644
--- a/src/spicelib/devices/bsim3v1/b3v1ld.c
+++ b/src/spicelib/devices/bsim3v1/b3v1ld.c
@@ -2049,25 +2049,11 @@ line755:
           ag0 = ckt->CKTag[0];
 
 	  if (model->BSIM3v1capMod == 0)
-	  {   if (vgd < 0.0)
-	      {   
-	          cgdo = pParam->BSIM3v1cgdo;
-	          qgdo = pParam->BSIM3v1cgdo * vgd;
-	      }
-	      else
-	      {   cgdo = pParam->BSIM3v1cgdo;
-	          qgdo =  pParam->BSIM3v1cgdo * vgd;
-	      }
-
-	      if (vgs < 0.0)
-	      {   
-	          cgso = pParam->BSIM3v1cgso;
-	          qgso = pParam->BSIM3v1cgso * vgs;
-	      }
-	      else
-	      {   cgso = pParam->BSIM3v1cgso;
-	          qgso =  pParam->BSIM3v1cgso * vgs;
-	      }
+	  {
+	      cgdo = pParam->BSIM3v1cgdo;
+	      qgdo = pParam->BSIM3v1cgdo * vgd;
+	      cgso = pParam->BSIM3v1cgso;
+	      qgso = pParam->BSIM3v1cgso * vgs;
 	  }
 	  else if (model->BSIM3v1capMod == 1)
 	  {   if (vgd < 0.0)
diff --git a/src/spicelib/devices/bsim3v32/b3v32ld.c b/src/spicelib/devices/bsim3v32/b3v32ld.c
index 19d217829..06c153c32 100644
--- a/src/spicelib/devices/bsim3v32/b3v32ld.c
+++ b/src/spicelib/devices/bsim3v32/b3v32ld.c
@@ -2808,41 +2808,11 @@ line755:
 
           if (model->BSIM3v32capMod == 0)
           {
-              /* Added revision dependent code */
-              switch (model->BSIM3v32intVersion) {
-                case BSIM3v32V324:
-                case BSIM3v32V323:
-                  /* code merge -JX */
-                  cgdo = pParam->BSIM3v32cgdo;
-                  qgdo = pParam->BSIM3v32cgdo * vgd;
-                  cgso = pParam->BSIM3v32cgso;
-                  qgso = pParam->BSIM3v32cgso * vgs;
-                  break;
-                case BSIM3v32V322:
-                case BSIM3v32V32:
-                default:
-                  if (vgd < 0.0)
-                    {
-                      cgdo = pParam->BSIM3v32cgdo;
-                      qgdo = pParam->BSIM3v32cgdo * vgd;
-                    }
-                  else
-                    {
-                      cgdo = pParam->BSIM3v32cgdo;
-                      qgdo = pParam->BSIM3v32cgdo * vgd;
-                    }
-
-                  if (vgs < 0.0)
-                    {
-                      cgso = pParam->BSIM3v32cgso;
-                      qgso = pParam->BSIM3v32cgso * vgs;
-                    }
-                  else
-                    {
-                      cgso = pParam->BSIM3v32cgso;
-                      qgso = pParam->BSIM3v32cgso * vgs;
-                    }
-              }
+              /* code merge -JX */
+              cgdo = pParam->BSIM3v32cgdo;
+              qgdo = pParam->BSIM3v32cgdo * vgd;
+              cgso = pParam->BSIM3v32cgso;
+              qgso = pParam->BSIM3v32cgso * vgs;
           }
           else if (model->BSIM3v32capMod == 1)
           {   if (vgd < 0.0)
diff --git a/src/spicelib/devices/bsimsoi/b4soild.c b/src/spicelib/devices/bsimsoi/b4soild.c
index bb1b4519d..73f5465c7 100644
--- a/src/spicelib/devices/bsimsoi/b4soild.c
+++ b/src/spicelib/devices/bsimsoi/b4soild.c
@@ -1708,8 +1708,7 @@ int B4SOILoadOMP(B4SOIinstance *here, CKTcircuit *ckt) {
             dVbs_dVb = 1.0;
             dVbs_dVe = 0.0;
             dVbs_dT = 0.0;
-            if (selfheat)  dVbsmos_dT = 0.0;
-            else  dVbsmos_dT = 0.0;
+            dVbsmos_dT = 0.0;
 
             Vbp = Vbs - Vps;
             dVbp_dVb = 1;