From da5f5e7f53a7417e9a34557b665c830a0a15f518 Mon Sep 17 00:00:00 2001 From: Kilian Weishaupt <kilian.weishaupt@iws.uni-stuttgart.de> Date: Thu, 8 Nov 2018 18:08:51 +0100 Subject: [PATCH] [iofields][test] Use new signature initOutputModule --- test/freeflow/navierstokes/test_angeli.cc | 2 +- test/freeflow/navierstokes/test_closedsystem.cc | 2 +- test/freeflow/navierstokes/test_kovasznay.cc | 2 +- test/freeflow/navierstokes/test_navierstokes_1d.cc | 2 +- test/freeflow/navierstokes/test_stokes_channel_3d.cc | 2 +- test/freeflow/navierstokesnc/test_densitydrivenflow.cc | 2 +- test/freeflow/navierstokesnc/test_msfreeflow.cc | 2 +- test/multidomain/boundary/darcydarcy/1p_1p/main.cc | 4 ++-- test/multidomain/boundary/darcydarcy/1p_2p/main.cc | 4 ++-- .../horizontalflow/test_stokes1p2cdarcy1p2chorizontal.cc | 4 ++-- .../verticalflow/test_stokes1p2cdarcy1p2cvertical.cc | 4 ++-- .../1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.cc | 4 ++-- .../horizontalflow/test_stokes1pdarcy1phorizontal.cc | 4 ++-- .../1p_1p/verticalflow/test_stokes1pdarcy1pvertical.cc | 4 ++-- .../stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.cc | 4 ++-- .../embedded/1d3d/1p2c_richards2c/test_1p2c_richards2c.cc | 6 +++--- test/multidomain/embedded/1d3d/1p_1p/test_1p_1p.cc | 8 ++++---- .../embedded/1d3d/1p_richards/test_1p_richards.cc | 6 +++--- test/multidomain/embedded/2d3d/1p_1p/test_1p_1p.cc | 4 ++-- .../facet/1p_1p/analytical/test_facetcoupling_fv_1p1p.cc | 4 ++-- .../test_facetcoupling_tpfa_1p1p_threedomain.cc | 6 +++--- test/porousmediumflow/1p/implicit/periodicbc/test_1pfv.cc | 2 +- 22 files changed, 41 insertions(+), 41 deletions(-) diff --git a/test/freeflow/navierstokes/test_angeli.cc b/test/freeflow/navierstokes/test_angeli.cc index 54a69fc433..f19351e6bb 100644 --- a/test/freeflow/navierstokes/test_angeli.cc +++ b/test/freeflow/navierstokes/test_angeli.cc @@ -150,7 +150,7 @@ int main(int argc, char** argv) try // intialize the vtk output module StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name()); using IOFields = typename GET_PROP_TYPE(TypeTag, IOFields); - IOFields::init(vtkWriter); //!< Add model specific output fields + IOFields::initOutputModule(vtkWriter); //!< Add model specific output fields vtkWriter.addField(problem->getAnalyticalPressureSolution(), "pressureExact"); vtkWriter.addField(problem->getAnalyticalVelocitySolution(), "velocityExact"); vtkWriter.addFaceField(problem->getAnalyticalVelocitySolutionOnFace(), "faceVelocityExact"); diff --git a/test/freeflow/navierstokes/test_closedsystem.cc b/test/freeflow/navierstokes/test_closedsystem.cc index 9530b8ceed..a006672081 100644 --- a/test/freeflow/navierstokes/test_closedsystem.cc +++ b/test/freeflow/navierstokes/test_closedsystem.cc @@ -144,7 +144,7 @@ int main(int argc, char** argv) try // intialize the vtk output module using IOFields = typename GET_PROP_TYPE(TypeTag, IOFields); StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name()); - IOFields::init(vtkWriter); //!< Add model specific output fields + IOFields::initOutputModule(vtkWriter); //!< Add model specific output fields vtkWriter.write(0.0); // instantiate time loop diff --git a/test/freeflow/navierstokes/test_kovasznay.cc b/test/freeflow/navierstokes/test_kovasznay.cc index cc2a60a7b3..1bb20aeb39 100644 --- a/test/freeflow/navierstokes/test_kovasznay.cc +++ b/test/freeflow/navierstokes/test_kovasznay.cc @@ -136,7 +136,7 @@ int main(int argc, char** argv) try // intialize the vtk output module using IOFields = typename GET_PROP_TYPE(TypeTag, IOFields); StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name()); - IOFields::init(vtkWriter); //!< Add model specific output fields + IOFields::initOutputModule(vtkWriter); //!< Add model specific output fields vtkWriter.addField(problem->getAnalyticalPressureSolution(), "pressureExact"); vtkWriter.addField(problem->getAnalyticalVelocitySolution(), "velocityExact"); vtkWriter.addFaceField(problem->getAnalyticalVelocitySolutionOnFace(), "faceVelocityExact"); diff --git a/test/freeflow/navierstokes/test_navierstokes_1d.cc b/test/freeflow/navierstokes/test_navierstokes_1d.cc index db71272df9..da8777f6de 100644 --- a/test/freeflow/navierstokes/test_navierstokes_1d.cc +++ b/test/freeflow/navierstokes/test_navierstokes_1d.cc @@ -125,7 +125,7 @@ int main(int argc, char** argv) try // intialize the vtk output module using IOFields = typename GET_PROP_TYPE(TypeTag, IOFields); StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name()); - IOFields::init(vtkWriter); //!< Add model specific output fields + IOFields::initOutputModule(vtkWriter); //!< Add model specific output fields vtkWriter.addField(problem->getAnalyticalPressureSolution(), "pressureExact"); vtkWriter.addField(problem->getAnalyticalVelocitySolution(), "velocityExact"); vtkWriter.addFaceField(problem->getAnalyticalVelocitySolutionOnFace(), "faceVelocityExact"); diff --git a/test/freeflow/navierstokes/test_stokes_channel_3d.cc b/test/freeflow/navierstokes/test_stokes_channel_3d.cc index b5389b17f3..5b9d3a0f96 100644 --- a/test/freeflow/navierstokes/test_stokes_channel_3d.cc +++ b/test/freeflow/navierstokes/test_stokes_channel_3d.cc @@ -133,7 +133,7 @@ int main(int argc, char** argv) try // intialize the vtk output module using IOFields = typename GET_PROP_TYPE(TypeTag, IOFields); StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name()); - IOFields::init(vtkWriter); //!< Add model specific output fields + IOFields::initOutputModule(vtkWriter); //!< Add model specific output fields vtkWriter.write(0.0); // the assembler with time loop for instationary problem diff --git a/test/freeflow/navierstokesnc/test_densitydrivenflow.cc b/test/freeflow/navierstokesnc/test_densitydrivenflow.cc index 1dbb8bc579..bebae70faf 100644 --- a/test/freeflow/navierstokesnc/test_densitydrivenflow.cc +++ b/test/freeflow/navierstokesnc/test_densitydrivenflow.cc @@ -148,7 +148,7 @@ int main(int argc, char** argv) try // intialize the vtk output module using IOFields = typename GET_PROP_TYPE(TypeTag, IOFields); StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name()); - IOFields::init(vtkWriter); //!< Add model specific output fields + IOFields::initOutputModule(vtkWriter); //!< Add model specific output fields vtkWriter.addField(problem->getDeltaRho(), "deltaRho"); vtkWriter.write(0.0); diff --git a/test/freeflow/navierstokesnc/test_msfreeflow.cc b/test/freeflow/navierstokesnc/test_msfreeflow.cc index 1cf5daa701..bbe525a69f 100644 --- a/test/freeflow/navierstokesnc/test_msfreeflow.cc +++ b/test/freeflow/navierstokesnc/test_msfreeflow.cc @@ -148,7 +148,7 @@ int main(int argc, char** argv) try // intialize the vtk output module using IOFields = typename GET_PROP_TYPE(TypeTag, IOFields); StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name()); - IOFields::init(vtkWriter); //! Add model specific output fields + IOFields::initOutputModule(vtkWriter); //! Add model specific output fields vtkWriter.write(0.0); // the assembler with time loop for instationary problem diff --git a/test/multidomain/boundary/darcydarcy/1p_1p/main.cc b/test/multidomain/boundary/darcydarcy/1p_1p/main.cc index d662aa15ce..2a9686fbe0 100644 --- a/test/multidomain/boundary/darcydarcy/1p_1p/main.cc +++ b/test/multidomain/boundary/darcydarcy/1p_1p/main.cc @@ -225,12 +225,12 @@ int main(int argc, char** argv) try // intialize the vtk output module using SolutionVector0 = std::decay_t<decltype(sol[domain0Idx])>; VtkOutputModule<GridVariables0, SolutionVector0> vtkWriter0(*gridVariables0, sol[domain0Idx], problem0->name()); - GET_PROP_TYPE(SubTypeTag0, IOFields)::init(vtkWriter0); + GET_PROP_TYPE(SubTypeTag0, IOFields)::initOutputModule(vtkWriter0); vtkWriter0.write(0.0); using SolutionVector1 = std::decay_t<decltype(sol[domain1Idx])>; VtkOutputModule<GridVariables1, SolutionVector1> vtkWriter1(*gridVariables1, sol[domain1Idx], problem1->name()); - GET_PROP_TYPE(SubTypeTag1, IOFields)::init(vtkWriter1); + GET_PROP_TYPE(SubTypeTag1, IOFields)::initOutputModule(vtkWriter1); vtkWriter1.write(0.0); // instantiate time loop diff --git a/test/multidomain/boundary/darcydarcy/1p_2p/main.cc b/test/multidomain/boundary/darcydarcy/1p_2p/main.cc index b38e7d16dc..f749e14122 100644 --- a/test/multidomain/boundary/darcydarcy/1p_2p/main.cc +++ b/test/multidomain/boundary/darcydarcy/1p_2p/main.cc @@ -210,12 +210,12 @@ int main(int argc, char** argv) try // intialize the vtk output module using SolutionVector0 = std::decay_t<decltype(sol[domain0Idx])>; VtkOutputModule<GridVariables0, SolutionVector0> vtkWriter0(*gridVariables0, sol[domain0Idx], problem0->name()); - GET_PROP_TYPE(SubTypeTag0, IOFields)::init(vtkWriter0); + GET_PROP_TYPE(SubTypeTag0, IOFields)::initOutputModule(vtkWriter0); vtkWriter0.write(0.0); using SolutionVector1 = std::decay_t<decltype(sol[domain1Idx])>; VtkOutputModule<GridVariables1, SolutionVector1> vtkWriter1(*gridVariables1, sol[domain1Idx], problem1->name()); - GET_PROP_TYPE(SubTypeTag1, IOFields)::init(vtkWriter1); + GET_PROP_TYPE(SubTypeTag1, IOFields)::initOutputModule(vtkWriter1); vtkWriter1.write(0.0); // instantiate time loop diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/test_stokes1p2cdarcy1p2chorizontal.cc b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/test_stokes1p2cdarcy1p2chorizontal.cc index ed90f6302b..0e51f16ffb 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/test_stokes1p2cdarcy1p2chorizontal.cc +++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/test_stokes1p2cdarcy1p2chorizontal.cc @@ -187,13 +187,13 @@ int main(int argc, char** argv) try const auto darcyName = getParam<std::string>("Problem.Name") + "_" + darcyProblem->name(); StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName); - GET_PROP_TYPE(StokesTypeTag, IOFields)::init(stokesVtkWriter); + GET_PROP_TYPE(StokesTypeTag, IOFields)::initOutputModule(stokesVtkWriter); stokesVtkWriter.write(0.0); VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName); using DarcyVelocityOutput = typename GET_PROP_TYPE(DarcyTypeTag, VelocityOutput); darcyVtkWriter.addVelocityOutput(std::make_shared<DarcyVelocityOutput>(*darcyGridVariables)); - GET_PROP_TYPE(DarcyTypeTag, IOFields)::init(darcyVtkWriter); + GET_PROP_TYPE(DarcyTypeTag, IOFields)::initOutputModule(darcyVtkWriter); darcyVtkWriter.write(0.0); // the assembler with time loop for instationary problem diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical.cc b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical.cc index 35b37cb2ef..946bb677b4 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical.cc +++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical.cc @@ -188,13 +188,13 @@ int main(int argc, char** argv) try const auto darcyName = getParam<std::string>("Problem.Name") + "_" + darcyProblem->name(); StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName); - GET_PROP_TYPE(StokesTypeTag, IOFields)::init(stokesVtkWriter); + GET_PROP_TYPE(StokesTypeTag, IOFields)::initOutputModule(stokesVtkWriter); stokesVtkWriter.write(0.0); VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName); using DarcyVelocityOutput = typename GET_PROP_TYPE(DarcyTypeTag, VelocityOutput); darcyVtkWriter.addVelocityOutput(std::make_shared<DarcyVelocityOutput>(*darcyGridVariables)); - GET_PROP_TYPE(DarcyTypeTag, IOFields)::init(darcyVtkWriter); + GET_PROP_TYPE(DarcyTypeTag, IOFields)::initOutputModule(darcyVtkWriter); darcyVtkWriter.write(0.0); // the assembler with time loop for instationary problem diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.cc b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.cc index 0dc1b24130..9a506d0e0f 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.cc +++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.cc @@ -180,13 +180,13 @@ int main(int argc, char** argv) try const auto darcyName = getParam<std::string>("Problem.Name") + "_" + darcyProblem->name(); StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName); - GET_PROP_TYPE(StokesTypeTag, IOFields)::init(stokesVtkWriter); + GET_PROP_TYPE(StokesTypeTag, IOFields)::initOutputModule(stokesVtkWriter); stokesVtkWriter.write(0.0); VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName); using DarcyVelocityOutput = typename GET_PROP_TYPE(DarcyTypeTag, VelocityOutput); darcyVtkWriter.addVelocityOutput(std::make_shared<DarcyVelocityOutput>(*darcyGridVariables)); - GET_PROP_TYPE(DarcyTypeTag, IOFields)::init(darcyVtkWriter); + GET_PROP_TYPE(DarcyTypeTag, IOFields)::initOutputModule(darcyVtkWriter); darcyVtkWriter.write(0.0); // the assembler with time loop for instationary problem diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/test_stokes1pdarcy1phorizontal.cc b/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/test_stokes1pdarcy1phorizontal.cc index f19998392f..70ad0085b4 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/test_stokes1pdarcy1phorizontal.cc +++ b/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/test_stokes1pdarcy1phorizontal.cc @@ -159,13 +159,13 @@ int main(int argc, char** argv) try const auto darcyName = getParam<std::string>("Problem.Name") + "_" + darcyProblem->name(); StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName); - GET_PROP_TYPE(StokesTypeTag, IOFields)::init(stokesVtkWriter); + GET_PROP_TYPE(StokesTypeTag, IOFields)::initOutputModule(stokesVtkWriter); stokesVtkWriter.write(0.0); VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName); using DarcyVelocityOutput = typename GET_PROP_TYPE(DarcyTypeTag, VelocityOutput); darcyVtkWriter.addVelocityOutput(std::make_shared<DarcyVelocityOutput>(*darcyGridVariables)); - GET_PROP_TYPE(DarcyTypeTag, IOFields)::init(darcyVtkWriter); + GET_PROP_TYPE(DarcyTypeTag, IOFields)::initOutputModule(darcyVtkWriter); darcyVtkWriter.write(0.0); // the assembler for a stationary problem diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/test_stokes1pdarcy1pvertical.cc b/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/test_stokes1pdarcy1pvertical.cc index df0db1e15e..a51aeacd04 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/test_stokes1pdarcy1pvertical.cc +++ b/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/test_stokes1pdarcy1pvertical.cc @@ -162,13 +162,13 @@ int main(int argc, char** argv) try const auto darcyName = getParam<std::string>("Problem.Name") + "_" + darcyProblem->name(); StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName); - GET_PROP_TYPE(StokesTypeTag, IOFields)::init(stokesVtkWriter); + GET_PROP_TYPE(StokesTypeTag, IOFields)::initOutputModule(stokesVtkWriter); stokesVtkWriter.write(0.0); VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName); using DarcyVelocityOutput = typename GET_PROP_TYPE(DarcyTypeTag, VelocityOutput); darcyVtkWriter.addVelocityOutput(std::make_shared<DarcyVelocityOutput>(*darcyGridVariables)); - GET_PROP_TYPE(DarcyTypeTag, IOFields)::init(darcyVtkWriter); + GET_PROP_TYPE(DarcyTypeTag, IOFields)::initOutputModule(darcyVtkWriter); darcyVtkWriter.write(0.0); // the assembler for a stationary problem diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.cc b/test/multidomain/boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.cc index c4f6802ba7..9d6712d2b6 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.cc +++ b/test/multidomain/boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.cc @@ -211,13 +211,13 @@ int main(int argc, char** argv) try const auto darcyName = getParam<std::string>("Problem.Name") + "_" + darcyProblem->name(); StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName); - GET_PROP_TYPE(StokesTypeTag, IOFields)::init(stokesVtkWriter); + GET_PROP_TYPE(StokesTypeTag, IOFields)::initOutputModule(stokesVtkWriter); stokesVtkWriter.write(0.0); VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName); using DarcyVelocityOutput = typename GET_PROP_TYPE(DarcyTypeTag, VelocityOutput); darcyVtkWriter.addVelocityOutput(std::make_shared<DarcyVelocityOutput>(*darcyGridVariables)); - GET_PROP_TYPE(DarcyTypeTag, IOFields)::init(darcyVtkWriter); + GET_PROP_TYPE(DarcyTypeTag, IOFields)::initOutputModule(darcyVtkWriter); darcyVtkWriter.write(0.0); // instantiate time loop diff --git a/test/multidomain/embedded/1d3d/1p2c_richards2c/test_1p2c_richards2c.cc b/test/multidomain/embedded/1d3d/1p2c_richards2c/test_1p2c_richards2c.cc index ef171f63e2..4ad2895076 100644 --- a/test/multidomain/embedded/1d3d/1p2c_richards2c/test_1p2c_richards2c.cc +++ b/test/multidomain/embedded/1d3d/1p2c_richards2c/test_1p2c_richards2c.cc @@ -350,13 +350,13 @@ int main(int argc, char** argv) try // intialize the vtk output module using BulkSolutionVector = std::decay_t<decltype(sol[bulkIdx])>; VtkOutputModule<BulkGridVariables, BulkSolutionVector> bulkVtkWriter(*bulkGridVariables, sol[bulkIdx], bulkProblem->name()); - GET_PROP_TYPE(BulkTypeTag, IOFields)::init(bulkVtkWriter); + GET_PROP_TYPE(BulkTypeTag, IOFields)::initOutputModule(bulkVtkWriter); bulkVtkWriter.write(0.0); using LowDimSolutionVector = std::decay_t<decltype(sol[lowDimIdx])>; VtkOutputModule<LowDimGridVariables, LowDimSolutionVector> lowDimVtkWriter(*lowDimGridVariables, sol[lowDimIdx], lowDimProblem->name()); - GET_PROP_TYPE(LowDimTypeTag, IOFields)::init(lowDimVtkWriter); - lowDimProblem->addIOFields(lowDimVtkWriter); + GET_PROP_TYPE(LowDimTypeTag, IOFields)::initOutputModule(lowDimVtkWriter); + lowDimProblem->addVtkOutputFields(lowDimVtkWriter); lowDimVtkWriter.write(0.0); // instantiate time loop diff --git a/test/multidomain/embedded/1d3d/1p_1p/test_1p_1p.cc b/test/multidomain/embedded/1d3d/1p_1p/test_1p_1p.cc index 0cdc8bb92d..93e29f7992 100644 --- a/test/multidomain/embedded/1d3d/1p_1p/test_1p_1p.cc +++ b/test/multidomain/embedded/1d3d/1p_1p/test_1p_1p.cc @@ -161,14 +161,14 @@ int main(int argc, char** argv) try // intialize the vtk output module using BulkSolutionVector = std::decay_t<decltype(sol[bulkIdx])>; VtkOutputModule<BulkGridVariables, BulkSolutionVector> bulkVtkWriter(*bulkGridVariables, sol[bulkIdx], bulkProblem->name()); - GET_PROP_TYPE(BulkTypeTag, IOFields)::init(bulkVtkWriter); - bulkProblem->addIOFields(bulkVtkWriter); + GET_PROP_TYPE(BulkTypeTag, IOFields)::initOutputModule(bulkVtkWriter); + bulkProblem->addVtkOutputFields(bulkVtkWriter); bulkVtkWriter.write(0.0); using LowDimSolutionVector = std::decay_t<decltype(sol[lowDimIdx])>; VtkOutputModule<LowDimGridVariables, LowDimSolutionVector> lowDimVtkWriter(*lowDimGridVariables, sol[lowDimIdx], lowDimProblem->name()); - GET_PROP_TYPE(LowDimTypeTag, IOFields)::init(lowDimVtkWriter); - lowDimProblem->addIOFields(lowDimVtkWriter); + GET_PROP_TYPE(LowDimTypeTag, IOFields)::initOutputModule(lowDimVtkWriter); + lowDimProblem->addVtkOutputFields(lowDimVtkWriter); lowDimVtkWriter.write(0.0); // an output file for the L2-norm diff --git a/test/multidomain/embedded/1d3d/1p_richards/test_1p_richards.cc b/test/multidomain/embedded/1d3d/1p_richards/test_1p_richards.cc index ce3f48c7ce..f224443224 100644 --- a/test/multidomain/embedded/1d3d/1p_richards/test_1p_richards.cc +++ b/test/multidomain/embedded/1d3d/1p_richards/test_1p_richards.cc @@ -167,13 +167,13 @@ int main(int argc, char** argv) try // intialize the vtk output module using BulkSolutionVector = std::decay_t<decltype(sol[bulkIdx])>; VtkOutputModule<BulkGridVariables, BulkSolutionVector> bulkVtkWriter(*bulkGridVariables, sol[bulkIdx], bulkProblem->name()); - GET_PROP_TYPE(BulkTypeTag, IOFields)::init(bulkVtkWriter); + GET_PROP_TYPE(BulkTypeTag, IOFields)::initOutputModule(bulkVtkWriter); bulkVtkWriter.write(0.0); using LowDimSolutionVector = std::decay_t<decltype(sol[lowDimIdx])>; VtkOutputModule<LowDimGridVariables, LowDimSolutionVector> lowDimVtkWriter(*lowDimGridVariables, sol[lowDimIdx], lowDimProblem->name()); - GET_PROP_TYPE(LowDimTypeTag, IOFields)::init(lowDimVtkWriter); - lowDimProblem->addIOFields(lowDimVtkWriter); + GET_PROP_TYPE(LowDimTypeTag, IOFields)::initOutputModule(lowDimVtkWriter); + lowDimProblem->addVtkOutputFields(lowDimVtkWriter); lowDimVtkWriter.write(0.0); // instantiate time loop diff --git a/test/multidomain/embedded/2d3d/1p_1p/test_1p_1p.cc b/test/multidomain/embedded/2d3d/1p_1p/test_1p_1p.cc index 6fb6f05843..89cd00a390 100644 --- a/test/multidomain/embedded/2d3d/1p_1p/test_1p_1p.cc +++ b/test/multidomain/embedded/2d3d/1p_1p/test_1p_1p.cc @@ -211,12 +211,12 @@ int main(int argc, char** argv) try // intialize the vtk output module using BulkSolutionVector = std::decay_t<decltype(sol[bulkIdx])>; VtkOutputModule<BulkGridVariables, BulkSolutionVector> bulkVtkWriter(*bulkGridVariables, sol[bulkIdx], bulkProblem->name()); - GET_PROP_TYPE(BulkTypeTag, IOFields)::init(bulkVtkWriter); + GET_PROP_TYPE(BulkTypeTag, IOFields)::initOutputModule(bulkVtkWriter); bulkVtkWriter.write(0.0); using LowDimSolutionVector = std::decay_t<decltype(sol[lowDimIdx])>; VtkOutputModule<LowDimGridVariables, LowDimSolutionVector> lowDimVtkWriter(*lowDimGridVariables, sol[lowDimIdx], lowDimProblem->name()); - GET_PROP_TYPE(LowDimTypeTag, IOFields)::init(lowDimVtkWriter); + GET_PROP_TYPE(LowDimTypeTag, IOFields)::initOutputModule(lowDimVtkWriter); lowDimVtkWriter.write(0.0); // the assembler with time loop for instationary problem diff --git a/test/multidomain/facet/1p_1p/analytical/test_facetcoupling_fv_1p1p.cc b/test/multidomain/facet/1p_1p/analytical/test_facetcoupling_fv_1p1p.cc index 6e6d22a9f3..39490ae7dc 100644 --- a/test/multidomain/facet/1p_1p/analytical/test_facetcoupling_fv_1p1p.cc +++ b/test/multidomain/facet/1p_1p/analytical/test_facetcoupling_fv_1p1p.cc @@ -283,8 +283,8 @@ int main(int argc, char** argv) try { using BulkIOFields = typename GET_PROP_TYPE(BulkProblemTypeTag, IOFields); using LowDimIOFields = typename GET_PROP_TYPE(LowDimProblemTypeTag, IOFields); - BulkIOFields::init(bulkVtkWriter); - LowDimIOFields::init(lowDimVtkWriter); + BulkIOFields::initOutputModule(bulkVtkWriter); + LowDimIOFields::initOutputModule(lowDimVtkWriter); bulkExact.resize(bulkFvGridGeometry->numDofs()); lowDimExact.resize(lowDimFvGridGeometry->numDofs()); diff --git a/test/multidomain/facet/1p_1p/threedomain/test_facetcoupling_tpfa_1p1p_threedomain.cc b/test/multidomain/facet/1p_1p/threedomain/test_facetcoupling_tpfa_1p1p_threedomain.cc index d755f44b0b..fe8edaccf1 100644 --- a/test/multidomain/facet/1p_1p/threedomain/test_facetcoupling_tpfa_1p1p_threedomain.cc +++ b/test/multidomain/facet/1p_1p/threedomain/test_facetcoupling_tpfa_1p1p_threedomain.cc @@ -186,9 +186,9 @@ int main(int argc, char** argv) try using BulkIOFields = typename GET_PROP_TYPE(BulkProblemTypeTag, IOFields); using FacetIOFields = typename GET_PROP_TYPE(FacetProblemTypeTag, IOFields); using EdgeIOFields = typename GET_PROP_TYPE(EdgeProblemTypeTag, IOFields); - BulkIOFields::init(bulkVtkWriter); - FacetIOFields::init(facetVtkWriter); - EdgeIOFields::init(edgeVtkWriter); + BulkIOFields::initOutputModule(bulkVtkWriter); + FacetIOFields::initOutputModule(facetVtkWriter); + EdgeIOFields::initOutputModule(edgeVtkWriter); bulkVtkWriter.write(0.0); facetVtkWriter.write(0.0); edgeVtkWriter.write(0.0); diff --git a/test/porousmediumflow/1p/implicit/periodicbc/test_1pfv.cc b/test/porousmediumflow/1p/implicit/periodicbc/test_1pfv.cc index 5402c046e0..160f8afe73 100644 --- a/test/porousmediumflow/1p/implicit/periodicbc/test_1pfv.cc +++ b/test/porousmediumflow/1p/implicit/periodicbc/test_1pfv.cc @@ -103,7 +103,7 @@ int main(int argc, char** argv) try // intialize the vtk output module VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name()); using IOFields = typename GET_PROP_TYPE(TypeTag, IOFields); - IOFields::init(vtkWriter); //!< Add model specific output fields + IOFields::initOutputModule(vtkWriter); //!< Add model specific output fields vtkWriter.write(0.0); // make assemble and attach linear system -- GitLab