Skip to content
Snippets Groups Projects
Commit 580454c4 authored by Dmitri Naumov's avatar Dmitri Naumov
Browse files

[PL] Remove NLTag template from createProcessData.

parent 839ec223
No related branches found
No related tags found
No related merge requests found
...@@ -35,7 +35,7 @@ static std::unique_ptr<ProcessData> makeProcessData( ...@@ -35,7 +35,7 @@ static std::unique_ptr<ProcessData> makeProcessData(
nonlinear_solver_picard->compensateNonEquilibriumInitialResiduum( nonlinear_solver_picard->compensateNonEquilibriumInitialResiduum(
compensate_non_equilibrium_initial_residuum); compensate_non_equilibrium_initial_residuum);
return std::make_unique<ProcessData>( return std::make_unique<ProcessData>(
std::move(timestepper), *nonlinear_solver_picard, std::move(timestepper), Tag::Picard, *nonlinear_solver_picard,
std::move(conv_crit), std::move(time_disc), process_id, process); std::move(conv_crit), std::move(time_disc), process_id, process);
} }
if (auto* nonlinear_solver_newton = if (auto* nonlinear_solver_newton =
...@@ -45,7 +45,7 @@ static std::unique_ptr<ProcessData> makeProcessData( ...@@ -45,7 +45,7 @@ static std::unique_ptr<ProcessData> makeProcessData(
nonlinear_solver_newton->compensateNonEquilibriumInitialResiduum( nonlinear_solver_newton->compensateNonEquilibriumInitialResiduum(
compensate_non_equilibrium_initial_residuum); compensate_non_equilibrium_initial_residuum);
return std::make_unique<ProcessData>( return std::make_unique<ProcessData>(
std::move(timestepper), *nonlinear_solver_newton, std::move(timestepper), Tag::Newton, *nonlinear_solver_newton,
std::move(conv_crit), std::move(time_disc), process_id, process); std::move(conv_crit), std::move(time_disc), process_id, process);
} }
......
...@@ -22,16 +22,16 @@ namespace ProcessLib ...@@ -22,16 +22,16 @@ namespace ProcessLib
{ {
struct ProcessData struct ProcessData
{ {
template <NumLib::NonlinearSolverTag NLTag>
ProcessData(std::unique_ptr<NumLib::TimeStepAlgorithm>&& timestepper_, ProcessData(std::unique_ptr<NumLib::TimeStepAlgorithm>&& timestepper_,
NumLib::NonlinearSolver<NLTag>& nonlinear_solver, NumLib::NonlinearSolverTag const nonlinear_solver_tag_,
NumLib::NonlinearSolverBase& nonlinear_solver_,
std::unique_ptr<NumLib::ConvergenceCriterion>&& conv_crit_, std::unique_ptr<NumLib::ConvergenceCriterion>&& conv_crit_,
std::unique_ptr<NumLib::TimeDiscretization>&& time_disc_, std::unique_ptr<NumLib::TimeDiscretization>&& time_disc_,
int const process_id_, int const process_id_,
Process& process_) Process& process_)
: timestepper(std::move(timestepper_)), : timestepper(std::move(timestepper_)),
nonlinear_solver_tag(NLTag), nonlinear_solver_tag(nonlinear_solver_tag_),
nonlinear_solver(nonlinear_solver), nonlinear_solver(nonlinear_solver_),
nonlinear_solver_status{true, 0}, nonlinear_solver_status{true, 0},
conv_crit(std::move(conv_crit_)), conv_crit(std::move(conv_crit_)),
time_disc(std::move(time_disc_)), time_disc(std::move(time_disc_)),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment