Commit 480583d8 authored by Bernd Flemisch's avatar Bernd Flemisch Committed by Kilian Weishaupt
Browse files

[io][test] use initOutputModule instead of deprecated init

parent 3d903929
......@@ -147,7 +147,7 @@ int main(int argc, char** argv) try
using IOFields = typename GET_PROP_TYPE(TypeTag, IOFields);
using VtkOutputModule = Dumux::VtkOutputModule<GridVariables, SolutionVector>;
VtkOutputModule vtkWriter(*gridVariables, x, problem->name());
IOFields::init(vtkWriter);
IOFields::initOutputModule(vtkWriter);
// also, add exact solution to the output
SolutionVector xExact(fvGridGeometry->numDofs());
......
......@@ -114,7 +114,7 @@ int main(int argc, char** argv) try
using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables));
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);
// instantiate time loop
......
......@@ -104,7 +104,7 @@ int main(int argc, char** argv) try
VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables));
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
......
......@@ -102,7 +102,7 @@ int main(int argc, char** argv) try
using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables));
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
......
......@@ -111,7 +111,7 @@ int main(int argc, char** argv) try
VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables));
IOFields::init(vtkWriter); //!< Add model specific output fields
IOFields::initOutputModule(vtkWriter); //!< Add model specific output fields
vtkWriter.write(0.0);
// instantiate time loop
......
......@@ -111,7 +111,7 @@ int main(int argc, char** argv) try
VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables));
IOFields::init(vtkWriter); //!< Add model specific output fields
IOFields::initOutputModule(vtkWriter); //!< Add model specific output fields
vtkWriter.write(0.0);
// instantiate time loop
......
......@@ -141,7 +141,7 @@ int main(int argc, char** argv) try
VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables));
IOFields::init(vtkWriter); //!< Add model specific output fields
IOFields::initOutputModule(vtkWriter); //!< Add model specific output fields
// if we are using a random permeability field with gstat
bool isRandomField = getParam<bool>("SpatialParams.RandomField", false);
......
......@@ -135,7 +135,7 @@ int main(int argc, char** argv) try
VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables));
IOFields::init(vtkWriter); //!< Add model specific output fields
IOFields::initOutputModule(vtkWriter); //!< Add model specific output fields
vtkWriter.write(0.0);
// instantiate time loop
......
......@@ -135,7 +135,7 @@ int main(int argc, char** argv) try
VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables));
IOFields::init(vtkWriter); //!< Add model specific output fields
IOFields::initOutputModule(vtkWriter); //!< Add model specific output fields
vtkWriter.write(0.0);
// instantiate time loop
......
......@@ -149,7 +149,7 @@ int main(int argc, char** argv) try
VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables));
IOFields::init(vtkWriter); //!< Add model specific output fields
IOFields::initOutputModule(vtkWriter); //!< Add model specific output fields
vtkWriter.addField(problem->getExactTemperature(), "temperatureExact");
vtkWriter.write(restartTime);
......
......@@ -115,7 +115,7 @@ int main(int argc, char** argv) try
using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables));
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);
// instantiate time loop
......
......@@ -114,7 +114,7 @@ int main(int argc, char** argv) try
using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables));
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->getExactTemperature(), "temperatureExact");
vtkWriter.write(0.0);
// output every vtkOutputInterval time step
......
......@@ -114,7 +114,7 @@ int main(int argc, char** argv) try
using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables));
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->getExactTemperature(), "temperatureExact");
vtkWriter.write(0.0);
// output every vtkOutputInterval time step
......
......@@ -138,7 +138,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);
IOFields::initOutputModule(vtkWriter);
// Add model specific output fields
vtkWriter.addField(problem->getPerm(), "permeability");
......
......@@ -187,7 +187,7 @@ int main(int argc, char** argv) try
VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables));
IOFields::init(vtkWriter); //!< Add model specific output fields
IOFields::initOutputModule(vtkWriter); //!< Add model specific output fields
vtkWriter.write(0.0);
// instantiate time loop
......
......@@ -150,7 +150,7 @@ int main(int argc, char** argv) try
using VtkOutputModule = BoxDfmVtkOutputModule<GridVariables, SolutionVector, FractureGrid>;
using IOFields = typename GET_PROP_TYPE(TypeTag, IOFields);
VtkOutputModule vtkWriter(*gridVariables, x, problem->name(), fractureGridAdapter, "", Dune::VTK::nonconforming);
IOFields::init(vtkWriter); //!< Add model specific output fields
IOFields::initOutputModule(vtkWriter); //!< Add model specific output fields
vtkWriter.write(0.0);
// instantiate time loop
......
......@@ -151,7 +151,7 @@ int main(int argc, char** argv) try
"", Dune::VTK::conforming);
using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables));
IOFields::init(vtkWriter); //!< Add model specific output fields
IOFields::initOutputModule(vtkWriter); //!< Add model specific output fields
problem->addFieldsToWriter(vtkWriter); //!< Add some more problem dependent fields
vtkWriter.write(0.0);
......
......@@ -124,7 +124,7 @@ int main(int argc, char** argv) try
VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables));
IOFields::init(vtkWriter); //!< Add model specific output fields
IOFields::initOutputModule(vtkWriter); //!< Add model specific output fields
vtkWriter.write(0.0);
// instantiate time loop
......
......@@ -163,7 +163,7 @@ int main(int argc, char** argv) try
ncOutput ? Dune::VTK::nonconforming : Dune::VTK::conforming);
using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables));
IOFields::init(vtkWriter); //!< Add model specific output fields
IOFields::initOutputModule(vtkWriter); //!< Add model specific output fields
vtkWriter.write(restartTime);
// instantiate time loop
......
......@@ -135,7 +135,7 @@ int main(int argc, char** argv) try
VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables));
IOFields::init(vtkWriter); //!< Add model specific output fields
IOFields::initOutputModule(vtkWriter); //!< Add model specific output fields
vtkWriter.write(0.0);
// instantiate time loop
......
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