Commit ab79d60f authored by Kilian Weishaupt's avatar Kilian Weishaupt Committed by Ned Coltman
Browse files

[test][stokesdarcy] Fix deprecation warnings

* change order in partial()
* change order in assembler
parent 4208b90a
......@@ -166,7 +166,7 @@ int main(int argc, char** argv) try
sol[darcyIdx].resize(darcyFvGridGeometry->numDofs());
// get a solution vector storing references to the two Stokes solution vectors
auto stokesSol = partial(sol, stokesCellCenterIdx, stokesFaceIdx);
auto stokesSol = partial(sol, stokesFaceIdx, stokesCellCenterIdx);
// apply initial solution for instationary problems
stokesProblem->applyInitialSolution(stokesSol);
......@@ -199,11 +199,11 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
using Assembler = MultiDomainFVAssembler<Traits, CouplingManager, DiffMethod::numeric>;
auto assembler = std::make_shared<Assembler>(std::make_tuple(stokesProblem, stokesProblem, darcyProblem),
std::make_tuple(stokesFvGridGeometry->cellCenterFVGridGeometryPtr(),
stokesFvGridGeometry->faceFVGridGeometryPtr(),
std::make_tuple(stokesFvGridGeometry->faceFVGridGeometryPtr(),
stokesFvGridGeometry->cellCenterFVGridGeometryPtr(),
darcyFvGridGeometry),
std::make_tuple(stokesGridVariables->cellCenterGridVariablesPtr(),
stokesGridVariables->faceGridVariablesPtr(),
std::make_tuple(stokesGridVariables->faceGridVariablesPtr(),
stokesGridVariables->cellCenterGridVariablesPtr(),
darcyGridVariables),
couplingManager,
timeLoop,
......
......@@ -154,7 +154,7 @@ int main(int argc, char** argv) try
sol[darcyIdx].resize(darcyFvGridGeometry->numDofs());
// get a solution vector storing references to the two Stokes solution vectors
auto stokesSol = partial(sol, stokesCellCenterIdx, stokesFaceIdx);
auto stokesSol = partial(sol, stokesFaceIdx, stokesCellCenterIdx);
// apply initial solution for instationary problems
stokesProblem->applyInitialSolution(stokesSol);
......@@ -186,11 +186,11 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
using Assembler = MultiDomainFVAssembler<Traits, CouplingManager, DiffMethod::numeric>;
auto assembler = std::make_shared<Assembler>(std::make_tuple(stokesProblem, stokesProblem, darcyProblem),
std::make_tuple(stokesFvGridGeometry->cellCenterFVGridGeometryPtr(),
stokesFvGridGeometry->faceFVGridGeometryPtr(),
std::make_tuple(stokesFvGridGeometry->faceFVGridGeometryPtr(),
stokesFvGridGeometry->cellCenterFVGridGeometryPtr(),
darcyFvGridGeometry),
std::make_tuple(stokesGridVariables->cellCenterGridVariablesPtr(),
stokesGridVariables->faceGridVariablesPtr(),
std::make_tuple(stokesGridVariables->faceGridVariablesPtr(),
stokesGridVariables->cellCenterGridVariablesPtr(),
darcyGridVariables),
couplingManager,
timeLoop,
......
......@@ -154,7 +154,7 @@ int main(int argc, char** argv) try
sol[darcyIdx].resize(darcyFvGridGeometry->numDofs());
// get a solution vector storing references to the two Stokes solution vectors
auto stokesSol = partial(sol, stokesCellCenterIdx, stokesFaceIdx);
auto stokesSol = partial(sol, stokesFaceIdx, stokesCellCenterIdx);
// apply initial solution for instationary problems
stokesProblem->applyInitialSolution(stokesSol);
......@@ -184,11 +184,11 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
using Assembler = MultiDomainFVAssembler<Traits, CouplingManager, DiffMethod::numeric>;
auto assembler = std::make_shared<Assembler>(std::make_tuple(stokesProblem, stokesProblem, darcyProblem),
std::make_tuple(stokesFvGridGeometry->cellCenterFVGridGeometryPtr(),
stokesFvGridGeometry->faceFVGridGeometryPtr(),
std::make_tuple(stokesFvGridGeometry->faceFVGridGeometryPtr(),
stokesFvGridGeometry->cellCenterFVGridGeometryPtr(),
darcyFvGridGeometry),
std::make_tuple(stokesGridVariables->cellCenterGridVariablesPtr(),
stokesGridVariables->faceGridVariablesPtr(),
std::make_tuple(stokesGridVariables->faceGridVariablesPtr(),
stokesGridVariables->cellCenterGridVariablesPtr(),
darcyGridVariables),
couplingManager,
timeLoop,
......
......@@ -153,7 +153,7 @@ int main(int argc, char** argv) try
sol[darcyIdx].resize(darcyFvGridGeometry->numDofs());
// get a solution vector storing references to the two Stokes solution vectors
auto stokesSol = partial(sol, stokesCellCenterIdx, stokesFaceIdx);
auto stokesSol = partial(sol, stokesFaceIdx, stokesCellCenterIdx);
// apply initial solution for instationary problems
stokesProblem->applyInitialSolution(stokesSol);
......@@ -186,11 +186,11 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
using Assembler = MultiDomainFVAssembler<Traits, CouplingManager, DiffMethod::numeric>;
auto assembler = std::make_shared<Assembler>(std::make_tuple(stokesProblem, stokesProblem, darcyProblem),
std::make_tuple(stokesFvGridGeometry->cellCenterFVGridGeometryPtr(),
stokesFvGridGeometry->faceFVGridGeometryPtr(),
std::make_tuple(stokesFvGridGeometry->faceFVGridGeometryPtr(),
stokesFvGridGeometry->cellCenterFVGridGeometryPtr(),
darcyFvGridGeometry),
std::make_tuple(stokesGridVariables->cellCenterGridVariablesPtr(),
stokesGridVariables->faceGridVariablesPtr(),
std::make_tuple(stokesGridVariables->faceGridVariablesPtr(),
stokesGridVariables->cellCenterGridVariablesPtr(),
darcyGridVariables),
couplingManager,
timeLoop,
......
......@@ -136,7 +136,7 @@ int main(int argc, char** argv) try
sol[darcyIdx].resize(darcyFvGridGeometry->numDofs());
// get a solution vector storing references to the two Stokes solution vectors
auto stokesSol = partial(sol, stokesCellCenterIdx, stokesFaceIdx);
auto stokesSol = partial(sol, stokesFaceIdx, stokesCellCenterIdx);
couplingManager->init(stokesProblem, darcyProblem, sol);
......@@ -162,11 +162,11 @@ int main(int argc, char** argv) try
// the assembler for a stationary problem
using Assembler = MultiDomainFVAssembler<Traits, CouplingManager, DiffMethod::numeric>;
auto assembler = std::make_shared<Assembler>(std::make_tuple(stokesProblem, stokesProblem, darcyProblem),
std::make_tuple(stokesFvGridGeometry->cellCenterFVGridGeometryPtr(),
stokesFvGridGeometry->faceFVGridGeometryPtr(),
std::make_tuple(stokesFvGridGeometry->faceFVGridGeometryPtr(),
stokesFvGridGeometry->cellCenterFVGridGeometryPtr(),
darcyFvGridGeometry),
std::make_tuple(stokesGridVariables->cellCenterGridVariablesPtr(),
stokesGridVariables->faceGridVariablesPtr(),
std::make_tuple(stokesGridVariables->faceGridVariablesPtr(),
stokesGridVariables->cellCenterGridVariablesPtr(),
darcyGridVariables),
couplingManager);
......
......@@ -218,11 +218,11 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
using Assembler = MultiDomainFVAssembler<Traits, CouplingManager, DiffMethod::numeric>;
auto assembler = std::make_shared<Assembler>(std::make_tuple(stokesProblem, stokesProblem, darcyProblem),
std::make_tuple(stokesFvGridGeometry->cellCenterFVGridGeometryPtr(),
stokesFvGridGeometry->faceFVGridGeometryPtr(),
std::make_tuple(stokesFvGridGeometry->faceFVGridGeometryPtr(),
stokesFvGridGeometry->cellCenterFVGridGeometryPtr(),
darcyFvGridGeometry),
std::make_tuple(stokesGridVariables->cellCenterGridVariablesPtr(),
stokesGridVariables->faceGridVariablesPtr(),
std::make_tuple(stokesGridVariables->faceGridVariablesPtr(),
stokesGridVariables->cellCenterGridVariablesPtr(),
darcyGridVariables),
couplingManager,
timeLoop, solOld);
......
Markdown is supported
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