From 777a922fd8e9ee69fc4b5bc8f4bc4f8be9c43829 Mon Sep 17 00:00:00 2001
From: pnenzi <pnenzi>
Date: Wed, 24 Jan 2001 11:11:56 +0000
Subject: [PATCH] Updated model to 4.1.0

---
 src/spicelib/devices/bsim4/b4.c      |   6 +-
 src/spicelib/devices/bsim4/b4acld.c  |  14 +-
 src/spicelib/devices/bsim4/b4ask.c   |   6 +-
 src/spicelib/devices/bsim4/b4check.c |  23 ++-
 src/spicelib/devices/bsim4/b4del.c   |   6 +-
 src/spicelib/devices/bsim4/b4dest.c  |   6 +-
 src/spicelib/devices/bsim4/b4geo.c   |   6 +-
 src/spicelib/devices/bsim4/b4getic.c |   6 +-
 src/spicelib/devices/bsim4/b4ld.c    | 206 +++++++++++++++++----------
 src/spicelib/devices/bsim4/b4mask.c  |   6 +-
 src/spicelib/devices/bsim4/b4mdel.c  |   6 +-
 src/spicelib/devices/bsim4/b4mpar.c  |   6 +-
 src/spicelib/devices/bsim4/b4noi.c   |  14 +-
 src/spicelib/devices/bsim4/b4par.c   |   6 +-
 src/spicelib/devices/bsim4/b4pzld.c  |  10 +-
 src/spicelib/devices/bsim4/b4set.c   |   9 +-
 src/spicelib/devices/bsim4/b4temp.c  |  10 +-
 src/spicelib/devices/bsim4/b4trunc.c |   6 +-
 18 files changed, 220 insertions(+), 132 deletions(-)

diff --git a/src/spicelib/devices/bsim4/b4.c b/src/spicelib/devices/bsim4/b4.c
index b210f5425..5cb611b83 100644
--- a/src/spicelib/devices/bsim4/b4.c
+++ b/src/spicelib/devices/bsim4/b4.c
@@ -1,10 +1,12 @@
-/**** BSIM4.0.0, Released by Weidong Liu 3/24/2000 ****/
+/**** BSIM4.1.0, Released by Weidong Liu 10/11/2000 ****/
 
 /**********
  * Copyright 2000 Regents of the University of California. All rights reserved.
- * File: b4.c of BSIM4.0.0.
+ * File: b4.c of BSIM4.1.0.
  * Authors: Weidong Liu, Kanyu M. Cao, Xiaodong Jin, Chenming Hu.
  * Project Director: Prof. Chenming Hu.
+ *
+ * Modified by Weidong Liu, 10/11/2000.
  **********/
 
 #include "ngspice.h"
diff --git a/src/spicelib/devices/bsim4/b4acld.c b/src/spicelib/devices/bsim4/b4acld.c
index bdab5a50e..955675668 100644
--- a/src/spicelib/devices/bsim4/b4acld.c
+++ b/src/spicelib/devices/bsim4/b4acld.c
@@ -1,10 +1,12 @@
-/**** BSIM4.0.0, Released by Weidong Liu 3/24/2000 ****/
+/**** BSIM4.1.0, Released by Weidong Liu 10/11/2000 ****/
 
 /**********
  * Copyright 2000 Regents of the University of California. All rights reserved.
- * File: b4acld.c of BSIM4.0.0.
+ * File: b4acld.c of BSIM4.1.0.
  * Authors: Weidong Liu, Xiaodong Jin, Kanyu M. Cao, Chenming Hu.
  * Project Director: Prof. Chenming Hu.
+ *
+ * Modified by Weidong Liu, 10/11/2000.
  **********/
 
 #include "ngspice.h"
@@ -40,13 +42,13 @@ double gIgtotg, gIgtotd, gIgtots, gIgtotb;
 double cgso, cgdo, cgbo;
 double gbspsp, gbbdp, gbbsp, gbspg, gbspb;
 double gbspdp, gbdpdp, gbdpg, gbdpb, gbdpsp;
-double T0, T1, T2, T3;
-double Csg, Csd, Css;
+double T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11;
+double Csg, Csd, Css, Csb;
 double Cdgr, Cddr, Cdsr, Cdbr, Csgr, Csdr, Cssr, Csbr;
 double Cdgi, Cddi, Cdsi, Cdbi, Csgi, Csdi, Cssi, Csbi;
 double gmr, gmi, gmbsr, gmbsi, gdsr, gdsi;
-double FwdSumr, RevSumr, Gmr, Gmbsr;
-double FwdSumi, RevSumi, Gmi, Gmbsi;
+double FwdSumr, RevSumr, Gmr, Gmbsr, Gdsr;
+double FwdSumi, RevSumi, Gmi, Gmbsi, Gdsi;
 struct bsim4SizeDependParam *pParam;
 
     omega = ckt->CKTomega;
diff --git a/src/spicelib/devices/bsim4/b4ask.c b/src/spicelib/devices/bsim4/b4ask.c
index 9449eff48..475c73c67 100644
--- a/src/spicelib/devices/bsim4/b4ask.c
+++ b/src/spicelib/devices/bsim4/b4ask.c
@@ -1,10 +1,12 @@
-/**** BSIM4.0.0, Released by Weidong Liu 3/24/2000 ****/
+/**** BSIM4.1.0, Released by Weidong Liu 10/11/2000 ****/
 
 /**********
  * Copyright 2000 Regents of the University of California. All rights reserved.
- * File: b4ask.c of BSIM4.0.0.
+ * File: b4ask.c of BSIM4.1.0.
  * Authors: Weidong Liu, Kanyu M. Cao, Xiaodong Jin, Chenming Hu.
  * Project Director: Prof. Chenming Hu.
+ *
+ * Modified by Weidong Liu, 10/11/2000.
  **********/
 
 #include "ngspice.h"
diff --git a/src/spicelib/devices/bsim4/b4check.c b/src/spicelib/devices/bsim4/b4check.c
index 867a32fd7..5b03e6cbe 100644
--- a/src/spicelib/devices/bsim4/b4check.c
+++ b/src/spicelib/devices/bsim4/b4check.c
@@ -1,10 +1,12 @@
-/**** BSIM4.0.0, Released by Weidong Liu 3/24/2000 ****/
+/**** BSIM4.1.0, Released by Weidong Liu 10/11/2000 ****/
 
 /**********
  * Copyright 2000 Regents of the University of California. All rights reserved.
- * File: b4check.c of BSIM4.0.0.
+ * File: b4check.c of BSIM4.1.0.
  * Authors: Weidong Liu, Kanyu M. Cao, Xiaodong Jin, Chenming Hu.
  * Project Director: Prof. Chenming Hu.
+ *
+ * Modified by Weidong Liu, 10/11/2000.
  **********/
 
 #include "ngspice.h"
@@ -35,17 +37,18 @@ FILE *fplog;
         fprintf(fplog, "\n");
 	fprintf(fplog, "++++++++++ BSIM4 PARAMETER CHECKING BELOW ++++++++++\n");
 
-        if (strcmp(model->BSIM4version, "4.0.0") != 0)
-        {  fprintf(fplog, "Warning: This model is BSIM4.0.0; you specified a wrong version number.\n");
-           printf("Warning: This model is BSIM4.0.0; you specified a wrong version number.\n");
+        if (strcmp(model->BSIM4version, "4.1.0") != 0)
+        {  fprintf(fplog, "Warning: This model is BSIM4.1.0; you specified a wrong version number.\n");
+           printf("Warning: This model is BSIM4.1.0; you specified a wrong version number.\n");
         }
 	fprintf(fplog, "Model = %s\n", model->BSIM4modName);
 
 
         if ((here->BSIM4rgateMod == 2) || (here->BSIM4rgateMod == 3))
         {   if ((here->BSIM4trnqsMod == 1) || (here->BSIM4acnqsMod == 1))
-            fprintf(fplog, "Warning: You've selected both Rg and charge deficit NQS; select one only.\n");
-            printf("Warning: You've selected both Rg and charge deficit NQS; select one only.\n");
+             {   fprintf(fplog, "Warning: You've selected both Rg and charge deficit NQS; select one only.\n");
+                 printf("Warning: You've selected both Rg and charge deficit NQS; select one only.\n");
+             }
         }
 
 
@@ -207,11 +210,7 @@ FILE *fplog;
             printf("Fatal: Number of finger = %g is smaller than one.\n", here->BSIM4nf);
             Fatal_Flag = 1;
         }
-        if (here->BSIM4nf > 500.0)
-        {   here->BSIM4nf = 20.0;
-            fprintf(fplog, "Warning: Nf = %g is too large; reset to 20.0.\n", here->BSIM4nf);
-            printf("Warning: Nf = %g is too large; reset to 20.0.\n", here->BSIM4nf);
-        }
+        
 
         if (here->BSIM4l <= model->BSIM4xgl)
         {   fprintf(fplog, "Fatal: The parameter xgl must be smaller than Ldrawn.\n");
diff --git a/src/spicelib/devices/bsim4/b4del.c b/src/spicelib/devices/bsim4/b4del.c
index ef326a86d..84ba88f43 100644
--- a/src/spicelib/devices/bsim4/b4del.c
+++ b/src/spicelib/devices/bsim4/b4del.c
@@ -1,10 +1,12 @@
-/**** BSIM4.0.0, Released by Weidong Liu 3/24/2000 ****/
+/**** BSIM4.1.0, Released by Weidong Liu 10/1/2000 ****/
 
 /**********
  * Copyright 2000 Regents of the University of California. All rights reserved.
- * File: b4del.c of BSIM4.0.0.
+ * File: b4del.c of BSIM4.1.0.
  * Authors: Weidong Liu, Kanyu M. Cao, Xiaodong Jin, Chenming Hu.
  * Project Director: Prof. Chenming Hu.
+ *
+ * Modified by Weidong Liu, 10/11/2000.
  **********/
 
 #include "ngspice.h"
diff --git a/src/spicelib/devices/bsim4/b4dest.c b/src/spicelib/devices/bsim4/b4dest.c
index ae96f883f..ce0c4e06a 100644
--- a/src/spicelib/devices/bsim4/b4dest.c
+++ b/src/spicelib/devices/bsim4/b4dest.c
@@ -1,10 +1,12 @@
-/**** BSIM4.0.0, Released by Weidong Liu 3/24/2000 ****/
+/**** BSIM4.1.0, Released by Weidong Liu 10/11/2000 ****/
 
 /**********
  * Copyright 2000 Regents of the University of California. All rights reserved.
- * File: b4dest.c of BSIM4.0.0.
+ * File: b4dest.c of BSIM4.1.0.
  * Authors: Weidong Liu, Kanyu M. Cao, Xiaodong Jin, Chenming Hu.
  * Project Director: Prof. Chenming Hu.
+ *
+ * Modified by Weidong Liu, 10/11/2000.
  **********/
 
 #include "ngspice.h"
diff --git a/src/spicelib/devices/bsim4/b4geo.c b/src/spicelib/devices/bsim4/b4geo.c
index 6f1122471..b98dd7c93 100644
--- a/src/spicelib/devices/bsim4/b4geo.c
+++ b/src/spicelib/devices/bsim4/b4geo.c
@@ -1,10 +1,12 @@
-/**** BSIM4.0.0, Released by Weidong Liu 3/24/2000 ****/
+/**** BSIM4.1.0, Released by Weidong Liu 10/11/2000 ****/
 
 /**********
  * Copyright 2000 Regents of the University of California. All rights reserved.
- * File: b4geo.c of BSIM4.0.0.
+ * File: b4geo.c of BSIM4.1.0.
  * Authors: Weidong Liu, Kanyu M. Cao, Xiaodong Jin, Chenming Hu.
  * Project Director: Prof. Chenming Hu.
+ *
+ * Modified by Weidong Liu, 10/11/2000.
  **********/
 
 #include "ngspice.h"
diff --git a/src/spicelib/devices/bsim4/b4getic.c b/src/spicelib/devices/bsim4/b4getic.c
index 2f9e9688c..590c4df73 100644
--- a/src/spicelib/devices/bsim4/b4getic.c
+++ b/src/spicelib/devices/bsim4/b4getic.c
@@ -1,10 +1,12 @@
-/**** BSIM4.0.0, Released by Weidong Liu 3/24/2000 ****/
+/**** BSIM4.1.0, Released by Weidong Liu 10/11/2000 ****/
 
 /**********
  * Copyright 2000 Regents of the University of California. All rights reserved.
- * File: b4getic.c of BSIM4.0.0.
+ * File: b4getic.c of BSIM4.1.0.
  * Authors: Weidong Liu, Kanyu M. Cao, Xiaodong Jin, Chenming Hu.
  * Project Director: Prof. Chenming Hu.
+ *
+ * Modified by Weidong Liu, 10/11/2000.
  **********/
 
 #include "ngspice.h"
diff --git a/src/spicelib/devices/bsim4/b4ld.c b/src/spicelib/devices/bsim4/b4ld.c
index 70c5a7546..91827135b 100644
--- a/src/spicelib/devices/bsim4/b4ld.c
+++ b/src/spicelib/devices/bsim4/b4ld.c
@@ -1,10 +1,12 @@
-/**** BSIM4.0.0, Released by Weidong Liu 3/24/2000 ****/
+/**** BSIM4.1.0, Released by Weidong Liu 10/11/2000 ****/
 
 /**********
  * Copyright 2000 Regents of the University of California. All rights reserved.
- * File: b4ld.c of BSIM4.0.0.
+ * File: b4ld.c of BSIM4.1.0.
  * Author: Weidong Liu, Kanyu M. Cao, Xiaodong Jin, Chenming Hu.
  * Project Director: Prof. Chenming Hu.
+ *
+ * Modified by Weidong Liu, 10/11/2000.
  ******/
 
 #include "ngspice.h"
@@ -46,6 +48,7 @@ double dRs_dvg, dRd_dvg, dRs_dvb, dRd_dvb;
 double dT0_dvg, dT1_dvb, dT3_dvg, dT3_dvb;
 double vses, vdes, vdedo, delvses, delvded, delvdes;
 double Isestot, cseshat, Idedtot, cdedhat;
+double tol0, tol1, tol2, tol3, tol4, tol5, tol6;
 
 double geltd, gcrg, gcrgg, gcrgd, gcrgs, gcrgb, ceqgcrg;
 double vges, vgms, vgedo, vgmdo, vged, vgmd, delvged, delvgmd;
@@ -59,7 +62,7 @@ double delvdbs, delvdbd, delvsbs;
 double delvbd_jct, delvbs_jct, vbs_jct, vbd_jct;
 
 double SourceSatCurrent, DrainSatCurrent;
-double ag0, qgb, von, cbhat, VgstNVt, ExpVgst;
+double ag0, qgd, qgs, qgb, von, cbhat, VgstNVt, ExpVgst;
 double ceqqb, ceqqd, ceqqg, ceqqjd, ceqqjs, ceq, geq;
 double cdrain, cdhat, ceqdrn, ceqbd, ceqbs, ceqjd, ceqjs, gjbd, gjbs;
 double czbd, czbdsw, czbdswg, czbs, czbssw, czbsswg, evbd, evbs, arg, sarg;
@@ -79,59 +82,62 @@ double Igc, dIgc_dVg, dIgc_dVd, dIgc_dVb;
 double Igcs, dIgcs_dVg, dIgcs_dVd, dIgcs_dVb;
 double Igcd, dIgcd_dVg, dIgcd_dVd, dIgcd_dVb;
 double Igs, dIgs_dVg, dIgs_dVs, Igd, dIgd_dVg, dIgd_dVd;
-double Igbacc, dIgbacc_dVg, dIgbacc_dVb;
+double Igbacc, dIgbacc_dVg, dIgbacc_dVd, dIgbacc_dVb;
 double Igbinv, dIgbinv_dVg, dIgbinv_dVd, dIgbinv_dVb;
+double Igb, dIgb_dVg, dIgb_dVd, dIgb_dVb;
+double Pigcd, dPigcd_dVg, dPigcd_dVd, dPigcd_dVb;
 double Istoteq, gIstotg, gIstotd, gIstots, gIstotb;
 double Idtoteq, gIdtotg, gIdtotd, gIdtots, gIdtotb;
 double Ibtoteq, gIbtotg, gIbtotd, gIbtots, gIbtotb;
 double Igtoteq, gIgtotg, gIgtotd, gIgtots, gIgtotb;
 double Igstot, cgshat, Igdtot, cgdhat, Igbtot, cgbhat;
-double Vgs_eff, Vfb, Vth_NarrowW;
+double Vgs_eff, Vfb, dVbs_dVb, Vth_NarrowW;
 double Phis, dPhis_dVb, sqrtPhis, dsqrtPhis_dVb, Vth, dVth_dVb, dVth_dVd;
 double Vgst, dVgst_dVg, dVgst_dVb, dVgs_eff_dVg, Nvtms, Nvtmd;
-double Vtm;
+double Vgdt, Vgsaddvth, Vgsaddvth2, Vgsaddvth1o3,Vtm;
 double n, dn_dVb, dn_dVd, voffcv, noff, dnoff_dVd, dnoff_dVb;
-double V0, CoxWLcen, QovCox, LINK;
+double ExpArg, ExpArg1, V0, CoxWLcen, QovCox, LINK;
 double DeltaPhi, dDeltaPhi_dVg;
 double Cox, Tox, Tcen, dTcen_dVg, dTcen_dVd, dTcen_dVb;
 double Ccen, Coxeff, dCoxeff_dVd, dCoxeff_dVg, dCoxeff_dVb;
 double Denomi, dDenomi_dVg, dDenomi_dVd, dDenomi_dVb;
 double ueff, dueff_dVg, dueff_dVd, dueff_dVb; 
-double Esat, Vdsat;
+double Esat, dEsat_dVg, dEsat_dVd, dEsat_dVb, Vdsat, Vdsat0;
 double EsatL, dEsatL_dVg, dEsatL_dVd, dEsatL_dVb;
+double Ilimit, Iexp, dIexp_dVg, dIexp_dVd, dIexp_dVb;
 double dVdsat_dVg, dVdsat_dVb, dVdsat_dVd, Vasat, dAlphaz_dVg, dAlphaz_dVb; 
-double dVasat_dVg, dVasat_dVb, dVasat_dVd, Va, dVa_dVd, dVa_dVg, dVa_dVb; 
+double dVasat_dVg, dVasat_dVb, dVasat_dVd, Va, Va2, dVa_dVd, dVa_dVg, dVa_dVb; 
 double Vbseff, dVbseff_dVb, VbseffCV, dVbseffCV_dVb; 
-double Arg1, One_Third_CoxWL, Two_Third_CoxWL, Alphaz, CoxWL; 
+double Arg1, Arg2, One_Third_CoxWL, Two_Third_CoxWL, Alphaz, CoxWL; 
 double T0, dT0_dVg, dT0_dVd, dT0_dVb;
 double T1, dT1_dVg, dT1_dVd, dT1_dVb;
 double T2, dT2_dVg, dT2_dVd, dT2_dVb;
 double T3, dT3_dVg, dT3_dVd, dT3_dVb;
-double T4, dT4_dVd;
-double T5, dT5_dVb;
+double T4, dT4_dVd, dT4_dVg, dT4_dVd, dT4_dVb;
+double T5, dT5_dVb, dT5_dVg, dT5_dVd, dT5_dVb;
 double T6, dT6_dVg, dT6_dVd, dT6_dVb;
-double T7, dT7_dVg;
-double T8, dT8_dVd;
+double T7, dT7_dVg, dT7_dVg, dT7_dVd, dT7_dVb;
+double T8, dT8_dVd, dT8_dVg, dT8_dVd, dT8_dVb;
 double T9, dT9_dVg, dT9_dVd, dT9_dVb;
 double T10, dT10_dVg, dT10_dVb, dT10_dVd; 
-double T11, T12;
+double T11, T12, T13, T14;
 double tmp, Abulk, dAbulk_dVb, Abulk0, dAbulk0_dVb;
 double Cclm, dCclm_dVg, dCclm_dVd, dCclm_dVb;
 double FP, dFP_dVg, PvagTerm, dPvagTerm_dVg, dPvagTerm_dVd, dPvagTerm_dVb;
 double VADITS, dVADITS_dVg, dVADITS_dVd;
-double Lpe_Vb, dDITS_Sft_dVb, dDITS_Sft_dVd;
+double Lpe_Vb, DITS_Sft, dDITS_Sft_dVb, dDITS_Sft_dVd;
 double VACLM, dVACLM_dVg, dVACLM_dVd, dVACLM_dVb;
 double VADIBL, dVADIBL_dVg, dVADIBL_dVd, dVADIBL_dVb;
 double Xdep, dXdep_dVb, lt1, dlt1_dVb, ltw, dltw_dVb, Delt_vth, dDelt_vth_dVb;
-double Theta0, dTheta0_dVb;
-double TempRatio, tmp1, tmp2, tmp3, tmp4;
-double DIBL_Sft, dDIBL_Sft_dVd, Lambda, dLambda_dVg;
+double Theta0, dTheta0_dVb, Theta1, dTheta1_dVb;
+double Thetarout, dThetarout_dVb, TempRatio, tmp1, tmp2, tmp3, tmp4;
+double DIBL_Sft, dDIBL_Sft_dVd, DIBL_fact, Lambda, dLambda_dVg;
 double Idtot, Ibtot, a1, ScalingFactor;
 
 double Vgsteff, dVgsteff_dVg, dVgsteff_dVd, dVgsteff_dVb; 
 double Vdseff, dVdseff_dVg, dVdseff_dVd, dVdseff_dVb; 
 double VdseffCV, dVdseffCV_dVg, dVdseffCV_dVd, dVdseffCV_dVb; 
-double diffVds, dAbulk_dVg;
+double diffVds, diffVdsCV, dAbulk_dVg;
 double beta, dbeta_dVg, dbeta_dVd, dbeta_dVb;
 double gche, dgche_dVg, dgche_dVd, dgche_dVb;
 double fgche1, dfgche1_dVg, dfgche1_dVd, dfgche1_dVb;
@@ -143,7 +149,7 @@ double Isub, Gbd, Gbg, Gbb;
 double VASCBE, dVASCBE_dVg, dVASCBE_dVd, dVASCBE_dVb;
 double CoxeffWovL;
 double Rds, dRds_dVg, dRds_dVb, WVCox, WVCoxRds;
-double Vgst2Vtm, VdsatCV;
+double Vgst2Vtm, VdsatCV, dVdsatCV_dVd, dVdsatCV_dVg, dVdsatCV_dVb;
 double Leff, Weff, dWeff_dVg, dWeff_dVb;
 double AbulkCV, dAbulkCV_dVb;
 double qcheq, qdef, gqdef, cqdef, cqcheq;
@@ -153,10 +159,10 @@ double ddxpart_dVd, ddxpart_dVg, ddxpart_dVb, ddxpart_dVs;
 double dsxpart_dVd, dsxpart_dVg, dsxpart_dVb, dsxpart_dVs;
 double gbspsp, gbbdp, gbbsp, gbspg, gbspb, gbspdp; 
 double gbdpdp, gbdpg, gbdpb, gbdpsp; 
-double qgdo, qgso, cgdo, cgso;
-double Cgg, Cgd, Cgb, Cdg, Cdd, Cds;
-double Csg, Csd, Css, Csb, Cbg, Cbd, Cbb;
-double Cgg1, Cgb1, Cgd1, Cbg1, Cbb1, Cbd1, Qac0, Qsub0;
+double qgdo, qgso, cgdo, cgso, cqbs, cqbd;
+double Cgg, Cgd, Cgs, Cgb, Cdg, Cdd, Cds, Cdb, Qg, Qd;
+double Csg, Csd, Css, Csb, Cbg, Cbd, Cbs, Cbb, Qs, Qb;
+double Cgg1, Cgb1, Cgd1, Cbg1, Cbb1, Cbd1, Csg1, Csd1, Csb1, Qac0, Qsub0;
 double dQac0_dVg, dQac0_dVb, dQsub0_dVg, dQsub0_dVd, dQsub0_dVb;
    
 struct bsim4SizeDependParam *pParam;
@@ -422,7 +428,7 @@ for (; model != NULL; model = model->BSIM4nextModel)
                        + here->BSIM4gdtotd * delvds + here->BSIM4gdtotg * delvgs
                        + here->BSIM4gdtotb * delvbs;
 
-
+#ifndef NOBYPASS
                /* Following should be one IF statement, but some C compilers 
                 * can't handle that all at once, so we split it into several
                 * successive IF's */
@@ -514,7 +520,7 @@ for (; model != NULL; model = model->BSIM4nextModel)
 		    else
 		       goto line850;
                }
-
+#endif /*NOBYPASS*/
                von = here->BSIM4von;
                if (*(ckt->CKTstate0 + here->BSIM4vds) >= 0.0)
 	       {   vgs = DEVfetlim(vgs, *(ckt->CKTstate0 + here->BSIM4vgs), von);
@@ -1933,7 +1939,7 @@ for (; model != NULL; model = model->BSIM4nextModel)
 
           if (model->BSIM4igcMod)
           {   T0 = Vtm * pParam->BSIM4nigc;
-              VxNVt = (Vgs_eff - model->BSIM4type * pParam->BSIM4vth0) / T0; /* Vth instead of Vth0 may be used */
+              VxNVt = (Vgs_eff - model->BSIM4type * pParam->BSIM4vth0) / T0;
               if (VxNVt > EXP_THRESHOLD)
               {   Vaux = Vgs_eff - model->BSIM4type * pParam->BSIM4vth0;
                   dVaux_dVg = dVgs_eff_dVg;
@@ -1948,8 +1954,8 @@ for (; model != NULL; model = model->BSIM4nextModel)
               {   ExpVxNVt = exp(VxNVt);
                   Vaux = T0 * log(1.0 + ExpVxNVt);
                   dVaux_dVg = ExpVxNVt / (1.0 + ExpVxNVt);
-		  dVaux_dVd = -dVaux_dVg * 0.0;
-                  dVaux_dVb = -dVaux_dVg * 0.0;
+		  dVaux_dVd = 0.0;
+                  dVaux_dVb = 0.0;
                   dVaux_dVg *= dVgs_eff_dVg;
               }
 
@@ -1987,40 +1993,75 @@ for (; model != NULL; model = model->BSIM4nextModel)
               dIgc_dVd = T11 * (T2 * dT6_dVd + T6 * dT2_dVd);
               dIgc_dVb = T11 * (T2 * dT6_dVb + T6 * dT2_dVb);
 
-	      T7 = -pParam->BSIM4pigcd * Vds;
-	      T8 = T7 * T7 + 2.0e-4;
-	      dT8_dVd = -2.0 * pParam->BSIM4pigcd * T7;
-	      if (T7 > EXP_THRESHOLD)
-	      {   T9 = MAX_EXP;
-                  dT9_dVd = 0.0;
-	      }
-	      else if (T7 < -EXP_THRESHOLD)
-              {   T9 = MIN_EXP;
-                  dT9_dVd = 0.0;
-              }
-              else
-              {   T9 = exp(T7);
-                  dT9_dVd = -T9 * pParam->BSIM4pigcd;
-              }
-
-	      T0 = T8 * T8;
-	      T1 = T9 - 1.0 + 1.0e-4;
-	      T10 = (T1 - T7) / T8;
-	      dT10_dVd = ((pParam->BSIM4pigcd + dT9_dVd) * T8
-		       - (T1 - T7) * dT8_dVd) / T0;
-	      Igcs = Igc * T10;
-	      dIgcs_dVg = dIgc_dVg * T10;
-              dIgcs_dVd = dIgc_dVd * T10 + Igc * dT10_dVd;
-              dIgcs_dVb = dIgc_dVb * T10;
-
-              T1 = T9 - 1.0 - 1.0e-4;
-              T10 = (T7 * T9 - T1) / T8;
-              dT10_dVd = (-pParam->BSIM4pigcd * T9 + (T7 - 1.0)
-		       * dT9_dVd - T10 * dT8_dVd) / T8;
-              Igcd = Igc * T10;
-              dIgcd_dVg = dIgc_dVg * T10;
-              dIgcd_dVd = dIgc_dVd * T10 + Igc * dT10_dVd;
-              dIgcd_dVb = dIgc_dVb * T10;
+               if (model->BSIM4pigcdGiven)
+               {   Pigcd = pParam->BSIM4pigcd;
+                   dPigcd_dVg = dPigcd_dVd = dPigcd_dVb = 0.0;
+               }
+               else
+               {   T11 = pParam->BSIM4Bechvb * model->BSIM4toxe;
+                   T12 = Vgsteff + 1.0e-20;
+                   T13 = T11 / T12 / T12;
+                   T14 = -T13 / T12;
+                   Pigcd = T13 * (1.0 - 0.5 * Vdseff / T12);
+                   dPigcd_dVg = T14 * (2.0 + 0.5 * (dVdseff_dVg
+                              * Vgsteff - 3.0 * Vdseff) / T12);
+                   dPigcd_dVd = 0.5 * T14 * dVdseff_dVd
+                              + dPigcd_dVg * dVgsteff_dVd;
+                   dPigcd_dVb = 0.5 * T14 * dVdseff_dVb
+                              + dPigcd_dVg * dVgsteff_dVb;
+                   dPigcd_dVg *= dVgsteff_dVg;
+               }
+ 
+               T7 = -Pigcd * Vds;
+               dT7_dVg = -Vds * dPigcd_dVg;
+               dT7_dVd = -Pigcd - Vds * dPigcd_dVd;
+               dT7_dVb = -Vds * dPigcd_dVb;
+               T8 = T7 * T7 + 2.0e-4;
+               dT8_dVg = 2.0 * T7;
+               dT8_dVd = dT8_dVg * dT7_dVd;
+               dT8_dVb = dT8_dVg * dT7_dVb;
+               dT8_dVg *= dT7_dVg;
+ 
+               if (T7 > EXP_THRESHOLD)
+               {   T9 = MAX_EXP;
+                   dT9_dVg = dT9_dVd = dT9_dVb = 0.0;
+               }
+               else if (T7 < -EXP_THRESHOLD)
+                {   T9 = MIN_EXP;
+                   dT9_dVg = dT9_dVd = dT9_dVb = 0.0;
+                }
+                else
+                {   T9 = exp(T7);
+                   dT9_dVg = T9 * dT7_dVg;
+                   dT9_dVd = T9 * dT7_dVd;
+                   dT9_dVb = T9 * dT7_dVb;
+                }
+  
+               T0 = T8 * T8;
+               T1 = T9 - 1.0 + 1.0e-4;
+               T10 = (T1 - T7) / T8;
+               dT10_dVg = (dT9_dVg - dT7_dVg - T10 * dT8_dVg) / T8;
+               dT10_dVd = (dT9_dVd - dT7_dVd - T10 * dT8_dVd) / T8;
+               dT10_dVb = (dT9_dVb - dT7_dVb - T10 * dT8_dVb) / T8;
+ 
+               Igcs = Igc * T10;
+               dIgcs_dVg = dIgc_dVg * T10 + Igc * dT10_dVg;
+               dIgcs_dVd = dIgc_dVd * T10 + Igc * dT10_dVd;
+               dIgcs_dVb = dIgc_dVb * T10 + Igc * dT10_dVb;
+  
+               T1 = T9 - 1.0 - 1.0e-4;
+               T10 = (T7 * T9 - T1) / T8;
+               dT10_dVg = (dT7_dVg * T9 + (T7 - 1.0) * dT9_dVg
+                        - T10 * dT8_dVg) / T8;
+               dT10_dVd = (dT7_dVd * T9 + (T7 - 1.0) * dT9_dVd
+                        - T10 * dT8_dVd) / T8;
+               dT10_dVb = (dT7_dVb * T9 + (T7 - 1.0) * dT9_dVb
+                        - T10 * dT8_dVb) / T8;
+               Igcd = Igc * T10;
+               dIgcd_dVg = dIgc_dVg * T10 + Igc * dT10_dVg;
+               dIgcd_dVd = dIgc_dVd * T10 + Igc * dT10_dVd;
+               dIgcd_dVb = dIgc_dVb * T10 + Igc * dT10_dVb;
+  
 
               here->BSIM4Igcs = Igcs;
               here->BSIM4gIgcsg = dIgcs_dVg;
@@ -2273,15 +2314,30 @@ for (; model != NULL; model = model->BSIM4nextModel)
 	  here->BSIM4cd = cdrain;
 
 
-          if (model->BSIM4tnoiMod == 0)
-          {   T0 = Abulk * Vdseff;
-              T1 = 12.0 * (Vgsteff - 0.5 * T0 + 1.0e-20);
-              T2 = Vdseff / T1;
-              T3 = T0 * T2;
-              here->BSIM4qinv = Coxeff * pParam->BSIM4weffCV * here->BSIM4nf
-                              * pParam->BSIM4leffCV
-			      * (Vgsteff - 0.5 * T0 + Abulk * T3); 
-	  }
+            if (model->BSIM4tnoiMod == 0)
+           {   Abulk = Abulk0 * pParam->BSIM4abulkCVfactor;
+               Vdsat = Vgsteff / Abulk;
+               T0 = Vdsat - Vds - DELTA_4;
+               T1 = sqrt(T0 * T0 + 4.0 * DELTA_4 * Vdsat);
+               if (T0 >= 0.0)
+                   Vdseff = Vdsat - 0.5 * (T0 + T1);
+               else
+               {   T3 = (DELTA_4 + DELTA_4) / (T1 - T0);
+                   T4 = 1.0 - T3;
+                   T5 = Vdsat * T3 / (T1 - T0);
+                   Vdseff = Vdsat * T4;
+               }
+               if (Vds == 0.0)
+                   Vdseff = 0.0;
+ 
+               T0 = Abulk * Vdseff;
+                T1 = 12.0 * (Vgsteff - 0.5 * T0 + 1.0e-20);
+                T2 = Vdseff / T1;
+                T3 = T0 * T2;
+                here->BSIM4qinv = Coxeff * pParam->BSIM4weffCV * here->BSIM4nf
+                                * pParam->BSIM4leffCV
+                               * (Vgsteff - 0.5 * T0 + Abulk * T3);
+           }
 
 	  /*
            *  BSIM4 C-V begins
@@ -2825,7 +2881,7 @@ for (; model != NULL; model = model->BSIM4nextModel)
 	          here->BSIM4cbdb = Cbd;
 	      } 
 
-              /* New Charge-Thickness capMod (CTM) begins */
+              /* Charge-Thickness capMod (CTM) begins */
 	      else if (model->BSIM4capMod == 2)
 	      {   V3 = pParam->BSIM4vfbzb - Vgs_eff + VbseffCV - DELTA_3;
 		  if (pParam->BSIM4vfbzb <= 0.0)
@@ -4257,7 +4313,7 @@ line900:
                                    - gstots + FwdSum + gcssb + gbspsp + sxpart * ggts - gIstots);
            (*(here->BSIM4SPsPtr) -= gspr + gstot);
            (*(here->BSIM4SPbpPtr) -= gjbs + gstotb + Gmbs - gcsbb - gbspb - sxpart * ggtb
-				   - T1 * dsxpart_dVb) + gIstotb;
+				   - T1 * dsxpart_dVb + gIstotb);
 
            (*(here->BSIM4SspPtr) -= gspr - gstots);
            (*(here->BSIM4SsPtr) += gspr + gstot);
diff --git a/src/spicelib/devices/bsim4/b4mask.c b/src/spicelib/devices/bsim4/b4mask.c
index 909e5b2e8..f681a2f1b 100644
--- a/src/spicelib/devices/bsim4/b4mask.c
+++ b/src/spicelib/devices/bsim4/b4mask.c
@@ -1,10 +1,12 @@
-/**** BSIM4.0.0, Released by Weidong Liu 3/24/2000 ****/
+/**** BSIM4.1.0, Released by Weidong Liu 10/11/2000 ****/
 
 /**********
  * Copyright 2000 Regents of the University of California. All rights reserved.
- * File: b4mask.c of BSIM4.0.0.
+ * File: b4mask.c of BSIM4.1.0.
  * Authors: Weidong Liu, Xiaodong Jin, Kanyu M. Cao, Chenming Hu.
  * Project Director: Prof. Chenming Hu.
+ *
+ * Modified by Weidong Liu, 10/11/2000.
  **********/
 
 #include "ngspice.h"
diff --git a/src/spicelib/devices/bsim4/b4mdel.c b/src/spicelib/devices/bsim4/b4mdel.c
index cf1b072d9..df5cbee96 100644
--- a/src/spicelib/devices/bsim4/b4mdel.c
+++ b/src/spicelib/devices/bsim4/b4mdel.c
@@ -1,10 +1,12 @@
-/**** BSIM4.0.0, Released by Weidong Liu 3/24/2000 ****/
+/**** BSIM4.1.0, Released by Weidong Liu 10/11/2000 ****/
 
 /**********
  * Copyright 2000 Regents of the University of California. All rights reserved.
- * File: b4mdel.c of BSIM4.0.0.
+ * File: b4mdel.c of BSIM4.1.0.
  * Authors: Weidong Liu, Kanyu M. Cao, Xiaodong Jin, Chenming Hu.
  * Project Director: Prof. Chenming Hu.
+ *
+ * Modified by Weidong Liu, 10/11/2000.
  **********/
 
 #include "ngspice.h"
diff --git a/src/spicelib/devices/bsim4/b4mpar.c b/src/spicelib/devices/bsim4/b4mpar.c
index f75555628..8fe69d3f5 100644
--- a/src/spicelib/devices/bsim4/b4mpar.c
+++ b/src/spicelib/devices/bsim4/b4mpar.c
@@ -1,10 +1,12 @@
-/**** BSIM4.0.0, Released by Weidong Liu 3/24/2000 ****/
+/**** BSIM4.1.0, Released by Weidong Liu 10/11/2000 ****/
 
 /**********
  * Copyright 2000 Regents of the University of California. All rights reserved.
- * File: b4mpar.c of BSIM4.0.0.
+ * File: b4mpar.c of BSIM4.1.0.
  * Authors: Weidong Liu, Kanyu M. Cao, Xiaodong Jin, Chenming Hu.
  * Project Director: Prof. Chenming Hu.
+ *
+ * Modified by Weidong Liu, 10/11/2000.
  **********/
 
 #include "ngspice.h"
diff --git a/src/spicelib/devices/bsim4/b4noi.c b/src/spicelib/devices/bsim4/b4noi.c
index fc5ebf799..5e1fcfab6 100644
--- a/src/spicelib/devices/bsim4/b4noi.c
+++ b/src/spicelib/devices/bsim4/b4noi.c
@@ -1,10 +1,12 @@
-/**** BSIM4.0.0, Released by Weidong Liu 3/24/2000 ****/
+/**** BSIM4.1.0, Released by Weidong Liu 10/11/2000 ****/
 
 /**********
  * Copyright 2000 Regents of the University of California. All rights reserved.
- * File: b4noi.c of BSIM4.0.0.
+ * File: b4noi.c of BSIM4.1.0.
  * Authors: Weidong Liu, Xiaodong Jin, Kanyu M. Cao, Chenming Hu.
  * Project Director: Prof. Chenming Hu.
+ *
+ * Modified by Weidong Liu, 10/11/2000.
  **********/
 
 #include "ngspice.h"
@@ -34,8 +36,7 @@ BSIM4instance *here;
 {
 struct bsim4SizeDependParam *pParam;
 double cd, esat, DelClm, EffFreq, N0, Nl;
-double T0, T1, T2, T3, T4, T5, T6, T7, T8, T9;
-double Ssi;
+double T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, Ssi;
 
     pParam = here->pParam;
     cd = fabs(here->BSIM4cd);
@@ -84,11 +85,12 @@ double tempInoise;
 double noizDens[BSIM4NSRCS];
 double lnNdens[BSIM4NSRCS];
 
+double N0, Nl;
 double T0, T1, T2, T5, T10, T11;
-double Vds, Ssi, Swi;
+double Vds, n, ExpArg, Ssi, Swi;
 double tmp, gdpr, gspr, npart_theta, npart_beta, igsquare;
 
-int i;
+int error, i;
 
     /* define the names of the noise sources */
     static char *BSIM4nNames[BSIM4NSRCS] =
diff --git a/src/spicelib/devices/bsim4/b4par.c b/src/spicelib/devices/bsim4/b4par.c
index 486a5c2b8..8dd8b03c7 100644
--- a/src/spicelib/devices/bsim4/b4par.c
+++ b/src/spicelib/devices/bsim4/b4par.c
@@ -1,10 +1,12 @@
-/**** BSIM4.0.0, Released by Weidong Liu 3/24/2000 ****/
+/**** BSIM4.1.0, Released by Weidong Liu 10/11/2000 ****/
 
 /**********
  * Copyright 2000 Regents of the University of California. All rights reserved.
- * File: b4par.c of BSIM4.0.0.
+ * File: b4par.c of BSIM4.1.0.
  * Authors: Weidong Liu, Kanyu M. Cao, Xiaodong Jin, Chenming Hu.
  * Project Director: Prof. Chenming Hu.
+ *
+ * Modified by Weidong Liu, 10/11/2000.
  **********/
 
 #include "ngspice.h"
diff --git a/src/spicelib/devices/bsim4/b4pzld.c b/src/spicelib/devices/bsim4/b4pzld.c
index 75f2dab82..6037cf29e 100644
--- a/src/spicelib/devices/bsim4/b4pzld.c
+++ b/src/spicelib/devices/bsim4/b4pzld.c
@@ -1,10 +1,12 @@
-/**** BSIM4.0.0, Released by Weidong Liu 3/24/2000 ****/
+/**** BSIM4.1.0, Released by Weidong Liu 10/11/2000 ****/
 
 /**********
  * Copyright 2000 Regents of the University of California. All rights reserved.
- * File: b4pzld.c of BSIM4.0.0.
+ * File: b4pzld.c of BSIM4.1.0.
  * Authors: Weidong Liu, Kanyu M. Cao, Xiaodong Jin, Chenming Hu.
  * Project Director: Prof. Chenming Hu.
+ *
+ * Modified by Weidong Liu, 10/11/2000.
  **********/
 
 #include "ngspice.h"
@@ -27,7 +29,7 @@ BSIM4instance *here;
 double gjbd, gjbs, geltd, gcrg, gcrgg, gcrgd, gcrgs, gcrgb;
 double xcggb, xcgdb, xcgsb, xcgbb, xcbgb, xcbdb, xcbsb, xcbbb;
 double xcdgb, xcddb, xcdsb, xcdbb, xcsgb, xcsdb, xcssb, xcsbb;
-double gds, capbd, capbs, FwdSum, RevSum, Gm, Gmbs;
+double gds, gbd, gbs, capbd, capbs, FwdSum, RevSum, Gm, Gmbs;
 double gstot, gstotd, gstotg, gstots, gstotb, gspr;
 double gdtot, gdtotd, gdtotg, gdtots, gdtotb, gdpr;
 double gIstotg, gIstotd, gIstots, gIstotb;
@@ -42,7 +44,7 @@ double gbspsp, gbbdp, gbbsp, gbspg, gbspb;
 double gbspdp, gbdpdp, gbdpg, gbdpb, gbdpsp;
 double ddxpart_dVd, ddxpart_dVg, ddxpart_dVb, ddxpart_dVs;
 double dsxpart_dVd, dsxpart_dVg, dsxpart_dVb, dsxpart_dVs;
-double T0, T1, CoxWL, qcheq, Cdg, Cdd, Cds, Csg, Csd, Css;
+double T0, T1, CoxWL, qcheq, Cdg, Cdd, Cds, Cdb, Csg, Csd, Css, Csb;
 double ScalingFactor = 1.0e-9;
 struct bsim4SizeDependParam *pParam;
 
diff --git a/src/spicelib/devices/bsim4/b4set.c b/src/spicelib/devices/bsim4/b4set.c
index a9f6a02de..95b2a3818 100644
--- a/src/spicelib/devices/bsim4/b4set.c
+++ b/src/spicelib/devices/bsim4/b4set.c
@@ -1,10 +1,12 @@
-/**** BSIM4.0.0, Released by Weidong Liu 3/24/2000 ****/
+/**** BSIM4.1.0, Released by Weidong Liu 10/11/2000 ****/
 
 /**********
  * Copyright 2000 Regents of the University of California. All rights reserved.
- * File: b4set.c of BSIM4.0.0.
+ * File: b4set.c of BSIM4.1.0.
  * Authors: Weidong Liu, Xiaodong Jin, Kanyu M. Cao, Chenming Hu.
  * Project Director: Prof. Chenming Hu.
+ *
+ * Modified by Weidong Liu, 10/11/2000.
  **********/
 
 #include "ngspice.h"
@@ -37,6 +39,7 @@ BSIM4instance *here;
 int error;
 CKTnode *tmp;
 
+double tmp1, tmp2;
 
     /*  loop through all the BSIM4 device models */
     for( ; model != NULL; model = model->BSIM4nextModel )
@@ -144,7 +147,7 @@ CKTnode *tmp;
         }
 
         if (!model->BSIM4versionGiven) 
-            model->BSIM4version = "4.0.0";
+            model->BSIM4version = "4.1.0";
         if (!model->BSIM4toxrefGiven)
             model->BSIM4toxref = 30.0e-10;
         if (!model->BSIM4toxeGiven)
diff --git a/src/spicelib/devices/bsim4/b4temp.c b/src/spicelib/devices/bsim4/b4temp.c
index 7ac26b064..b94bf3dfd 100644
--- a/src/spicelib/devices/bsim4/b4temp.c
+++ b/src/spicelib/devices/bsim4/b4temp.c
@@ -1,10 +1,12 @@
-/**** BSIM4.0.0, Released by Weidong Liu 3/24/2000 ****/
+/**** BSIM4.1.0, Released by Weidong Liu 10/11/2000 ****/
 
 /**********
  * Copyright 2000 Regents of the University of California. All rights reserved.
- * File: b4temp.c of BSIM4.0.0.
+ * File: b4temp.c of BSIM4.1.0.
  * Authors: Weidong Liu, Xiaodong Jin, Kanyu M. Cao, Chenming Hu.
  * Project Director: Prof. Chenming Hu.
+ *
+ * Modified by Weidong Liu, 10/11/2000.
  **********/
 
 #include "ngspice.h"
@@ -52,7 +54,7 @@ BSIM4instance *here;
 struct bsim4SizeDependParam *pSizeDependParamKnot, *pLastKnot, *pParam;
 double tmp, tmp1, tmp2, tmp3, Eg, Eg0, ni;
 double T0, T1, T2, T3, T4, T5, T8, T9, Ldrn, Wdrn;
-double delTemp, Temp, TRatio, Inv_L, Inv_W, Inv_LW, Vtm0, Tnom;
+double delTemp, Temp, TRatio, Inv_L, Inv_W, Inv_LW, Dw, Dl, Vtm0, Tnom;
 double dumPs, dumPd, dumAs, dumAd, PowWeffWr;
 double DMCGeff, DMCIeff, DMDGeff;
 double Nvtms, Nvtmd, SourceSatCurrent, DrainSatCurrent;
@@ -1465,7 +1467,7 @@ int Size_Not_Found;
               {   IFuid namarray[2];
                   namarray[0] = model->BSIM4modName;
                   namarray[1] = here->BSIM4name;
-                  (*(SPfrontEnd->IFerror)) (ERR_FATAL, "Fatal error(s) detected during BSIM4.0.0 parameter checking for %s in model %s", namarray);
+                  (*(SPfrontEnd->IFerror)) (ERR_FATAL, "Fatal error(s) detected during BSIM4.1.0 parameter checking for %s in model %s", namarray);
                   return(E_BADPARM);
               }
          } /* End instance */
diff --git a/src/spicelib/devices/bsim4/b4trunc.c b/src/spicelib/devices/bsim4/b4trunc.c
index 609a6e763..c8930cd5c 100644
--- a/src/spicelib/devices/bsim4/b4trunc.c
+++ b/src/spicelib/devices/bsim4/b4trunc.c
@@ -1,10 +1,12 @@
-/**** BSIM4.0.0, Released by Weidong Liu 3/24/2000 ****/
+/**** BSIM4.1.0, Released by Weidong Liu 10/11/2000 ****/
 
 /**********
  * Copyright 2000 Regents of the University of California. All rights reserved.
- * File: b4trunc.c of BSIM4.0.0.
+ * File: b4trunc.c of BSIM4.1.0.
  * Authors: Weidong Liu, Kanyu M. Cao, Xiaodong Jin, Chenming Hu.
  * Project Director: Prof. Chenming Hu.
+ *
+ * Modified by Weidong Liu, 10/11/2000.
  **********/
 
 #include "ngspice.h"