[Pkg-electronics-commits] [gnucap] 34/49: fix stale traces
felix salfelder
felix-guest at moszumanska.debian.org
Tue Feb 2 21:39:59 UTC 2016
This is an automated email from the git hooks/post-receive script.
felix-guest pushed a commit to branch wip
in repository gnucap.
commit 547837622b5c29228fdf53022f181beb58cca76d
Author: Felix Salfelder <felix at salfelder.org>
Date: Mon Aug 31 20:47:42 2015 +0200
fix stale traces
now compiles with -DDO_TRACE again
---
apps/d_bjt.model | 2 +-
apps/d_mos2.model | 2 +-
apps/d_mos3.model | 2 +-
apps/d_mos4.model | 2 +-
apps/d_mos5.model | 2 +-
apps/d_mos6.model | 2 +-
apps/d_mos7.model | 5 ++---
apps/d_mos8.model | 3 +--
apps/d_switch.cc | 2 +-
apps/s_tr_swp.cc | 2 +-
lib/e_node.cc | 2 +-
11 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/apps/d_bjt.model b/apps/d_bjt.model
index 944fd31..ce8b89a 100644
--- a/apps/d_bjt.model
+++ b/apps/d_bjt.model
@@ -420,7 +420,7 @@ model BUILT_IN_BJT {
tr_eval {
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
trace0("--------------------------");
- trace1(d->long_label().c_str(), d->evaliter());
+ // trace1(d->long_label().c_str(), d->evaliter());
trace4("", d->vbe, d->vbc, d->vbx, d->vcs);
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
double cbe, gbe;
diff --git a/apps/d_mos2.model b/apps/d_mos2.model
index 7495ec4..4852fda 100644
--- a/apps/d_mos2.model
+++ b/apps/d_mos2.model
@@ -156,7 +156,7 @@ model BUILT_IN_MOS2 {
#define short_channel (m->xj != NOT_INPUT && m->xj > 0.)
#define do_subthreshold (m->nfs != 0.)
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
- trace1(d->long_label().c_str(), d->evaliter());
+ // trace1(d->long_label().c_str(), _evaliter);
trace3("", d->vds, d->vgs, d->vbs);
assert(m->tnom_k > 0);
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
diff --git a/apps/d_mos3.model b/apps/d_mos3.model
index ee9d532..73160ad 100644
--- a/apps/d_mos3.model
+++ b/apps/d_mos3.model
@@ -136,7 +136,7 @@ model BUILT_IN_MOS3 {
#define do_subthreshold (m->nfs != 0.)
#define use_vmax (m->vmax != NOT_INPUT)
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
- trace1(d->long_label().c_str(), d->evaliter());
+ trace0(d->long_label().c_str());
trace3("", d->vds, d->vgs, d->vbs);
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
d->reverse_if_needed();
diff --git a/apps/d_mos4.model b/apps/d_mos4.model
index 1dbd7f9..fd4a2f3 100644
--- a/apps/d_mos4.model
+++ b/apps/d_mos4.model
@@ -147,7 +147,7 @@ model BUILT_IN_MOS4 {
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
d->reverse_if_needed();
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
- trace4("", c->lo, m->dl, c->wo, m->dw);
+ trace2("", m->dl, m->dw);
trace3("", s->ugs, s->ugsB, d->vbs);
double Ugs = s->ugs + s->ugsB * d->vbs;
double dUgsdVbs;
diff --git a/apps/d_mos5.model b/apps/d_mos5.model
index 16ec52c..323800b 100644
--- a/apps/d_mos5.model
+++ b/apps/d_mos5.model
@@ -209,7 +209,7 @@ model BUILT_IN_MOS5 {
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
d->reverse_if_needed();
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
- trace4("", c->lo, m->dl, c->wo, m->dw);
+ trace2("", m->dl, m->dw);
double Vbs = std::max(m->vbb2, d->vbs);
double Vgs = std::min(m->vgg2, d->vgs);
diff --git a/apps/d_mos6.model b/apps/d_mos6.model
index e4d1062..79f92ee 100644
--- a/apps/d_mos6.model
+++ b/apps/d_mos6.model
@@ -127,7 +127,7 @@ model BUILT_IN_MOS6 {
/*-----------------------------------------------------------------------*/
tr_eval {
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
- trace1(d->long_label().c_str(), d->evaliter());
+ // trace1(d->long_label().c_str(), d->evaliter());
trace3("", d->vds, d->vgs, d->vbs);
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
d->reverse_if_needed();
diff --git a/apps/d_mos7.model b/apps/d_mos7.model
index c563a3a..19bc42f 100644
--- a/apps/d_mos7.model
+++ b/apps/d_mos7.model
@@ -1452,7 +1452,6 @@ model BUILT_IN_MOS7 {
}
//double d__csub = Isub - (Gbb * Vbseff + Gbd * d->vds + Gbg * d->vgs);
}
- trace4("", d->isub, d->gbbs, d->gbgs, d->gbds);
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
/* Calculate Qinv for Noise analysis */
{
@@ -2190,13 +2189,13 @@ model BUILT_IN_MOS7 {
trace2("", d->ids, d->gds);
trace4("", d->gmf, d->gmr, d->gmbf, d->gmbr);
- trace4("", d->isub, d->gbbs, d->gbgs, d->gbds);
+ //trace4("", d->isub, d->gbbs, d->gbgs, d->gbds);
trace4("", d->qgate, d->cggb, d->cgsb, d->cgdb);
trace4("", d->qdrn, d->cdgb, d->cdsb, d->cddb);
trace4("", d->qbulk, d->cbgb, d->cbsb, d->cbdb);
trace1("", d->gtau);
trace4("", d->cqgb, d->cqsb, d->cqdb, d->cqbb);
- trace1("", d->tconst);
+ //trace1("", d->tconst);
trace2("", d->cgb, d->qgb);
trace2("", d->qgd, d->cgd);
trace2("", d->qgs, d->cgs);
diff --git a/apps/d_mos8.model b/apps/d_mos8.model
index 5b62fe7..f1f4edc 100644
--- a/apps/d_mos8.model
+++ b/apps/d_mos8.model
@@ -1573,7 +1573,6 @@ model BUILT_IN_MOS8 {
}
//double d__csub = Isub - (Gbb * Vbseff + Gbd * d->vds + Gbg * d->vgs);
}
- trace4("", d->isub, d->gbbs, d->gbgs, d->gbds);
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
/* Calculate Qinv for Noise analysis */
{
@@ -2805,7 +2804,7 @@ model BUILT_IN_MOS8 {
trace2("", d->ids, d->gds);
trace4("", d->gmf, d->gmr, d->gmbf, d->gmbr);
- trace4("", d->isub, d->gbbs, d->gbgs, d->gbds);
+ //trace4("", d->isub, d->gbbs, d->gbgs, d->gbds);
trace4("", d->qgate, d->cggb, d->cgsb, d->cgdb);
trace4("", d->qdrn, d->cdgb, d->cdsb, d->cddb);
trace4("", d->qbulk, d->cbgb, d->cbsb, d->cbdb);
diff --git a/apps/d_switch.cc b/apps/d_switch.cc
index 1e1a35d..ad77d01 100644
--- a/apps/d_switch.cc
+++ b/apps/d_switch.cc
@@ -537,7 +537,7 @@ bool SWITCH_BASE::do_tr()
_y[0].f1 = (new_state == _ON) ? m->ron : m->roff; /* unknown is off */
_state[0] = new_state;
_m0.c1 = 1./_y[0].f1;
- trace4("change", new_state, old_state, _y[0].f1, _m0.c1);
+ trace4("change", new_state, _state[1], _y[0].f1, _m0.c1);
q_load();
store_values();
set_not_converged();
diff --git a/apps/s_tr_swp.cc b/apps/s_tr_swp.cc
index 835692e..8e8af0f 100644
--- a/apps/s_tr_swp.cc
+++ b/apps/s_tr_swp.cc
@@ -249,7 +249,7 @@ bool TRANSIENT::next()
trace0("rejected");
}
trace2("", step_cause(), old_dt);
- trace3("", time1, _sim->_time0, reftime);
+ trace3("", _time1, _sim->_time0, reftime);
newtime = _time_by_user_request;
new_dt = newtime - reftime;
diff --git a/lib/e_node.cc b/lib/e_node.cc
index 8fdf65e..417b558 100644
--- a/lib/e_node.cc
+++ b/lib/e_node.cc
@@ -392,7 +392,7 @@ void LOGIC_NODE::to_logic(const MODEL_LOGIC*f)
/* a transition state. */
set_d_iter();
set_last_change_time();
- trace3(_failure_mode, _lastchange, _quality, _lv);
+ trace3(_failure_mode.c_str(), _lastchange, _quality, _lv);
}
}
/*--------------------------------------------------------------------------*/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-electronics/gnucap.git
More information about the Pkg-electronics-commits
mailing list