summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/netlist/solver/nld_matrix_solver.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/netlist/solver/nld_matrix_solver.h')
-rw-r--r--src/lib/netlist/solver/nld_matrix_solver.h28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/lib/netlist/solver/nld_matrix_solver.h b/src/lib/netlist/solver/nld_matrix_solver.h
index 2f4e692ed6f..f28f855fa3b 100644
--- a/src/lib/netlist/solver/nld_matrix_solver.h
+++ b/src/lib/netlist/solver/nld_matrix_solver.h
@@ -62,7 +62,7 @@ public:
const std::size_t term_count = this->count();
const std::size_t railstart = this->m_railstart;
- const FT * const * RESTRICT other_cur_analog = this->connected_net_V();
+ const FT * const * other_cur_analog = this->connected_net_V();
for (std::size_t i = 0; i < railstart; i++)
{
@@ -114,7 +114,7 @@ public:
: analog_output_t(dev, aname)
, m_proxied_net(pnet)
{ }
- virtual ~proxied_analog_output_t();
+ ~proxied_analog_output_t() override = default;
analog_net_t *proxied_net() const { return m_proxied_net;}
private:
@@ -136,14 +136,14 @@ public:
PREFER_BAND_MATRIX
};
- virtual ~matrix_solver_t() override;
+ ~matrix_solver_t() override = default;
void setup(analog_net_t::list_t &nets)
{
vsetup(nets);
}
- void solve_base(netlist_time time);
+ void solve_base();
/* after every call to solve, update inputs must be called.
* this can be done as well as a batch to ease parallel processing.
@@ -196,10 +196,10 @@ protected:
/* virtual */ void add_term(std::size_t net_idx, terminal_t *term);
template <typename T>
- void store(const T & RESTRICT V);
+ void store(const T & V);
template <typename T>
- auto delta(const T & RESTRICT V) -> typename std::decay<decltype(V[0])>::type;
+ auto delta(const T & V) -> typename std::decay<decltype(V[0])>::type;
template <typename T>
void build_LE_A(T &child);
@@ -239,7 +239,7 @@ private:
};
template <typename T>
-auto matrix_solver_t::delta(const T & RESTRICT V) -> typename std::decay<decltype(V[0])>::type
+auto matrix_solver_t::delta(const T & V) -> typename std::decay<decltype(V[0])>::type
{
/* NOTE: Ideally we should also include currents (RHS) here. This would
* need a reevaluation of the right hand side after voltages have been updated
@@ -254,7 +254,7 @@ auto matrix_solver_t::delta(const T & RESTRICT V) -> typename std::decay<decltyp
}
template <typename T>
-void matrix_solver_t::store(const T & RESTRICT V)
+void matrix_solver_t::store(const T & V)
{
const std::size_t iN = this->m_terms.size();
for (std::size_t i = 0; i < iN; i++)
@@ -278,7 +278,7 @@ void matrix_solver_t::build_LE_A(T &child)
const std::size_t terms_count = terms->count();
const std::size_t railstart = terms->m_railstart;
- const float_type * const RESTRICT gt = terms->gt();
+ const float_type * const gt = terms->gt();
{
float_type akk = 0.0;
@@ -288,8 +288,8 @@ void matrix_solver_t::build_LE_A(T &child)
Ak[k] = akk;
}
- const float_type * const RESTRICT go = terms->go();
- int * RESTRICT net_other = terms->connected_net_idx();
+ const float_type * const go = terms->go();
+ int * net_other = terms->connected_net_idx();
for (std::size_t i = 0; i < railstart; i++)
Ak[net_other[i]] -= go[i];
@@ -309,9 +309,9 @@ void matrix_solver_t::build_LE_RHS(T &child)
float_type rhsk_b = 0.0;
const std::size_t terms_count = m_terms[k]->count();
- const float_type * const RESTRICT go = m_terms[k]->go();
- const float_type * const RESTRICT Idr = m_terms[k]->Idr();
- const float_type * const * RESTRICT other_cur_analog = m_terms[k]->connected_net_V();
+ const float_type * const go = m_terms[k]->go();
+ const float_type * const Idr = m_terms[k]->Idr();
+ const float_type * const * other_cur_analog = m_terms[k]->connected_net_V();
for (std::size_t i = 0; i < terms_count; i++)
rhsk_a = rhsk_a + Idr[i];