[Pkg-electronics-commits] [gnucap] 08/17: precalc_last-2 ---- spice_wrapper

[felix salfelder]

This is an automated email from the git hooks/post-receive script.

felix-guest pushed a commit to branch master
in repository gnucap.

commit d54a479cb641e935e0f3cf507e440db1f9436650
Author: al davis <ad211 at freeelectron.net>
Date:   Wed Mar 30 03:45:57 2016 -0400

    precalc_last-2  ----  spice_wrapper
---
 include/l_dispatcher.h   |  4 ++--
 include/patchlev.h       |  2 +-
 include/spice-wrapper.cc | 23 +++++++++--------------
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/include/l_dispatcher.h b/include/l_dispatcher.h
index 5a1a4f7..c99a825 100644
--- a/include/l_dispatcher.h
+++ b/include/l_dispatcher.h
@@ -1,4 +1,4 @@
-/*$Id: l_dispatcher.h 2015/01/21 03:47:06 al Exp $ -*- C++ -*-
+/*$Id: l_dispatcher.h 2016/03/29 al -*- C++ -*-
  * Copyright (C) 2006 Albert Davis
  * Author: Albert Davis <aldavis at gnu.org>
  *
@@ -95,7 +95,7 @@ public:
       trace2(name.c_str(), bss, ess);
       if (name == "") {untested();
 	// quietly ignore empty string
-      }else if ((*_map)[name]) {untested();
+      }else if ((*_map)[name]) {
 	// duplicate .. stash the old one so we can get it back
 	error(bWARNING, name + ": already installed, replacing\n");
 	std::string save_name = name + ":0";
diff --git a/include/patchlev.h b/include/patchlev.h
index c59c915..970bbad 100644
--- a/include/patchlev.h
+++ b/include/patchlev.h
@@ -1 +1 @@
-#define PATCHLEVEL "precalc_last-2 2016-03-28"
+#define PATCHLEVEL "precalc_last-2 2016-03-29"
diff --git a/include/spice-wrapper.cc b/include/spice-wrapper.cc
index 3ab4eee..1123844 100644
--- a/include/spice-wrapper.cc
+++ b/include/spice-wrapper.cc
@@ -1,4 +1,4 @@
-/* $Id: spice-wrapper.cc 2014/11/23$ -*- C++ -*-
+/* $Id: spice-wrapper.cc 2016/03/29 al $ -*- C++ -*-
  * Copyright (C) 2007 Albert Davis
  * Author: Albert Davis <aldavis at gnu.org>
  *
@@ -217,7 +217,7 @@ protected: // override virtual
   int	  net_nodes()const	{return _net_nodes;}
   int	  int_nodes()const	{return INTERNAL_NODES;}
   CARD*	  clone()const		{return new DEV_SPICE(*this);}
-  void	  precalc_first();
+  //void  precalc_first();	//ELEMENT
   void	  expand();
   void	  precalc_last();
   //void  map_nodes();		//ELEMENT
@@ -1003,9 +1003,14 @@ void DEV_SPICE::expand()
   assert_instance();
 }
 /*--------------------------------------------------------------------------*/
-void DEV_SPICE::precalc_first()
+void DEV_SPICE::precalc_last()
 {
-  STORAGE::precalc_first();
+  assert(_model);
+  assert_instance();
+  assert(info.DEVsetup);
+
+  STORAGE::precalc_last();
+  init_ckt();
 
   // push down parameters into spice data
   COMMON_SUBCKT* c = dynamic_cast<COMMON_SUBCKT*>(mutable_common());
@@ -1020,16 +1025,6 @@ void DEV_SPICE::precalc_first()
     }else{
     }
   }
-}
-/*--------------------------------------------------------------------------*/
-void DEV_SPICE::precalc_last()
-{
-  assert(_model);
-  assert_instance();
-  assert(info.DEVsetup);
-
-  STORAGE::precalc_last();
-  init_ckt();
 
   int* node = spice_nodes(); // treat as array	//
   int  node_stash[MATRIX_NODES];			//

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-electronics/gnucap.git