Commit d049f08b authored by Hanchuan Wu's avatar Hanchuan Wu
Browse files

Merge branch 'feature/remove-deprecatiieldtypeon-warning-from-f' into 'master'

Remove deprecation warning from Vtk::FieldType

Closes #1053

See merge request !2716

(cherry picked from commit fe076627)

19f53505 [cleannup] Remove deprecate warnings from FieldType
parent ad88e3cf
Pipeline #6096 passed with stages
......@@ -36,13 +36,13 @@ public:
template <class OutputModule>
static void initOutputModule(OutputModule& out)
{
out.addField(out.problem().gridGeometry().coordinationNumber(), "coordinationNumber", OutputModule::FieldType::vertex);
out.addField(out.problem().gridGeometry().coordinationNumber(), "coordinationNumber", Vtk::FieldType::vertex);
out.addField(out.problem().gridGeometry().poreLabel(), "poreLabel", OutputModule::FieldType::vertex);
out.addField(out.problem().gridGeometry().poreLabel(), "poreLabel", Vtk::FieldType::vertex);
out.addVolumeVariable([](const auto& volVars){ return volVars.poreInscribedRadius(); }, "poreInscribedRadius");
out.addField(out.problem().gridGeometry().throatLabel(), "throatLabel", OutputModule::FieldType::element);
out.addField(out.problem().gridGeometry().throatLabel(), "throatLabel", Vtk::FieldType::element);
out.addFluxVariable([](const auto& fluxVars, const auto& fluxVarsCache)
{ return fluxVarsCache.throatInscribedRadius(); }, "throatInscribedRadius");
......
......@@ -70,7 +70,7 @@ public:
throatFluxDataInfo_.push_back(ThroatFluxDataInfo{f, name});
const auto numElems = problem().gridGeometry().gridView().size(0);
throatFluxData_.push_back(std::vector<Scalar>(numElems));
ParentType::addField(throatFluxData_.back(), throatFluxDataInfo_.back().name, ParentType::FieldType::element);
ParentType::addField(throatFluxData_.back(), throatFluxDataInfo_.back().name, Vtk::FieldType::element);
}
//! Gather and process all required data and write them to a vtk file.
......
......@@ -101,9 +101,9 @@ int main(int argc, char** argv) try
using VtkWriter = PoreNetwork::VtkOutputModule<GridVariables, GetPropType<TypeTag, Properties::FluxVariables>, SolutionVector>;
VtkWriter vtkWriter(*gridVariables, x, problem->name());
VtkOutputFields::initOutputModule(vtkWriter);
vtkWriter.addField(gridGeometry->poreVolume(), "poreVolume", VtkWriter::FieldType::vertex);
vtkWriter.addField(gridGeometry->throatShapeFactor(), "throatShapeFactor", VtkWriter::FieldType::element);
vtkWriter.addField(gridGeometry->throatCrossSectionalArea(), "throatCrossSectionalArea", VtkWriter::FieldType::element);
vtkWriter.addField(gridGeometry->poreVolume(), "poreVolume", Vtk::FieldType::vertex);
vtkWriter.addField(gridGeometry->throatShapeFactor(), "throatShapeFactor", Vtk::FieldType::element);
vtkWriter.addField(gridGeometry->throatCrossSectionalArea(), "throatCrossSectionalArea", Vtk::FieldType::element);
// ### Instantiate the solver
// We use the `LinearPDESolver` class, which is instantiated on the basis
......
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