From 57d805cbf67cddee6369aa090d3ae5ddce7e5997 Mon Sep 17 00:00:00 2001
From: pnenzi <pnenzi>
Date: Wed, 24 Jan 2001 11:16:32 +0000
Subject: [PATCH] Modified noisean.c with the one found into the bsim4 (version
 4.1.0) model, hope thet this version does not break anything. Changelog
 updated.

---
 src/spicelib/analysis/ChangeLog |  6 ++++++
 src/spicelib/analysis/noisean.c | 14 +++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/spicelib/analysis/ChangeLog b/src/spicelib/analysis/ChangeLog
index 7b887a1dd..9f9f7f543 100644
--- a/src/spicelib/analysis/ChangeLog
+++ b/src/spicelib/analysis/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-23 Paolo Nenzi <p.nenzi@ieee.org>
+
+	* noisean.c: patched the code with the new one
+	in the bsim4.1.0 distribution. The new noisean.c
+	put some code between #ifdef INT_NOISE. 
+
 2000-01-21 Paolo Nenzi <p.nenzi@ieee.org>
 
 	* cktsgen.c: corrected a bug that caused segfault on sensitivity
diff --git a/src/spicelib/analysis/noisean.c b/src/spicelib/analysis/noisean.c
index 3dbbebbb5..dae2d89f3 100644
--- a/src/spicelib/analysis/noisean.c
+++ b/src/spicelib/analysis/noisean.c
@@ -1,5 +1,7 @@
 /* Patch to noisean.c by Richard D. McRoberts.
- * Patched with modifications from Weidong Lu (2000)
+ * Patched with modifications from Weidong Liu (2000)
+ * Patched with modifications ftom Weidong Liu 
+ * in bsim4.1.0 code
  */
 /**********
 Copyright 1990 Regents of the University of California.  All rights reserved.
@@ -96,12 +98,8 @@ NOISEan (CKTcircuit *ckt, int restart)
 	error = CKTop(ckt, (ckt->CKTmode & MODEUIC) | MODEDCOP | MODEINITJCT,
 		(ckt->CKTmode & MODEUIC) | MODEDCOP | MODEINITFLOAT,
 		ckt->CKTdcMaxIter);
+
 	if (error) return(error);
-	
-        ckt->CKTmode = (ckt->CKTmode & MODEUIC) | MODEDCOP | MODEINITSMSIG;
-        error = CKTload(ckt);
-	if (error) return(error);
-	
         data = (Ndata*)MALLOC(sizeof(Ndata));
 	step = 0;
 	data->freq = job->NstartFreq;
@@ -253,7 +251,8 @@ NOISEan (CKTcircuit *ckt, int restart)
 
     error = CKTnoise(ckt,N_DENS,N_CLOSE,data);
     if (error) return(error);
-
+    
+#ifdef INT_NOISE
     data->numPlots = 0;
     data->outNumber = 0;
 
@@ -273,6 +272,7 @@ NOISEan (CKTcircuit *ckt, int restart)
 	error = CKTnoise(ckt,INT_NOIZ,N_CLOSE,data);
 	if (error) return(error);
     }
+#endif
 
     FREE(data);
     return(OK);