summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/netlist/analog/nld_fourterm.cpp
diff options
context:
space:
mode:
author couriersud <couriersud@arcor.de>2016-07-21 11:05:55 +0200
committer couriersud <couriersud@arcor.de>2016-07-21 11:05:55 +0200
commit1e40d95e8b47d834d1ede706921dc19850aaaff2 (patch)
treef2e74d4451a527313fdc52f49b10955153f1dbd5 /src/lib/netlist/analog/nld_fourterm.cpp
parent7a69d48edd6e1f59c92271eb7fa217eaf0a714c7 (diff)
Netlist updates:
- Removed trampolines (OUTLOGIC, INPLOGIC and friends). - Started using doxygen comment and documentation style. Added doxygen files to documentation folder. - Refactored code triggered by doxygen output. - Moved internal and support classes into namespace detail. - Use an anordered map in parser. - -Wconversion fixes - All done now. - Fixed -Wold-style-cast warnings in netlist code. - Added iterators to pstring. - Moved two macros, added more RAII and improved exceptions. Fixed some bugs in parser code. - Fixed a number of bugs in parser code and exception handling. [Couriersud]
Diffstat (limited to 'src/lib/netlist/analog/nld_fourterm.cpp')
-rw-r--r--src/lib/netlist/analog/nld_fourterm.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/netlist/analog/nld_fourterm.cpp b/src/lib/netlist/analog/nld_fourterm.cpp
index a077e8d3bcc..31ea09339cf 100644
--- a/src/lib/netlist/analog/nld_fourterm.cpp
+++ b/src/lib/netlist/analog/nld_fourterm.cpp
@@ -19,8 +19,8 @@ namespace netlist
NETLIB_RESET(VCCS)
{
- const nl_double m_mult = m_G.Value() * m_gfac; // 1.0 ==> 1V ==> 1A
- const nl_double GI = NL_FCONST(1.0) / m_RI.Value();
+ const nl_double m_mult = m_G() * m_gfac; // 1.0 ==> 1V ==> 1A
+ const nl_double GI = NL_FCONST(1.0) / m_RI();
m_IP.set(GI);
m_IN.set(GI);
@@ -66,19 +66,19 @@ NETLIB_UPDATE(LVCCS)
NETLIB_UPDATE_TERMINALS(LVCCS)
{
- const nl_double m_mult = m_G.Value() * m_gfac; // 1.0 ==> 1V ==> 1A
+ const nl_double m_mult = m_G() * m_gfac; // 1.0 ==> 1V ==> 1A
const nl_double vi = m_IP.net().Q_Analog() - m_IN.net().Q_Analog();
- if (std::abs(m_mult / m_cur_limit * vi) > 0.5)
+ if (std::abs(m_mult / m_cur_limit() * vi) > 0.5)
m_vi = m_vi + 0.2*std::tanh((vi - m_vi)/0.2);
else
m_vi = vi;
- const nl_double x = m_mult / m_cur_limit * m_vi;
+ const nl_double x = m_mult / m_cur_limit() * m_vi;
const nl_double X = std::tanh(x);
const nl_double beta = m_mult * (1.0 - X*X);
- const nl_double I = m_cur_limit * X - beta * m_vi;
+ const nl_double I = m_cur_limit() * X - beta * m_vi;
m_OP.set(beta, NL_FCONST(0.0), I);
m_OP1.set(-beta, NL_FCONST(0.0));
@@ -112,11 +112,11 @@ NETLIB_UPDATE(CCCS)
NETLIB_RESET(VCVS)
{
- m_gfac = NL_FCONST(1.0) / m_RO.Value();
+ m_gfac = NL_FCONST(1.0) / m_RO();
NETLIB_NAME(VCCS)::reset();
- m_OP2.set(NL_FCONST(1.0) / m_RO.Value());
- m_ON2.set(NL_FCONST(1.0) / m_RO.Value());
+ m_OP2.set(NL_FCONST(1.0) / m_RO());
+ m_ON2.set(NL_FCONST(1.0) / m_RO());
}
} //namespace devices