From 609b520fb8c5ccc39ddc236e64e5d88deb70e7d2 Mon Sep 17 00:00:00 2001 From: Mathis Kelm Date: Fri, 1 Apr 2022 19:39:39 +0200 Subject: [PATCH] [test][multidomain] resolve deprecation warnings --- test/multidomain/facet/1p_1p/threedomain/main.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/multidomain/facet/1p_1p/threedomain/main.cc b/test/multidomain/facet/1p_1p/threedomain/main.cc index f40bcbd42c..837dbf3f9b 100644 --- a/test/multidomain/facet/1p_1p/threedomain/main.cc +++ b/test/multidomain/facet/1p_1p/threedomain/main.cc @@ -143,8 +143,6 @@ int main(int argc, char** argv) auto couplingManager = std::make_shared(); // the problems (boundary conditions) - MultiDomainFVProblem problem; - using BulkProblem = MultiDomainFVProblem::template Type; using FacetProblem = MultiDomainFVProblem::template Type; using EdgeProblem = MultiDomainFVProblem::template Type; @@ -153,9 +151,11 @@ int main(int argc, char** argv) auto facetSpatialParams = std::make_shared(gridGeometry.get(facetId), "Facet"); auto edgeSpatialParams = std::make_shared(gridGeometry.get(edgeId), "Edge"); - problem.set(std::make_shared(gridGeometry.get(bulkId), bulkSpatialParams, couplingManager, "Bulk"), bulkId); - problem.set(std::make_shared(gridGeometry.get(facetId), facetSpatialParams, couplingManager, "Facet"), facetId); - problem.set(std::make_shared(gridGeometry.get(edgeId), edgeSpatialParams, couplingManager, "Edge"), edgeId); + auto bulkProblem = std::make_shared(gridGeometry.get(bulkId), bulkSpatialParams, couplingManager, "Bulk"); + auto facetProblem = std::make_shared(gridGeometry.get(facetId), facetSpatialParams, couplingManager, "Facet"); + auto edgeProblem = std::make_shared(gridGeometry.get(edgeId), edgeSpatialParams, couplingManager, "Edge"); + + MultiDomainFVProblem problem(std::make_tuple(bulkProblem, facetProblem, edgeProblem)); // the solution vector typename Traits::SolutionVector x; @@ -171,18 +171,18 @@ int main(int argc, char** argv) // the grid variables using GridVariables = MultiDomainFVGridVariables; - GridVariables gridVars(gridGeometry.getTuple(), problem.getTuple()); + GridVariables gridVars(gridGeometry.asTuple(), problem.asTuple()); gridVars.init(x); // intialize the vtk output module const std::array vtkOutputNames{{problem[bulkId].name(), problem[facetId].name(), problem[edgeId].name()}}; - MultiDomainVtkOutputModule vtkWriter(gridVars.getTuple(), x, vtkOutputNames); + MultiDomainVtkOutputModule vtkWriter(gridVars.asTuple(), x, vtkOutputNames); vtkWriter.initDefaultOutputFields(); vtkWriter.write(0.0); // the assembler using Assembler = MultiDomainFVAssembler; - auto assembler = std::make_shared( problem.getTuple(), gridGeometry.getTuple(), gridVars.getTuple(), couplingManager); + auto assembler = std::make_shared( problem.asTuple(), gridGeometry.asTuple(), gridVars.asTuple(), couplingManager); // the linear solver using LinearSolver = ILU0BiCGSTABBackend; -- GitLab