From 7405ff8e9e6d8bbcfe8c653b851f2bd14ea58ab8 Mon Sep 17 00:00:00 2001
From: dwarning <dwarning>
Date: Thu, 21 Mar 2019 11:02:08 +0100
Subject: [PATCH] use a better place for model parameter defaulting

---
 src/spicelib/devices/vbic/vbicsetup.c | 15 +++++++++++++++
 src/spicelib/devices/vbic/vbictemp.c  | 15 ---------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/spicelib/devices/vbic/vbicsetup.c b/src/spicelib/devices/vbic/vbicsetup.c
index ca8674960..1099efa8f 100644
--- a/src/spicelib/devices/vbic/vbicsetup.c
+++ b/src/spicelib/devices/vbic/vbicsetup.c
@@ -369,6 +369,21 @@ VBICsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
             model->VBICrefVersion = 0.0;
         }
 
+        if(!model->VBICtnomGiven) model->VBICtnom = ckt->CKTnomTemp - CONSTCtoK;
+
+        if(model->VBICtempExpRBGiven && !model->VBICtempExpRBIGiven) {
+          model->VBICtempExpRBI = model->VBICtempExpRB;
+        }
+        if(model->VBICtempExpRBGiven && !model->VBICtempExpRBXGiven) {
+          model->VBICtempExpRBX = model->VBICtempExpRB;
+        }
+        if(model->VBICtempExpRCGiven && !model->VBICtempExpRCIGiven) {
+          model->VBICtempExpRCI = model->VBICtempExpRC;
+        }
+        if(model->VBICtempExpRCGiven && !model->VBICtempExpRCXGiven) {
+          model->VBICtempExpRCX = model->VBICtempExpRC;
+        }
+
         if(!model->VBICvbeMaxGiven) {
             model->VBICvbeMax = 1e99;
         }
diff --git a/src/spicelib/devices/vbic/vbictemp.c b/src/spicelib/devices/vbic/vbictemp.c
index ad9cd1bc1..5bc41dcee 100644
--- a/src/spicelib/devices/vbic/vbictemp.c
+++ b/src/spicelib/devices/vbic/vbictemp.c
@@ -32,21 +32,6 @@ VBICtemp(GENmodel *inModel, CKTcircuit *ckt)
     /*  loop through all the bipolar models */
     for( ; model != NULL; model = VBICnextModel(model)) {
 
-        if(!model->VBICtnomGiven) model->VBICtnom = ckt->CKTnomTemp - CONSTCtoK;
-
-        if(model->VBICtempExpRBGiven && !model->VBICtempExpRBIGiven) {
-          model->VBICtempExpRBI = model->VBICtempExpRB;
-        }
-        if(model->VBICtempExpRBGiven && !model->VBICtempExpRBXGiven) {
-          model->VBICtempExpRBX = model->VBICtempExpRB;
-        }
-        if(model->VBICtempExpRCGiven && !model->VBICtempExpRCIGiven) {
-          model->VBICtempExpRCI = model->VBICtempExpRC;
-        }
-        if(model->VBICtempExpRCGiven && !model->VBICtempExpRCXGiven) {
-          model->VBICtempExpRCX = model->VBICtempExpRC;
-        }
-
         /* loop through all the instances of the model */
         for (here = VBICinstances(model); here != NULL ;
                 here=VBICnextInstance(here)) {