diff options
Diffstat (limited to 'src/lib/netlist/analog/nlid_fourterm.cpp')
-rw-r--r-- | src/lib/netlist/analog/nlid_fourterm.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/lib/netlist/analog/nlid_fourterm.cpp b/src/lib/netlist/analog/nlid_fourterm.cpp index ea5687c4f80..c4fdedbe1a9 100644 --- a/src/lib/netlist/analog/nlid_fourterm.cpp +++ b/src/lib/netlist/analog/nlid_fourterm.cpp @@ -24,16 +24,16 @@ namespace netlist NETLIB_RESET(VCCS) { const nl_fptype m_mult = m_G() * m_gfac; // 1.0 ==> 1V ==> 1A - const nl_fptype GI = plib::constants<nl_fptype>::one() / m_RI(); + const nl_fptype GI = nlconst::one() / m_RI(); m_IP.set_conductivity(GI); m_IN.set_conductivity(GI); - m_OP.set_go_gt(-m_mult, plib::constants<nl_fptype>::zero()); - m_OP1.set_go_gt(m_mult, plib::constants<nl_fptype>::zero()); + m_OP.set_go_gt(-m_mult, nlconst::zero()); + m_OP1.set_go_gt(m_mult, nlconst::zero()); - m_ON.set_go_gt(m_mult, plib::constants<nl_fptype>::zero()); - m_ON1.set_go_gt(-m_mult, plib::constants<nl_fptype>::zero()); + m_ON.set_go_gt(m_mult, nlconst::zero()); + m_ON1.set_go_gt(-m_mult, nlconst::zero()); } NETLIB_UPDATE(VCCS) @@ -67,9 +67,9 @@ NETLIB_UPDATE_TERMINALS(LVCCS) { const nl_fptype m_mult = m_G() * m_gfac; // 1.0 ==> 1V ==> 1A const nl_fptype vi = m_IP.net().Q_Analog() - m_IN.net().Q_Analog(); - const auto c1(plib::constants<nl_fptype>::cast(0.2)); + const auto c1(nlconst::magic(0.2)); - if (std::abs(m_mult / m_cur_limit() * vi) > plib::constants<nl_fptype>::half()) + if (std::abs(m_mult / m_cur_limit() * vi) > nlconst::half()) m_vi = m_vi + c1 * std::tanh((vi - m_vi) / c1); else m_vi = vi; @@ -77,14 +77,14 @@ NETLIB_UPDATE_TERMINALS(LVCCS) const nl_fptype x = m_mult / m_cur_limit() * m_vi; const nl_fptype X = std::tanh(x); - const nl_fptype beta = m_mult * (plib::constants<nl_fptype>::one() - X*X); + const nl_fptype beta = m_mult * (nlconst::one() - X*X); const nl_fptype I = m_cur_limit() * X - beta * m_vi; - m_OP.set_go_gt_I(-beta, plib::constants<nl_fptype>::zero(), I); - m_OP1.set_go_gt(beta, plib::constants<nl_fptype>::zero()); + m_OP.set_go_gt_I(-beta, nlconst::zero(), I); + m_OP1.set_go_gt(beta, nlconst::zero()); - m_ON.set_go_gt_I(beta, plib::constants<nl_fptype>::zero(), -I); - m_ON1.set_go_gt(-beta, plib::constants<nl_fptype>::zero()); + m_ON.set_go_gt_I(beta, nlconst::zero(), -I); + m_ON1.set_go_gt(-beta, nlconst::zero()); } // ---------------------------------------------------------------------------------------- @@ -107,11 +107,11 @@ NETLIB_UPDATE_PARAM(CCCS) NETLIB_RESET(VCVS) { - m_gfac = plib::constants<nl_fptype>::one() / m_RO(); + m_gfac = nlconst::one() / m_RO(); NETLIB_NAME(VCCS)::reset(); - m_OP2.set_conductivity(plib::constants<nl_fptype>::one() / m_RO()); - m_ON2.set_conductivity(plib::constants<nl_fptype>::one() / m_RO()); + m_OP2.set_conductivity(nlconst::one() / m_RO()); + m_ON2.set_conductivity(nlconst::one() / m_RO()); } } //namespace analog |