From 33d06d9732b8fb05ebc48fad4d02f19b9e94c9fd Mon Sep 17 00:00:00 2001
From: dwarning <dwarning>
Date: Tue, 4 Aug 2020 09:12:37 +0200
Subject: [PATCH] reintroduce iavl and correct ibici shot noise

---
 src/spicelib/devices/hicum2/hicum2noise.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/spicelib/devices/hicum2/hicum2noise.c b/src/spicelib/devices/hicum2/hicum2noise.c
index 47544c124..d51fc4233 100644
--- a/src/spicelib/devices/hicum2/hicum2noise.c
+++ b/src/spicelib/devices/hicum2/hicum2noise.c
@@ -146,14 +146,15 @@ HICUMnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata
                                  ckt,THERMNOISE,inst->HICUMsubsSINode,inst->HICUMsubsNode,
                                  Isis_Vsis);
 
-//todo: ibici contains iavl, has to be separated for non-correlated noise
-//                    NevalSrc(&noizDens[HICUMIAVLNOIZ],&lnNdens[HICUMIAVLNOIZ],
-//                                 ckt,SHOTNOISE,inst->HICUMcollCINode,inst->HICUMbaseBINode,
-//                                 inst->HICUMiavl);
 
+                    NevalSrc(&noizDens[HICUMIAVLNOIZ],&lnNdens[HICUMIAVLNOIZ],
+                                 ckt,SHOTNOISE,inst->HICUMcollCINode,inst->HICUMbaseBINode,
+                                 inst->HICUMiavl);
+
+//todo: ibici contains iavl, has to be separated for non-correlated noise
                     NevalSrc(&noizDens[HICUMIBCINOIZ],&lnNdens[HICUMIBCINOIZ],
                                  ckt,SHOTNOISE,inst->HICUMbaseBINode,inst->HICUMcollCINode,
-                                 *(ckt->CKTstate0 + inst->HICUMibici));
+                                 *(ckt->CKTstate0 + inst->HICUMibici)+inst->HICUMiavl);
 
                     NevalSrc(&noizDens[HICUMIBEPNOIZ],&lnNdens[HICUMIBEPNOIZ],
                                  ckt,SHOTNOISE,inst->HICUMbaseBPNode,inst->HICUMemitEINode,