diff --git a/dumux/freeflow/rans/twoeq/kepsilon/problem.hh b/dumux/freeflow/rans/twoeq/kepsilon/problem.hh
index ef99fbaaff5b669dd065c40a6302efec27f320fe..c1b2bde7a231a22945fe5923c5599bc1c3f52113 100644
--- a/dumux/freeflow/rans/twoeq/kepsilon/problem.hh
+++ b/dumux/freeflow/rans/twoeq/kepsilon/problem.hh
@@ -80,7 +80,6 @@ class KEpsilonProblem : public RANSProblem<TypeTag>
static_assert(cellCenterOffset == ModelTraits::dim(), "cellCenterOffset must equal dim for staggered NavierStokes");
public:
- static constexpr bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
//! The constructor sets the gravity, if desired by the user.
KEpsilonProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry, const std::string& paramGroup = "")
@@ -392,7 +391,7 @@ public:
Scalar schmidtNumber = elemVolVars[scvf.insideScvIdx()].kinematicViscosity()
/ elemVolVars[scvf.insideScvIdx()].diffusionCoefficient(0, compIdx);
- Scalar moleToMassConversionFactor = useMoles
+ Scalar moleToMassConversionFactor = ModelTraits::useMoles()
? 1.0 : FluidSystem::molarMass(compIdx);
wallFunctionFlux[compIdx] +=
-1.0 * (asImp_().dirichlet(element, scvf)[Indices::conti0EqIdx + compIdx]
diff --git a/dumux/multidomain/facet/box/couplingmanager.hh b/dumux/multidomain/facet/box/couplingmanager.hh
index b9e8c3964f1ee9042008100d6638b496467319e9..0e6468f9948d5c46b2a9eed4f88603d00eb4bcd1 100644
--- a/dumux/multidomain/facet/box/couplingmanager.hh
+++ b/dumux/multidomain/facet/box/couplingmanager.hh
@@ -158,9 +158,9 @@ class FacetCouplingManager<MDTraits, CouplingMapper, bulkDomainId, lowDimDomainI
template<bool s = bulkIsSurfaceGrid, std::enable_if_t<s, int> = 0>
void resize(std::size_t numEmbedments)
{
- lowDimContext_.bulkFvGeometries.resize(numEmbedments, nullptr);
- lowDimContext_.bulkElemVolVars.resize(numEmbedments, nullptr);
- lowDimContext_.bulkElemFluxVarsCache.resize(numEmbedments, nullptr);
+ bulkFvGeometries.resize(numEmbedments, nullptr);
+ bulkElemVolVars.resize(numEmbedments, nullptr);
+ bulkElemFluxVarsCache.resize(numEmbedments, nullptr);
bulkElemBcTypes.resize(numEmbedments);
}
diff --git a/dumux/multidomain/privarswitchnewtonsolver.hh b/dumux/multidomain/privarswitchnewtonsolver.hh
index 769307df07922fa973601bda26c65b6d56242b0f..e39477a1513eb1b22283bedad89637277d200cc2 100644
--- a/dumux/multidomain/privarswitchnewtonsolver.hh
+++ b/dumux/multidomain/privarswitchnewtonsolver.hh
@@ -48,12 +48,9 @@ class MultiDomainPriVarSwitchNewtonSolver : public MultiDomainNewtonSolver<Assem
using ParentType = MultiDomainNewtonSolver<Assembler, LinearSolver, CouplingManager, Reassembler, Comm>;
using SolutionVector = typename Assembler::ResidualType;
- using DomainIds = std::make_index_sequence<Assembler::Traits::numSubDomains>;
-
- template<std::size_t id>
- using PrivarSwitchPtr = std::unique_ptr<std::tuple_element_t<id, PrivarSwitchTypeTuple>>;
-
- using PriVarSwitchPtrTuple = typename makeFromIndexedType<std::tuple, PrivarSwitchPtr, DomainIds>::type;
+ template<std::size_t i> using PriVarSwitch = std::tuple_element_t<i, PrivarSwitchTypeTuple>;
+ template<std::size_t i> using PrivarSwitchPtr = std::unique_ptr<PriVarSwitch<i>>;
+ using PriVarSwitchPtrTuple = typename Assembler::Traits::template MakeTuple<PrivarSwitchPtr>;
public:
using ParentType::ParentType;
@@ -83,9 +80,10 @@ public:
switchedInLastIteration_.fill(false);
using namespace Dune::Hybrid;
- forEach(DomainIds{}, [&](auto&& id)
+ forEach(std::make_index_sequence<Assembler::Traits::numSubDomains>{}, [&](auto&& id)
{
- std::get<id>(priVarSwitches_) = std::make_unique<std::tuple_element_t<id, PrivarSwitchTypeTuple>>(u[id].size());
+ using PVSwitch = PriVarSwitch<std::decay_t<decltype(id)>::value>;
+ elementAt(priVarSwitches_, id) = std::make_unique<PVSwitch>(u[id].size());
});
}
@@ -106,12 +104,12 @@ public:
auto& assembler = this->assembler();
using namespace Dune::Hybrid;
- forEach(DomainIds{}, [&](auto&& id)
+ forEach(std::make_index_sequence<Assembler::Traits::numSubDomains>{}, [&](auto&& id)
{
const auto& fvGridGeometry = assembler.fvGridGeometry(id);
const auto& problem = assembler.problem(id);
auto& gridVariables = assembler.gridVariables(id);
- auto& priVarSwitch = std::get<id>(priVarSwitches_);
+ auto& priVarSwitch = elementAt(priVarSwitches_, id);
// invoke the primary variable switch
switchedInLastIteration_[id] = priVarSwitch->update(uCurrentIter[id], gridVariables,
@@ -144,9 +142,9 @@ public:
// free some memory
using namespace Dune::Hybrid;
- forEach(DomainIds{}, [&](auto&& id)
+ forEach(std::make_index_sequence<Assembler::Traits::numSubDomains>{}, [&](auto&& id)
{
- std::get<id>(priVarSwitches_).release();
+ elementAt(priVarSwitches_, id).release();
});
}
diff --git a/dumux/multidomain/subdomainstaggeredlocalassembler.hh b/dumux/multidomain/subdomainstaggeredlocalassembler.hh
index 0baf5dccfa008ac7987057e5c30408da70189eef..908d1334732ac712d23cb6d503fcc92619c35f64 100644
--- a/dumux/multidomain/subdomainstaggeredlocalassembler.hh
+++ b/dumux/multidomain/subdomainstaggeredlocalassembler.hh
@@ -329,17 +329,18 @@ private:
template<class JacobianMatrixRow, class SubSol, class GridVariablesTuple>
auto assembleJacobianAndResidualImpl_(Dune::index_constant<0>, JacobianMatrixRow& jacRow, SubSol& res, GridVariablesTuple& gridVariables)
{
+ auto& gridVariablesI = *std::get<domainId>(gridVariables);
const auto cellCenterGlobalI = problem().fvGridGeometry().elementMapper().index(this->element());
- const auto residual = this->asImp_().assembleCellCenterJacobianAndResidualImpl(jacRow[domainId], *std::get<domainId>(gridVariables));
+ const auto residual = this->asImp_().assembleCellCenterJacobianAndResidualImpl(jacRow[domainId], gridVariablesI);
res[cellCenterGlobalI] = residual;
// for the coupling blocks
using namespace Dune::Hybrid;
- static constexpr auto otherDomainIds = makeIncompleteIntegerSequence<Dune::Hybrid::size(jacRow), domainId>{};
- forEach(otherDomainIds, [&, domainId = domainId](auto&& domainJ)
+ static constexpr auto otherDomainIds = makeIncompleteIntegerSequence<JacobianMatrixRow::size(), domainId>{};
+ forEach(otherDomainIds, [&](auto&& domainJ)
{
- this->asImp_().assembleJacobianCellCenterCoupling(domainJ, jacRow[domainJ], residual, *std::get<domainJ>(gridVariables));
+ this->asImp_().assembleJacobianCellCenterCoupling(domainJ, jacRow[domainJ], residual, gridVariablesI);
});
}
@@ -347,17 +348,18 @@ private:
template<class JacobianMatrixRow, class SubSol, class GridVariablesTuple>
void assembleJacobianAndResidualImpl_(Dune::index_constant<1>, JacobianMatrixRow& jacRow, SubSol& res, GridVariablesTuple& gridVariables)
{
- const auto residual = this->asImp_().assembleFaceJacobianAndResidualImpl(jacRow[domainId], *std::get<domainId>(gridVariables));
+ auto& gridVariablesI = *std::get<domainId>(gridVariables);
+ const auto residual = this->asImp_().assembleFaceJacobianAndResidualImpl(jacRow[domainId], gridVariablesI);
for(auto&& scvf : scvfs(this->fvGeometry()))
res[scvf.dofIndex()] += residual[scvf.localFaceIdx()];
// for the coupling blocks
using namespace Dune::Hybrid;
- static constexpr auto otherDomainIds = makeIncompleteIntegerSequence<Dune::Hybrid::size(jacRow), domainId>{};
- forEach(otherDomainIds, [&, domainId = domainId](auto&& domainJ)
+ static constexpr auto otherDomainIds = makeIncompleteIntegerSequence<JacobianMatrixRow::size(), domainId>{};
+ forEach(otherDomainIds, [&](auto&& domainJ)
{
- this->asImp_().assembleJacobianFaceCoupling(domainJ, jacRow[domainJ], residual, *std::get<domainJ>(gridVariables));
+ this->asImp_().assembleJacobianFaceCoupling(domainJ, jacRow[domainJ], residual, gridVariablesI);
});
}
diff --git a/dumux/porousmediumflow/3p3c/model.hh b/dumux/porousmediumflow/3p3c/model.hh
index 15eb6906601e3e9b4920d8b8cd4491d3cf516d38..0e24f410d6e02184617afb922e98df7eb611686a 100644
--- a/dumux/porousmediumflow/3p3c/model.hh
+++ b/dumux/porousmediumflow/3p3c/model.hh
@@ -128,35 +128,47 @@ struct ThreePThreeCModelTraits
switch (state)
{
case Indices::threePhases:
+ {
const std::vector<std::string> s1 = {"p_g",
"S_w",
"S_n"};
return s1[pvIdx];
+ }
case Indices::wPhaseOnly:
+ {
const std::vector<std::string> s2 = {"p_g",
"x^" + FluidSystem::componentName(FluidSystem::gCompIdx) + "_" + FluidSystem::phaseName(FluidSystem::wPhaseIdx),
"x^" + FluidSystem::componentName(FluidSystem::nCompIdx) + "_" + FluidSystem::phaseName(FluidSystem::wPhaseIdx)};
return s2[pvIdx];
+ }
case Indices::gnPhaseOnly:
+ {
const std::vector<std::string> s3 = {"p_g",
"x^" + FluidSystem::componentName(FluidSystem::wCompIdx) + "_" + FluidSystem::phaseName(FluidSystem::gPhaseIdx),
"S_n"};
return s3[pvIdx];
+ }
case Indices::wnPhaseOnly:
+ {
const std::vector<std::string> s4 = {"p_g",
"x^" + FluidSystem::componentName(FluidSystem::gCompIdx) + "_" + FluidSystem::phaseName(FluidSystem::wPhaseIdx),
"S_n"};
return s4[pvIdx];
+ }
case Indices::gPhaseOnly:
+ {
const std::vector<std::string> s5 = {"p_g",
"x^" + FluidSystem::componentName(FluidSystem::wCompIdx) + "_" + FluidSystem::phaseName(FluidSystem::gPhaseIdx),
"x^" + FluidSystem::componentName(FluidSystem::nCompIdx) + "_" + FluidSystem::phaseName(FluidSystem::gPhaseIdx)};
return s5[pvIdx];
+ }
case Indices::wgPhaseOnly:
+ {
const std::vector<std::string> s6 = {"p_g",
"S_w",
"x^" + FluidSystem::componentName(FluidSystem::nCompIdx) + "_" + FluidSystem::phaseName(FluidSystem::gPhaseIdx)};
return s6[pvIdx];
+ }
}
}
};
diff --git a/dumux/porousmediumflow/3pwateroil/model.hh b/dumux/porousmediumflow/3pwateroil/model.hh
index 557061de497d4a510f044b1f6e187c66aed03d75..b3bdb846cb1742f38c2608e7164eb91de348e844 100644
--- a/dumux/porousmediumflow/3pwateroil/model.hh
+++ b/dumux/porousmediumflow/3pwateroil/model.hh
@@ -118,35 +118,47 @@ struct ThreePWaterOilModelTraits
switch (state)
{
case Indices::threePhases:
+ {
const std::vector<std::string> s1 = {"p_g",
"S_w",
"S_n"};
return s1[pvIdx];
+ }
case Indices::wPhaseOnly:
+ {
const std::vector<std::string> s2 = {"p_w",
"T",
"x^" + FluidSystem::componentName(FluidSystem::nCompIdx) + "_" + FluidSystem::phaseName(FluidSystem::wPhaseIdx)};
return s2[pvIdx];
+ }
case Indices::gnPhaseOnly:
+ {
const std::vector<std::string> s3 = {"p_g",
"S_n",
"x^" + FluidSystem::componentName(FluidSystem::wCompIdx) + "_" + FluidSystem::phaseName(FluidSystem::nPhaseIdx)};
return s3[pvIdx];
+ }
case Indices::wnPhaseOnly:
+ {
const std::vector<std::string> s4 = {"p_w",
"T",
"S_n"};
return s4[pvIdx];
+ }
case Indices::gPhaseOnly:
+ {
const std::vector<std::string> s5 = {"p_g",
"T",
"x^" + FluidSystem::componentName(FluidSystem::nCompIdx) + "_" + FluidSystem::phaseName(FluidSystem::gPhaseIdx)};
return s5[pvIdx];
+ }
case Indices::wgPhaseOnly:
+ {
const std::vector<std::string> s6 = {"p_g",
"S_w",
"x^" + FluidSystem::componentName(FluidSystem::nCompIdx) + "_" + FluidSystem::phaseName(FluidSystem::gPhaseIdx)};
return s6[pvIdx];
+ }
}
}
};
diff --git a/test/freeflow/navierstokes/test_channel.cc b/test/freeflow/navierstokes/test_channel.cc
index 7a087d937c11b34381e8e632324cbc2bfa616b37..4a60f7b56de7010d2e26733b20e7bffe3f5d8437 100644
--- a/test/freeflow/navierstokes/test_channel.cc
+++ b/test/freeflow/navierstokes/test_channel.cc
@@ -150,7 +150,7 @@ int main(int argc, char** argv) try
auto fileNameFace = getParamFromGroup<std::string>("Face", "Restart.File");
loadSolution(x[FVGridGeometry::faceIdx()], fileNameFace,
- ModelTraits::primaryVariableNameFace, *fvGridGeometry);
+ ModelTraits::primaryVariableNameFace<>, *fvGridGeometry);
}
else
problem->applyInitialSolution(x);
diff --git a/test/io/gridmanager/test_gridmanager_subgrid.cc b/test/io/gridmanager/test_gridmanager_subgrid.cc
index 370c2f82cddcc07e83bb0c172ec18b83fbf174ef..64153525af42918b5f6e6c12159f955e83a3e2f3 100644
--- a/test/io/gridmanager/test_gridmanager_subgrid.cc
+++ b/test/io/gridmanager/test_gridmanager_subgrid.cc
@@ -42,7 +42,8 @@ public:
CircleSelector(const GlobalPosition& center) : center_(center) {}
//! Select all elements within a circle around a center point.
- int operator() (const auto& element) const
+ template<class Element>
+ int operator() (const Element& element) const
{
const auto x = element.geometry().center()[0];
const auto y = element.geometry().center()[1];