Merge branch 'pre-master-45' of ssh://git.code.sf.net/p/ngspice/ngspice into pre-master-45

src/spicelib/devices/bsim4/b4ld.c

@@ -107,6 +107,9 @@ 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;
+#ifndef NEWCONV
+double tol0, tol1, tol2, tol3, tol4, tol5, tol6;
+#endif
 
 double geltd, gcrg, gcrgg, gcrgd, gcrgs, gcrgb, ceqgcrg;
 double vges, vgms, vgedo, vgmdo, vged, vgmd, delvged, delvgmd;
@@ -114,7 +117,10 @@ double delvges, delvgms, vgmb;
 double gcgmgmb=0.0, gcgmdb=0.0, gcgmsb=0.0, gcdgmb, gcsgmb;
 double gcgmbb=0.0, gcbgmb, qgmb, qgmid=0.0, ceqqgmid;
 
-double vbd, vbs, vds, vgb, vgd, vgs, vgdo, xfact;
+double vbd, vbs, vds, vgb, vgd, vgs, vgdo;
+#ifndef PREDICTOR
+double xfact;
+#endif
 double vdbs, vdbd, vsbs, vsbdo, vsbd;
 double delvdbs, delvdbd, delvsbs;
 double delvbd_jct, delvbs_jct, vbs_jct, vbd_jct;
@@ -4076,7 +4082,7 @@ finished:
                   }
                   tol0 = ckt->CKTreltol * MAX(fabs(cdhat), fabs(Idtot))
                        + ckt->CKTabstol;
-          tol1 = ckt->CKTreltol * MAX(fabs(cseshat), fabs(Isestot))
+                  tol1 = ckt->CKTreltol * MAX(fabs(cseshat), fabs(Isestot))
                        + ckt->CKTabstol;
                   tol2 = ckt->CKTreltol * MAX(fabs(cdedhat), fabs(Idedtot))
                        + ckt->CKTabstol;

src/spicelib/devices/hisim2/hsm2ld.c

@@ -260,7 +260,10 @@ int HSM2LoadOMP(HSM2instance *here, CKTcircuit *ckt)
   double delvbd=0.0, delvbs=0.0, delvds=0.0, delvgd=0.0, delvgs=0.0 ;
   double gcbdb=0.0, gcbgb=0.0, gcbsb=0.0, gcddb=0.0, gcdgb=0.0, gcdsb=0.0 ;
   double gcgdb=0.0, gcggb=0.0, gcgsb=0.0, gcgbb=0.0, gcsdb=0.0, gcsgb=0.0, gcssb=0.0 ;
-  double geq=0.0, xfact=0.0 ;
+  double geq=0.0 ;
+#ifndef PREDICTOR
+  double xfact=0.0;
+#endif
   double vbd=0.0, vbs=0.0, vds=0.0, vgb=0.0, vgd=0.0, vgdo=0.0, vgs=0.0, von=0.0 ;
   double gbbdp=0.0, gbbsp=0.0, gbspg=0.0, gbspdp=0.0, gbspb=0.0, gbspsp=0.0 ;
   double qgate=0.0, qbulk=0.0, qdrn=0.0 ;

src/spicelib/devices/hisimhv1/hsmhvld.c

@@ -320,7 +320,10 @@ int HSMHVload(
 #define LIM_TOL2 1.0e0
 
   /* predictor and numerical integration stuff */
-  double ag0=0.0, xfact=0.0 ;
+  double ag0=0.0 ;
+#ifndef PREDICTOR
+  double xfact=0.0;
+#endif
   double ceq=0.0, geq=0.0 ;
   int ChargeComputationNeeded =  
     ((ckt->CKTmode & (MODEAC | MODETRAN | MODEINITSMSIG)) ||

src/spicelib/devices/hisimhv2/hsmhv2ld.c

@@ -367,7 +367,10 @@ int HSMHV2load(
 #define LIM_TOL2 1.0e0
 
   /* predictor and numerical integration stuff */
-  double ag0=0.0, xfact=0.0 ;
+  double ag0=0.0 ;
+#ifndef PREDICTOR
+  double xfact=0.0;
+#endif
   double ceq=0.0, geq=0.0 ;
   int ChargeComputationNeeded =
     ((ckt->CKTmode & (MODEAC | MODETRAN | MODEINITSMSIG)) ||

src/xspice/icm/tlines/.gitignore

@@ -0,0 +1,14 @@
+/tlines.cm
+
+/cmextrn.h
+/cminfo.h
+/cminfo2.h
+/dlmain.c
+/objects.inc
+/udnextrn.h
+/udninfo.h
+/udninfo2.h
+
+/*/*.c
+
+!/*/udnfunc.c