From 0d013e45b700a7255485b08ad6cc6953e2229cbe Mon Sep 17 00:00:00 2001 From: Ivan Buntic Date: Fri, 17 Sep 2021 15:01:53 +0200 Subject: [PATCH] [disc][io] Use discretization tag instead of enum for comparisons. --- dumux/io/loadsolution.hh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dumux/io/loadsolution.hh b/dumux/io/loadsolution.hh index cdf9ad60c7..0a022cdc3b 100644 --- a/dumux/io/loadsolution.hh +++ b/dumux/io/loadsolution.hh @@ -151,7 +151,7 @@ auto loadSolutionFromVtkFile(SolutionVector& sol, } } // for staggered face data (which is written out as VTK point data) we just read in the vector - else if (dataType == VTKReader::DataType::pointData && GridGeometry::discMethod == DiscretizationMethod::staggered) + else if (dataType == VTKReader::DataType::pointData && GridGeometry::discMethod == DiscretizationMethods::staggered) { if (sol.size() != vec.size()) DUNE_THROW(Dune::InvalidStateException, "Solution size (" << sol.size() << ") does not match input size (" << vec.size() << ")!"); @@ -333,19 +333,19 @@ void loadSolution(SolutionVector& sol, const GridGeometry& gridGeometry) { const auto extension = fileName.substr(fileName.find_last_of(".") + 1); - auto dataType = GridGeometry::discMethod == DiscretizationMethod::box ? + auto dataType = GridGeometry::discMethod == DiscretizationMethods::box ? VTKReader::DataType::pointData : VTKReader::DataType::cellData; if (extension == "vtu" || extension == "vtp") { - if (GridGeometry::discMethod == DiscretizationMethod::staggered && extension == "vtp") + if (GridGeometry::discMethod == DiscretizationMethods::staggered && extension == "vtp") dataType = VTKReader::DataType::pointData; loadSolutionFromVtkFile(sol, fileName, targetPvNameFunc, gridGeometry, dataType); } else if (extension == "pvtu" || extension == "pvtp") { - if (GridGeometry::discMethod == DiscretizationMethod::staggered) + if (GridGeometry::discMethod == DiscretizationMethods::staggered) DUNE_THROW(Dune::NotImplemented, "reading staggered solution from a parallel vtk file"); loadSolutionFromVtkFile(sol, fileName, targetPvNameFunc, gridGeometry, dataType); -- GitLab