Fix openmp compile. (nw)

This commit is contained in:
couriersud 2017-03-20 18:42:11 +01:00
parent bcd35f9fd7
commit 6e8b88136d

View File

@ -95,9 +95,9 @@ NETLIB_UPDATE(solver)
bool force_solve = (netlist().time() < netlist_time::from_double(2 * m_params.m_max_timestep));
#if HAS_OPENMP && USE_OPENMP
const std::size_t t_cnt = m_mat_solvers.size();
if (m_parallel())
{
const std::size_t t_cnt = m_mat_solvers.size();
//omp_set_num_threads(3);
//omp_set_dynamic(0);
#pragma omp parallel
@ -116,11 +116,11 @@ NETLIB_UPDATE(solver)
solver->update_inputs();
}
else
for (int i = 0; i < t_cnt; i++)
if (m_mat_solvers[i]->has_timestep_devices() || force_solve)
for (auto & solver : m_mat_solvers)
if (solver->has_timestep_devices() || force_solve)
{
// Ignore return value
ATTR_UNUSED const netlist_time ts = m_mat_solvers[i]->solve();
ATTR_UNUSED const netlist_time ts = solver->solve();
solver->update_inputs();
}
#else