Skip to content
Snippets Groups Projects
Commit d58a9613 authored by Christoph Schwarzmeier's avatar Christoph Schwarzmeier
Browse files

Merge branch 'FixTaylorBubble' into 'master'

[BugFix] Wrong usage of size_t

Closes #202

See merge request walberla/walberla!587
parents f6b8ea9f d3874add
No related merge requests found
Pipeline #50564 canceled with stages
in 9 seconds
...@@ -56,6 +56,7 @@ void addVTKOutput(const std::weak_ptr< StructuredBlockForest >& blockForestPtr, ...@@ -56,6 +56,7 @@ void addVTKOutput(const std::weak_ptr< StructuredBlockForest >& blockForestPtr,
const BlockDataID& forceDensityFieldID, const BlockDataID& curvatureFieldID, const BlockDataID& forceDensityFieldID, const BlockDataID& curvatureFieldID,
const BlockDataID& normalFieldID, const BlockDataID& obstacleNormalFieldID) const BlockDataID& normalFieldID, const BlockDataID& obstacleNormalFieldID)
{ {
using value_type = typename FlagField_T::value_type;
const auto blockForest = blockForestPtr.lock(); const auto blockForest = blockForestPtr.lock();
WALBERLA_CHECK_NOT_NULLPTR(blockForest); WALBERLA_CHECK_NOT_NULLPTR(blockForest);
...@@ -98,17 +99,17 @@ void addVTKOutput(const std::weak_ptr< StructuredBlockForest >& blockForestPtr, ...@@ -98,17 +99,17 @@ void addVTKOutput(const std::weak_ptr< StructuredBlockForest >& blockForestPtr,
// map flagIDs to integer values // map flagIDs to integer values
const auto flagMapper = const auto flagMapper =
std::make_shared< field::FlagFieldMapping< FlagField_T, walberla::uint_t > >(flagFieldID, "mapped_flag"); std::make_shared< field::FlagFieldMapping< FlagField_T, value_type > >(flagFieldID, "mapped_flag");
flagMapper->addMapping(flagIDs::liquidFlagID, uint_c(1)); flagMapper->addMapping(flagIDs::liquidFlagID, numeric_cast<value_type>(1));
flagMapper->addMapping(flagIDs::interfaceFlagID, uint_c(2)); flagMapper->addMapping(flagIDs::interfaceFlagID, numeric_cast<value_type>(2));
flagMapper->addMapping(flagIDs::gasFlagID, uint_c(3)); flagMapper->addMapping(flagIDs::gasFlagID, numeric_cast<value_type>(3));
flagMapper->addMapping(FreeSurfaceBoundaryHandling_T::noSlipFlagID, uint_c(4)); flagMapper->addMapping(FreeSurfaceBoundaryHandling_T::noSlipFlagID, numeric_cast<value_type>(4));
flagMapper->addMapping(FreeSurfaceBoundaryHandling_T::freeSlipFlagID, uint_c(6)); flagMapper->addMapping(FreeSurfaceBoundaryHandling_T::freeSlipFlagID, numeric_cast<value_type>(6));
flagMapper->addMapping(FreeSurfaceBoundaryHandling_T::ubbFlagID, uint_c(6)); flagMapper->addMapping(FreeSurfaceBoundaryHandling_T::ubbFlagID, numeric_cast<value_type>(6));
flagMapper->addMapping(FreeSurfaceBoundaryHandling_T::ubbInflowFlagID, uint_c(7)); flagMapper->addMapping(FreeSurfaceBoundaryHandling_T::ubbInflowFlagID, numeric_cast<value_type>(7));
flagMapper->addMapping(FreeSurfaceBoundaryHandling_T::pressureFlagID, uint_c(8)); flagMapper->addMapping(FreeSurfaceBoundaryHandling_T::pressureFlagID, numeric_cast<value_type>(8));
flagMapper->addMapping(FreeSurfaceBoundaryHandling_T::pressureOutflowFlagID, uint_c(9)); flagMapper->addMapping(FreeSurfaceBoundaryHandling_T::pressureOutflowFlagID, numeric_cast<value_type>(9));
flagMapper->addMapping(FreeSurfaceBoundaryHandling_T::outletFlagID, uint_c(10)); flagMapper->addMapping(FreeSurfaceBoundaryHandling_T::outletFlagID, numeric_cast<value_type>(10));
writers.push_back(flagMapper); writers.push_back(flagMapper);
......
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