summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/netlist/analog/nlid_twoterm.cpp
diff options
context:
space:
mode:
author couriersud <couriersud@gmx.org>2019-02-06 10:24:34 +0100
committer couriersud <couriersud@gmx.org>2019-02-07 21:54:11 +0100
commit3b899b86e67e3a5cc093d2dd9c0dcaeed197c806 (patch)
tree5efe135d75b1fd837549719bfa6572802870be1b /src/lib/netlist/analog/nlid_twoterm.cpp
parentc8d0db0c83d4b72e86f6255b95ff45ccc475d85d (diff)
netlist: Refactoring after adding clang-tidy support to netlist makefile
- convert macros to c++ code. - order of device creation should not depend on std lib. - some state saving cleanup. - added support for clang-tidy to makefile. - modifications triggered by clang-tidy-9.
Diffstat (limited to 'src/lib/netlist/analog/nlid_twoterm.cpp')
-rw-r--r--src/lib/netlist/analog/nlid_twoterm.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/netlist/analog/nlid_twoterm.cpp b/src/lib/netlist/analog/nlid_twoterm.cpp
index 51c17b92267..5b4bf064093 100644
--- a/src/lib/netlist/analog/nlid_twoterm.cpp
+++ b/src/lib/netlist/analog/nlid_twoterm.cpp
@@ -7,8 +7,8 @@
#include "../solver/nld_solver.h"
-#include "nlid_twoterm.h"
#include "../nl_factory.h"
+#include "nlid_twoterm.h"
#include <cmath>
@@ -70,7 +70,7 @@ void generic_diode::update_diode(const nl_double nVd)
}
else
{
- const double a = std::max((nVd - m_Vd) * m_VtInv, NL_FCONST(-0.99));
+ const double a = std::max((nVd - m_Vd) * m_VtInv, plib::constants<nl_double>()(-0.99));
m_Vd = m_Vd + std::log1p(a) * m_Vt;
//const double IseVDVt = m_Is * std::exp(m_Vd * m_VtInv);
const double IseVDVt = std::exp(m_logIs + m_Vd * m_VtInv);
@@ -145,7 +145,7 @@ NETLIB_RESET(POT)
v = (std::exp(v) - 1.0) / (std::exp(1.0) - 1.0);
m_R1.set_R(std::max(m_R() * v, exec().gmin()));
- m_R2.set_R(std::max(m_R() * (NL_FCONST(1.0) - v), exec().gmin()));
+ m_R2.set_R(std::max(m_R() * (plib::constants<nl_double>::one - v), exec().gmin()));
}
NETLIB_UPDATE_PARAM(POT)
@@ -158,7 +158,7 @@ NETLIB_UPDATE_PARAM(POT)
v = (std::exp(v) - 1.0) / (std::exp(1.0) - 1.0);
m_R1.set_R(std::max(m_R() * v, exec().gmin()));
- m_R2.set_R(std::max(m_R() * (NL_FCONST(1.0) - v), exec().gmin()));
+ m_R2.set_R(std::max(m_R() * (plib::constants<nl_double>::one - v), exec().gmin()));
}
@@ -288,6 +288,6 @@ NETLIB_UPDATE_TERMINALS(D)
NETLIB_DEVICE_IMPL_NS(analog, D, "DIODE", "MODEL")
NETLIB_DEVICE_IMPL_NS(analog, VS, "VS", "V")
NETLIB_DEVICE_IMPL_NS(analog, CS, "CS", "I")
- }
+ } // namespace devices
} // namespace netlist