Commit 457b825e authored by Dennis Gläser's avatar Dennis Gläser Committed by Timo Koch
Browse files

[test] avoid deprecation warning from assembler constructor

parent 2566b8cc
......@@ -178,7 +178,7 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
using Assembler = StaggeredFVAssembler<TypeTag, DiffMethod::numeric>;
auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::UMFPackBackend;
......@@ -192,9 +192,6 @@ int main(int argc, char** argv) try
const bool printL2Error = getParam<bool>("Problem.PrintL2Error");
timeLoop->start(); do
{
// set previous solution for storage evaluations
assembler->setPreviousSolution(xOld);
// solve the non-linear system with time step control
nonLinearSolver.solve(x, *timeLoop);
......
......@@ -119,7 +119,7 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
using Assembler = StaggeredFVAssembler<TypeTag, DiffMethod::numeric>;
auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::UMFPackBackend;
......@@ -170,9 +170,6 @@ int main(int argc, char** argv) try
// time loop
timeLoop->start(); do
{
// set previous solution for storage evaluations
assembler->setPreviousSolution(xOld);
// solve the non-linear system with time step control
nonLinearSolver.solve(x, *timeLoop);
......
......@@ -114,7 +114,7 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
using Assembler = StaggeredFVAssembler<TypeTag, DiffMethod::numeric>;
auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::UMFPackBackend;
......@@ -127,9 +127,6 @@ int main(int argc, char** argv) try
// time loop
timeLoop->start(); do
{
// set previous solution for storage evaluations
assembler->setPreviousSolution(xOld);
// solve the non-linear system with time step control
nonLinearSolver.solve(x, *timeLoop);
......
......@@ -248,7 +248,8 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
using Assembler = StaggeredFVAssembler<TypeTag, DiffMethod::numeric>;
auto assembler = isStationary ? std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables) : std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
auto assembler = isStationary ? std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables)
: std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::UMFPackBackend;
......@@ -287,9 +288,6 @@ int main(int argc, char** argv) try
// time loop
timeLoop->start(); do
{
// set previous solution for storage evaluations
assembler->setPreviousSolution(xOld);
// solve the non-linear system with time step control
nonLinearSolver.solve(x, *timeLoop);
......
......@@ -116,7 +116,7 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
using Assembler = StaggeredFVAssembler<TypeTag, DiffMethod::numeric>;
auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::UMFPackBackend;
......@@ -129,9 +129,6 @@ int main(int argc, char** argv) try
// time loop
timeLoop->start(); do
{
// set previous solution for storage evaluations
assembler->setPreviousSolution(xOld);
// solve the non-linear system with time step control
nonLinearSolver.solve(x, *timeLoop);
......
......@@ -115,7 +115,7 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
using Assembler = StaggeredFVAssembler<TypeTag, DiffMethod::numeric>;
auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::UMFPackBackend;
......@@ -128,9 +128,6 @@ int main(int argc, char** argv) try
// time loop
timeLoop->start(); do
{
// set previous solution for storage evaluations
assembler->setPreviousSolution(xOld);
// solve the non-linear system with time step control
nonLinearSolver.solve(x, *timeLoop);
......
......@@ -114,7 +114,7 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
using Assembler = StaggeredFVAssembler<TypeTag, DiffMethod::numeric>;
auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::UMFPackBackend;
......@@ -130,9 +130,6 @@ int main(int argc, char** argv) try
// time loop
timeLoop->start(); do
{
// set previous solution for storage evaluations
assembler->setPreviousSolution(xOld);
// solve the non-linear system with time step control
nonLinearSolver.solve(x, *timeLoop);
......
......@@ -141,7 +141,7 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
using Assembler = StaggeredFVAssembler<TypeTag, DiffMethod::numeric>;
auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::UMFPackBackend;
......@@ -154,9 +154,6 @@ int main(int argc, char** argv) try
// time loop
timeLoop->start(); do
{
// set previous solution for storage evaluations
assembler->setPreviousSolution(xOld);
// solve the non-linear system with time step control
nonLinearSolver.solve(x, *timeLoop);
......
......@@ -138,7 +138,7 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
using Assembler = StaggeredFVAssembler<TypeTag, DiffMethod::numeric>;
auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::UMFPackBackend;
......@@ -151,9 +151,6 @@ int main(int argc, char** argv) try
// time loop
timeLoop->start(); do
{
// set previous solution for storage evaluations
assembler->setPreviousSolution(xOld);
// solve the non-linear system with time step control
nonLinearSolver.solve(x, *timeLoop);
......
......@@ -120,7 +120,7 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
using Assembler = FVAssembler<TypeTag, DiffMethod::numeric>;
auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::AMGBackend<TypeTag>;
......@@ -136,8 +136,6 @@ int main(int argc, char** argv) try
// time loop
timeLoop->start(); do
{
// set previous solution for storage evaluations
assembler->setPreviousSolution(xOld);
nonLinearSolver.solve(x,*timeLoop);
// update the analytical solution
......
......@@ -118,7 +118,7 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
using Assembler = FVAssembler<TypeTag, DiffMethod::numeric>;
auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::AMGBackend<TypeTag>;
......@@ -134,8 +134,6 @@ int main(int argc, char** argv) try
// time loop
timeLoop->start(); do
{
// set previous solution for storage evaluations
assembler->setPreviousSolution(xOld);
nonLinearSolver.solve(x,*timeLoop);
// update the analytical solution
......
......@@ -256,7 +256,7 @@ int main(int argc, char** argv) try
auto assembler = std::make_shared<Assembler>(std::make_tuple(problem0, problem1),
std::make_tuple(fvGridGeometry0, fvGridGeometry1),
std::make_tuple(gridVariables0, gridVariables1),
couplingManager, timeLoop);
couplingManager, timeLoop, oldSol);
// the linear solver
using LinearSolver = ILU0BiCGSTABBackend;
......@@ -270,9 +270,6 @@ int main(int argc, char** argv) try
timeLoop->start();
while (!timeLoop->finished())
{
// set previous solution for storage evaluations
assembler->setPreviousSolution(oldSol);
// solve the non-linear system with time step control
nonLinearSolver.solve(sol, *timeLoop);
......
......@@ -241,7 +241,7 @@ int main(int argc, char** argv) try
auto assembler = std::make_shared<Assembler>(std::make_tuple(problem0, problem1),
std::make_tuple(fvGridGeometry0, fvGridGeometry1),
std::make_tuple(gridVariables0, gridVariables1),
couplingManager, timeLoop);
couplingManager, timeLoop, oldSol);
// the linear solver
using LinearSolver = ILU0BiCGSTABBackend;
......@@ -255,9 +255,6 @@ int main(int argc, char** argv) try
timeLoop->start();
while (!timeLoop->finished())
{
// set previous solution for storage evaluations
assembler->setPreviousSolution(oldSol);
// solve the non-linear system with time step control
nonLinearSolver.solve(sol, *timeLoop);
......
......@@ -206,7 +206,8 @@ int main(int argc, char** argv) try
stokesGridVariables->faceGridVariablesPtr(),
darcyGridVariables),
couplingManager,
timeLoop);
timeLoop,
solOld);
// the linear solver
using LinearSolver = UMFPackBackend;
......@@ -221,10 +222,6 @@ int main(int argc, char** argv) try
// time loop
timeLoop->start(); do
{
// set previous solution for storage evaluations
assembler->setPreviousSolution(solOld);
if(timeLoop->time() > injectionBegin - eps && timeLoop->time() < injectionEnd + eps)
stokesProblem->setInjectionState(true);
else
......
......@@ -193,7 +193,8 @@ int main(int argc, char** argv) try
stokesGridVariables->faceGridVariablesPtr(),
darcyGridVariables),
couplingManager,
timeLoop);
timeLoop,
solOld);
// the linear solver
using LinearSolver = UMFPackBackend;
......@@ -206,9 +207,6 @@ int main(int argc, char** argv) try
// time loop
timeLoop->start(); do
{
// set previous solution for storage evaluations
assembler->setPreviousSolution(solOld);
// solve the non-linear system with time step control
nonLinearSolver.solve(sol, *timeLoop);
......
......@@ -193,7 +193,8 @@ int main(int argc, char** argv) try
stokesGridVariables->faceGridVariablesPtr(),
darcyGridVariables),
couplingManager,
timeLoop);
timeLoop,
solOld);
FluxOverSurface<StokesGridVariables,
decltype(stokesSol),
......@@ -229,9 +230,6 @@ int main(int argc, char** argv) try
// time loop
timeLoop->start(); do
{
// set previous solution for storage evaluations
assembler->setPreviousSolution(solOld);
// solve the non-linear system with time step control
nonLinearSolver.solve(sol, *timeLoop);
......
......@@ -193,7 +193,8 @@ int main(int argc, char** argv) try
stokesGridVariables->faceGridVariablesPtr(),
darcyGridVariables),
couplingManager,
timeLoop);
timeLoop,
solOld);
// the linear solver
using LinearSolver = UMFPackBackend;
......@@ -206,9 +207,6 @@ int main(int argc, char** argv) try
// time loop
timeLoop->start(); do
{
// set previous solution for storage evaluations
assembler->setPreviousSolution(solOld);
// solve the non-linear system with time step control
nonLinearSolver.solve(sol, *timeLoop);
......
......@@ -225,7 +225,7 @@ int main(int argc, char** argv) try
stokesGridVariables->faceGridVariablesPtr(),
darcyGridVariables),
couplingManager,
timeLoop);
timeLoop, solOld);
// the linear solver
using LinearSolver = UMFPackBackend;
......@@ -238,9 +238,6 @@ int main(int argc, char** argv) try
// time loop
timeLoop->start(); do
{
// set previous solution for storage evaluations
assembler->setPreviousSolution(solOld);
// solve the non-linear system with time step control
nonLinearSolver.solve(sol, *timeLoop);
......
......@@ -378,7 +378,7 @@ int main(int argc, char** argv) try
auto assembler = std::make_shared<Assembler>(std::make_tuple(bulkProblem, lowDimProblem),
std::make_tuple(bulkFvGridGeometry, lowDimFvGridGeometry),
std::make_tuple(bulkGridVariables, lowDimGridVariables),
couplingManager, timeLoop);
couplingManager, timeLoop, oldSol);
// the linear solver
using LinearSolver = BlockDiagILU0BiCGSTABSolver;
......@@ -412,9 +412,6 @@ int main(int argc, char** argv) try
{
std::cout << '\n' << "\033[1m" << "Simulation time in hours: " << timeLoop->time()/3600 << "\033[0m\n\n";
// set previous solution for storage evaluations
assembler->setPreviousSolution(oldSol);
// solve the non-linear system with time step control
nonLinearSolver.solve(sol, *timeLoop);
......
......@@ -192,7 +192,7 @@ int main(int argc, char** argv) try
auto assembler = std::make_shared<Assembler>(std::make_tuple(bulkProblem, lowDimProblem),
std::make_tuple(bulkFvGridGeometry, lowDimFvGridGeometry),
std::make_tuple(bulkGridVariables, lowDimGridVariables),
couplingManager, timeLoop);
couplingManager, timeLoop, oldSol);
// the linear solver
using LinearSolver = BlockDiagILU0BiCGSTABSolver;
......@@ -207,9 +207,6 @@ int main(int argc, char** argv) try
timeLoop->start();
while (!timeLoop->finished())
{
// set previous solution for storage evaluations
assembler->setPreviousSolution(oldSol);
// solve the non-linear system with time step control
nonLinearSolver.solve(sol, *timeLoop);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment