Commit 7e687785 authored by Katharina Heck's avatar Katharina Heck Committed by Ned Coltman
Browse files

[freeflow] Adapt freeflow models and volvars to new diffusion coeff access

parent 32296f90
......@@ -53,11 +53,11 @@ struct FreeflowNCIOFields
if (j != FluidSystem::getMainComponent(0))
{
out.addVolumeVariable([j](const auto& v){ return v.diffusionCoefficient(0, j); }, "D^" + FluidSystem::componentName(j) + "_" + FluidSystem::phaseName(0));
out.addVolumeVariable([j](const auto& v){ return v.diffusionCoefficient(0,0, j); }, "D^" + FluidSystem::componentName(j) + "_" + FluidSystem::phaseName(0));
// the eddy diffusivity is recalculated for an arbitrary component which is not the phase component
if (turbulenceModel)
out.addVolumeVariable([j](const auto& v){ return v.effectiveDiffusivity(0, j) - v.diffusionCoefficient(0, j); }, "D_t^" + FluidSystem::componentName(j) + "_" + FluidSystem::phaseName(0));
out.addVolumeVariable([j](const auto& v){ return v.effectiveDiffusionCoefficient(0,0, j) - v.diffusionCoefficient(0,0, j); }, "D_t^" + FluidSystem::componentName(j) + "_" + FluidSystem::phaseName(0));
}
}
}
......
......@@ -102,16 +102,19 @@ private:
using FSY = GetPropType<TypeTag, Properties::FluidSystem>;
using FST = GetPropType<TypeTag, Properties::FluidState>;
using MT = GetPropType<TypeTag, Properties::ModelTraits>;
static_assert(FSY::numComponents == MT::numFluidComponents(), "Number of components mismatch between model and fluid system");
static_assert(FST::numComponents == MT::numFluidComponents(), "Number of components mismatch between model and fluid state");
static_assert(FSY::numPhases == MT::numFluidPhases(), "Number of phases mismatch between model and fluid system");
static_assert(FST::numPhases == MT::numFluidPhases(), "Number of phases mismatch between model and fluid state");
using BaseTraits = NavierStokesVolumeVariablesTraits<PV, FSY, FST, MT>;
using DT = GetPropType<TypeTag, Properties::MolecularDiffusionType>;
template<class BaseTraits, class DT>
struct NCTraits : public BaseTraits { using DiffusionType = DT; };
using Traits = NavierStokesVolumeVariablesTraits<PV, FSY, FST, MT>;
using NCVolVars = FreeflowNCVolumeVariables<Traits>;
using NCVolVars = FreeflowNCVolumeVariables<NCTraits<BaseTraits, DT>>;
public:
using type = KEpsilonVolumeVariables<Traits, NCVolVars>;
using type = KEpsilonVolumeVariables<NCTraits<BaseTraits, DT>, NCVolVars>;
};
//! The local residual
......@@ -173,16 +176,18 @@ private:
using FSY = GetPropType<TypeTag, Properties::FluidSystem>;
using FST = GetPropType<TypeTag, Properties::FluidState>;
using MT = GetPropType<TypeTag, Properties::ModelTraits>;
static_assert(FSY::numComponents == MT::numFluidComponents(), "Number of components mismatch between model and fluid system");
static_assert(FST::numComponents == MT::numFluidComponents(), "Number of components mismatch between model and fluid state");
static_assert(FSY::numPhases == MT::numFluidPhases(), "Number of phases mismatch between model and fluid system");
static_assert(FST::numPhases == MT::numFluidPhases(), "Number of phases mismatch between model and fluid state");
using BaseTraits = NavierStokesVolumeVariablesTraits<PV, FSY, FST, MT>;
using Traits = NavierStokesVolumeVariablesTraits<PV, FSY, FST, MT>;
using NCVolVars = FreeflowNCVolumeVariables<Traits>;
using DT = GetPropType<TypeTag, Properties::MolecularDiffusionType>;
template<class BaseTraits, class DT>
struct NCNITraits : public BaseTraits { using DiffusionType = DT; };
using NCNIVolVars = FreeflowNCVolumeVariables<NCNITraits<BaseTraits, DT>>;
public:
using type = KEpsilonVolumeVariables<Traits, NCVolVars>;
using type = KEpsilonVolumeVariables<NCNITraits<BaseTraits, DT>, NCNIVolVars>;
};
//! The local residual
......@@ -215,8 +220,7 @@ public:
using type = FreeflowNonIsothermalIOFields<IsothermalIOFields, true/*turbulenceModel*/>;
};
// \}
} // end namespace Properties
} // end namespace Dumux
#endif
#endif // DUMUX_KEPSILON_NC_MODEL_HH
......@@ -107,16 +107,18 @@ private:
using FSY = GetPropType<TypeTag, Properties::FluidSystem>;
using FST = GetPropType<TypeTag, Properties::FluidState>;
using MT = GetPropType<TypeTag, Properties::ModelTraits>;
static_assert(FSY::numComponents == MT::numFluidComponents(), "Number of components mismatch between model and fluid system");
static_assert(FST::numComponents == MT::numFluidComponents(), "Number of components mismatch between model and fluid state");
static_assert(FSY::numPhases == MT::numFluidPhases(), "Number of phases mismatch between model and fluid system");
static_assert(FST::numPhases == MT::numFluidPhases(), "Number of phases mismatch between model and fluid state");
using BaseTraits = NavierStokesVolumeVariablesTraits<PV, FSY, FST, MT>;
using Traits = NavierStokesVolumeVariablesTraits<PV, FSY, FST, MT>;
using NCVolVars = FreeflowNCVolumeVariables<Traits>;
using DT = GetPropType<TypeTag, Properties::MolecularDiffusionType>;
template<class BaseTraits, class DT>
struct NCTraits : public BaseTraits { using DiffusionType = DT; };
using NCVolVars = FreeflowNCVolumeVariables<NCTraits<BaseTraits, DT>>;
public:
using type = KOmegaVolumeVariables<Traits, NCVolVars>;
using type = KOmegaVolumeVariables<NCTraits<BaseTraits, DT>, NCVolVars>;
};
//! The local residual
......@@ -179,16 +181,18 @@ private:
using FSY = GetPropType<TypeTag, Properties::FluidSystem>;
using FST = GetPropType<TypeTag, Properties::FluidState>;
using MT = GetPropType<TypeTag, Properties::ModelTraits>;
static_assert(FSY::numComponents == MT::numFluidComponents(), "Number of components mismatch between model and fluid system");
static_assert(FST::numComponents == MT::numFluidComponents(), "Number of components mismatch between model and fluid state");
static_assert(FSY::numPhases == MT::numFluidPhases(), "Number of phases mismatch between model and fluid system");
static_assert(FST::numPhases == MT::numFluidPhases(), "Number of phases mismatch between model and fluid state");
using BaseTraits = NavierStokesVolumeVariablesTraits<PV, FSY, FST, MT>;
using Traits = NavierStokesVolumeVariablesTraits<PV, FSY, FST, MT>;
using NCVolVars = FreeflowNCVolumeVariables<Traits>;
using DT = GetPropType<TypeTag, Properties::MolecularDiffusionType>;
template<class BaseTraits, class DT>
struct NCNITraits : public BaseTraits { using DiffusionType = DT; };
using NCNIVolVars = FreeflowNCVolumeVariables<NCNITraits<BaseTraits, DT>>;
public:
using type = KOmegaVolumeVariables<Traits, NCVolVars>;
using type = KOmegaVolumeVariables<NCNITraits<BaseTraits, DT>, NCNIVolVars>;
};
//! The local residual
......@@ -221,8 +225,7 @@ public:
using type = FreeflowNonIsothermalIOFields<IsothermalIOFields, true/*turbulenceModel*/>;
};
// \}
} // end namespace Properties
} // end namespace Dumux
#endif
#endif // DUMUX_KOMEGA_NC_MODEL_HH
......@@ -107,16 +107,19 @@ private:
using FSY = GetPropType<TypeTag, Properties::FluidSystem>;
using FST = GetPropType<TypeTag, Properties::FluidState>;
using MT = GetPropType<TypeTag, Properties::ModelTraits>;
static_assert(FSY::numComponents == MT::numFluidComponents(), "Number of components mismatch between model and fluid system");
static_assert(FST::numComponents == MT::numFluidComponents(), "Number of components mismatch between model and fluid state");
static_assert(FSY::numPhases == MT::numFluidPhases(), "Number of phases mismatch between model and fluid system");
static_assert(FST::numPhases == MT::numFluidPhases(), "Number of phases mismatch between model and fluid state");
using BaseTraits = NavierStokesVolumeVariablesTraits<PV, FSY, FST, MT>;
using DT = GetPropType<TypeTag, Properties::MolecularDiffusionType>;
template<class BaseTraits, class DT>
struct NCTraits : public BaseTraits { using DiffusionType = DT; };
using Traits = NavierStokesVolumeVariablesTraits<PV, FSY, FST, MT>;
using NCVolVars = FreeflowNCVolumeVariables<Traits>;
using NCVolVars = FreeflowNCVolumeVariables<NCTraits<BaseTraits, DT>>;
public:
using type = LowReKEpsilonVolumeVariables<Traits, NCVolVars>;
using type = LowReKEpsilonVolumeVariables<NCTraits<BaseTraits, DT>, NCVolVars>;
};
//! The local residual
......@@ -178,16 +181,18 @@ private:
using FSY = GetPropType<TypeTag, Properties::FluidSystem>;
using FST = GetPropType<TypeTag, Properties::FluidState>;
using MT = GetPropType<TypeTag, Properties::ModelTraits>;
static_assert(FSY::numComponents == MT::numFluidComponents(), "Number of components mismatch between model and fluid system");
static_assert(FST::numComponents == MT::numFluidComponents(), "Number of components mismatch between model and fluid state");
static_assert(FSY::numPhases == MT::numFluidPhases(), "Number of phases mismatch between model and fluid system");
static_assert(FST::numPhases == MT::numFluidPhases(), "Number of phases mismatch between model and fluid state");
using BaseTraits = NavierStokesVolumeVariablesTraits<PV, FSY, FST, MT>;
using Traits = NavierStokesVolumeVariablesTraits<PV, FSY, FST, MT>;
using NCVolVars = FreeflowNCVolumeVariables<Traits>;
using DT = GetPropType<TypeTag, Properties::MolecularDiffusionType>;
template<class BaseTraits, class DT>
struct NCNITraits : public BaseTraits { using DiffusionType = DT; };
using NCNIVolVars = FreeflowNCVolumeVariables<NCNITraits<BaseTraits, DT>>;
public:
using type = LowReKEpsilonVolumeVariables<Traits, NCVolVars>;
using type = LowReKEpsilonVolumeVariables<NCNITraits<BaseTraits, DT>, NCNIVolVars>;
};
//! The local residual
......@@ -220,8 +225,7 @@ public:
using type = FreeflowNonIsothermalIOFields<IsothermalIOFields, true/*turbulenceModel*/>;
};
// \}
} // end namespace Properties
} // end namespace Dumux
#endif
#endif // DUMUX_LOWREKEPSILON_NC_MODEL_HH
......@@ -160,6 +160,10 @@ struct NormalizePressure<TypeTag, TTag::NavierStokesNC> { static constexpr bool
template<class TypeTag>
struct LocalResidual<TypeTag, TTag::NavierStokesNC> { using type = FreeflowNCResidual<TypeTag>; };
//! Use Fick's law for molecular diffusion per default
template<class TypeTag>
struct MolecularDiffusionType<TypeTag, TTag::NavierStokesNC> { using type = FicksLaw<TypeTag>; };
//! Set the volume variables property
template<class TypeTag>
struct VolumeVariables<TypeTag, TTag::NavierStokesNC>
......@@ -169,15 +173,17 @@ private:
using FSY = GetPropType<TypeTag, Properties::FluidSystem>;
using FST = GetPropType<TypeTag, Properties::FluidState>;
using MT = GetPropType<TypeTag, Properties::ModelTraits>;
static_assert(FSY::numComponents == MT::numFluidComponents(), "Number of components mismatch between model and fluid system");
static_assert(FST::numComponents == MT::numFluidComponents(), "Number of components mismatch between model and fluid state");
static_assert(FSY::numPhases == MT::numFluidPhases(), "Number of phases mismatch between model and fluid system");
static_assert(FST::numPhases == MT::numFluidPhases(), "Number of phases mismatch between model and fluid state");
using BaseTraits = NavierStokesVolumeVariablesTraits<PV, FSY, FST, MT>;
using Traits = NavierStokesVolumeVariablesTraits<PV, FSY, FST, MT>;
using DT = GetPropType<TypeTag, Properties::MolecularDiffusionType>;
template<class BaseTraits, class DT>
struct NCTraits : public BaseTraits { using DiffusionType = DT; };
public:
using type = FreeflowNCVolumeVariables<Traits>;
using type = FreeflowNCVolumeVariables<NCTraits<BaseTraits, DT>>;
};
//! The flux variables
......@@ -204,10 +210,6 @@ public:
using type = CompositionalFluidState<Scalar, FluidSystem>;
};
//! Use Fick's law for molecular diffusion per default
template<class TypeTag>
struct MolecularDiffusionType<TypeTag, TTag::NavierStokesNC> { using type = FicksLaw<TypeTag>; };
//////////////////////////////////////////////////////////////////////////
// Property values for non-isothermal multi-component free-flow model
//////////////////////////////////////////////////////////////////////////
......@@ -242,9 +244,7 @@ public:
template<class TypeTag>
struct HeatConductionType<TypeTag, TTag::NavierStokesNCNI> { using type = FouriersLaw<TypeTag>; };
// \}
} // end namespace Properties
} // end namespace Dumux
#endif
#endif // DUMUX_FREEFLOW_NC_MODEL_HH
......@@ -107,16 +107,19 @@ private:
using FSY = GetPropType<TypeTag, Properties::FluidSystem>;
using FST = GetPropType<TypeTag, Properties::FluidState>;
using MT = GetPropType<TypeTag, Properties::ModelTraits>;
static_assert(FSY::numComponents == MT::numFluidComponents(), "Number of components mismatch between model and fluid system");
static_assert(FST::numComponents == MT::numFluidComponents(), "Number of components mismatch between model and fluid state");
static_assert(FSY::numPhases == MT::numFluidPhases(), "Number of phases mismatch between model and fluid system");
static_assert(FST::numPhases == MT::numFluidPhases(), "Number of phases mismatch between model and fluid state");
using BaseTraits = NavierStokesVolumeVariablesTraits<PV, FSY, FST, MT>;
using DT = GetPropType<TypeTag, Properties::MolecularDiffusionType>;
template<class BaseTraits, class DT>
struct NCTraits : public BaseTraits { using DiffusionType = DT; };
using Traits = NavierStokesVolumeVariablesTraits<PV, FSY, FST, MT>;
using NCVolVars = FreeflowNCVolumeVariables<Traits>;
using NCVolVars = FreeflowNCVolumeVariables<NCTraits<BaseTraits, DT>>;
public:
using type = OneEqVolumeVariables<Traits, NCVolVars>;
using type = OneEqVolumeVariables<NCTraits<BaseTraits, DT>, NCVolVars>;
};
//! The local residual
......@@ -178,16 +181,18 @@ private:
using FSY = GetPropType<TypeTag, Properties::FluidSystem>;
using FST = GetPropType<TypeTag, Properties::FluidState>;
using MT = GetPropType<TypeTag, Properties::ModelTraits>;
static_assert(FSY::numComponents == MT::numFluidComponents(), "Number of components mismatch between model and fluid system");
static_assert(FST::numComponents == MT::numFluidComponents(), "Number of components mismatch between model and fluid state");
static_assert(FSY::numPhases == MT::numFluidPhases(), "Number of phases mismatch between model and fluid system");
static_assert(FST::numPhases == MT::numFluidPhases(), "Number of phases mismatch between model and fluid state");
using BaseTraits = NavierStokesVolumeVariablesTraits<PV, FSY, FST, MT>;
using Traits = NavierStokesVolumeVariablesTraits<PV, FSY, FST, MT>;
using NCVolVars = FreeflowNCVolumeVariables<Traits>;
using DT = GetPropType<TypeTag, Properties::MolecularDiffusionType>;
template<class BaseTraits, class DT>
struct NCNITraits : public BaseTraits { using DiffusionType = DT; };
using NCNIVolVars = FreeflowNCVolumeVariables<NCNITraits<BaseTraits, DT>>;
public:
using type = OneEqVolumeVariables<Traits, NCVolVars>;
using type = OneEqVolumeVariables<NCNITraits<BaseTraits, DT>, NCNIVolVars>;
};
//! The local residual
......@@ -220,8 +225,7 @@ public:
using type = FreeflowNonIsothermalIOFields<IsothermalIOFields, true/*turbulenceModel*/>;
};
// \}
} // end namespace Properties
} // end namespace Dumux
#endif
#endif // DUMUX_ONEEQ_NC_MODEL_HH
......@@ -44,6 +44,8 @@ class FreeflowNCVolumeVariables : public FreeFlowVolumeVariables< Traits, Freefl
using Scalar = typename Traits::PrimaryVariables::value_type;
static constexpr bool useMoles = Traits::ModelTraits::useMoles();
static constexpr int numFluidComps = ParentType::numFluidComponents();
using DiffusionCoefficients = typename Traits::DiffusionType::template DiffusionCoefficientsContainer<1, numFluidComps>;
public:
//! export the underlying fluid system
......@@ -75,22 +77,16 @@ public:
typename FluidSystem::ParameterCache paramCache;
paramCache.updateAll(fluidState_);
for (unsigned int compIIdx = 0; compIIdx < ParentType::numFluidComponents(); ++compIIdx)
auto getDiffusionCoefficient = [&](int phaseIdx, int compIIdx, int compJIdx)
{
for (unsigned int compJIdx = 0; compJIdx < ParentType::numFluidComponents(); ++compJIdx)
{
// binary diffusion coefficients
if(compIIdx != compJIdx)
{
diffCoefficient_[compIIdx][compJIdx]
= FluidSystem::binaryDiffusionCoefficient(fluidState_,
paramCache,
0,
compIIdx,
compJIdx);
}
}
}
return FluidSystem::binaryDiffusionCoefficient(this->fluidState_,
paramCache,
0,
compIIdx,
compJIdx);
};
diffCoefficient_.update(getDiffusionCoefficient);
}
/*!
......@@ -253,30 +249,31 @@ public:
Scalar averageMolarMass(const int phaseIdx = 0) const
{ return fluidState_.averageMolarMass(phaseIdx); }
/*!
* \brief Returns the diffusion coefficient \f$\mathrm{[m^2/s]}\f$
*
* \param compIIdx the index of the component which diffusive
* \param compJIdx the index of the component with respect to which compIIdx diffuses
*/
Scalar diffusionCoefficient(int compIIdx, int compJIdx = 0) const
{
/*!
* \brief Returns the diffusion coefficient \f$\mathrm{[m^2/s]}\f$
*
* \param compIIdx the index of the component which diffusive
* \param compJIdx the index of the component with respect to which compIIdx diffuses
*/
[[deprecated("Signature deprecated. Use diffusionCoefficient(phaseIdx, compIIdx, compJIdx)!")]]
Scalar diffusionCoefficient(int compIIdx, int compJIdx = 0) const
{
if (compIIdx == compJIdx)
DUNE_THROW(Dune::InvalidStateException, "Diffusion coefficient called for compIIdx = compJIdx");
return diffCoefficient_[compIIdx][compJIdx];
}
return diffCoefficient_(0, compIIdx, compJIdx);
}
/*!
* \brief Returns the effective diffusion coefficient \f$\mathrm{[m^2/s]}\f$
*
* \param compIIdx the index of the component which diffusive
* \param compJIdx the index of the component with respect to which compIIdx diffuses
*/
Scalar effectiveDiffusivity(int compIIdx, int compJIdx = 0) const
{
return diffusionCoefficient(compIIdx, compJIdx);
}
/*!
* \brief Returns the binary diffusion coefficients for a phase in \f$[m^2/s]\f$.
*/
Scalar diffusionCoefficient(int phaseIdx, int compIIdx, int compJIdx) const
{ return diffCoefficient_(0, compIIdx, compJIdx); }
/*!
* \brief Returns the effective diffusion coefficients for a phase in \f$[m^2/s]\f$.
*/
Scalar effectiveDiffusionCoefficient(int phaseIdx, int compIIdx, int compJIdx) const
{ return diffusionCoefficient(0, compIIdx, compJIdx); }
/*!
* \brief Return the fluid state of the control volume.
......@@ -286,7 +283,8 @@ public:
protected:
FluidState fluidState_;
std::array<std::array<Scalar, ParentType::numFluidComponents()>, ParentType::numFluidComponents()> diffCoefficient_ = {};
// Binary diffusion coefficient
DiffusionCoefficients diffCoefficient_;
};
} // end namespace Dumux
......
......@@ -95,16 +95,19 @@ private:
using FSY = GetPropType<TypeTag, Properties::FluidSystem>;
using FST = GetPropType<TypeTag, Properties::FluidState>;
using MT = GetPropType<TypeTag, Properties::ModelTraits>;
static_assert(FSY::numComponents == MT::numFluidComponents(), "Number of components mismatch between model and fluid system");
static_assert(FST::numComponents == MT::numFluidComponents(), "Number of components mismatch between model and fluid state");
static_assert(FSY::numPhases == MT::numFluidPhases(), "Number of phases mismatch between model and fluid system");
static_assert(FST::numPhases == MT::numFluidPhases(), "Number of phases mismatch between model and fluid state");
using BaseTraits = NavierStokesVolumeVariablesTraits<PV, FSY, FST, MT>;
using DT = GetPropType<TypeTag, Properties::MolecularDiffusionType>;
template<class BaseTraits, class DT>
struct NCTraits : public BaseTraits { using DiffusionType = DT; };
using Traits = NavierStokesVolumeVariablesTraits<PV, FSY, FST, MT>;
using CompositionalVolVars = FreeflowNCVolumeVariables<Traits>;
using NCVolVars = FreeflowNCVolumeVariables<NCTraits<BaseTraits, DT>>;
public:
using type = ZeroEqVolumeVariables<Traits, CompositionalVolVars>;
using type = ZeroEqVolumeVariables<NCTraits<BaseTraits, DT>, NCVolVars>;
};
//! The specific I/O fields
......@@ -146,16 +149,18 @@ private:
using FSY = GetPropType<TypeTag, Properties::FluidSystem>;
using FST = GetPropType<TypeTag, Properties::FluidState>;
using MT = GetPropType<TypeTag, Properties::ModelTraits>;
static_assert(FSY::numComponents == MT::numFluidComponents(), "Number of components mismatch between model and fluid system");
static_assert(FST::numComponents == MT::numFluidComponents(), "Number of components mismatch between model and fluid state");
static_assert(FSY::numPhases == MT::numFluidPhases(), "Number of phases mismatch between model and fluid system");
static_assert(FST::numPhases == MT::numFluidPhases(), "Number of phases mismatch between model and fluid state");
using BaseTraits = NavierStokesVolumeVariablesTraits<PV, FSY, FST, MT>;
using Traits = NavierStokesVolumeVariablesTraits<PV, FSY, FST, MT>;
using NCVolVars = FreeflowNCVolumeVariables<Traits>;
using DT = GetPropType<TypeTag, Properties::MolecularDiffusionType>;
template<class BaseTraits, class DT>
struct NCNITraits : public BaseTraits { using DiffusionType = DT; };
using NCNIVolVars = FreeflowNCVolumeVariables<NCNITraits<BaseTraits, DT>>;
public:
using type = ZeroEqVolumeVariables<Traits, NCVolVars>;
using type = ZeroEqVolumeVariables<NCNITraits<BaseTraits, DT>, NCNIVolVars>;
};
//! The specific I/O fields
......@@ -168,8 +173,7 @@ public:
using type = FreeflowNonIsothermalIOFields<IsothermalIOFields, true/*turbulenceModel*/>;
};
// \}
} // end namespace Properties
} // end namespace Dumux
#endif
#endif // DUMUX_ZEROEQ_NC_MODEL_HH
......@@ -90,8 +90,7 @@
#include "volumevariables.hh"
#include "iofields.hh"
namespace Dumux {
namespace Properties {
namespace Dumux::Properties {
/*!
* \ingroup OneEqModel
......@@ -231,9 +230,6 @@ public:
template<class TypeTag>
struct IOFields<TypeTag, TTag::OneEqNI> { using type = FreeflowNonIsothermalIOFields<OneEqIOFields, true/*turbulenceModel*/>; };
// \}
}
} // end namespace Dumux::Properties
} // end namespace
#endif
#endif // DUMUX_ONEEQ_MODEL_HH
......@@ -218,9 +218,7 @@ public:
template<class TypeTag>
struct IOFields<TypeTag, TTag::KEpsilonNI> { using type = FreeflowNonIsothermalIOFields<KEpsilonIOFields, true/*turbulenceModel*/>; };
// \}
}
} // end properties
} // end namespace
#endif
#endif // DUMUX_KEPSILON_MODEL_HH
......@@ -391,7 +391,7 @@ public:
continue;
Scalar schmidtNumber = elemVolVars[scvf.insideScvIdx()].kinematicViscosity()
/ elemVolVars[scvf.insideScvIdx()].diffusionCoefficient(0, compIdx);
/ elemVolVars[scvf.insideScvIdx()].diffusionCoefficient(0, 0, compIdx);
Scalar moleToMassConversionFactor = ModelTraits::useMoles()
? 1.0 : FluidSystem::molarMass(compIdx);
wallFunctionFlux[compIdx] +=
......
......@@ -224,9 +224,7 @@ public:
template<class TypeTag>
struct IOFields<TypeTag, TTag::KOmegaNI> { using type = FreeflowNonIsothermalIOFields<KOmegaIOFields, true/*turbulenceModel*/>; };
// \}
}
} // end properties
} // end namespace
#endif // DUMUX_KOMEGA_MODEL_HH
......@@ -231,9 +231,7 @@ public:
template<class TypeTag>
struct IOFields<TypeTag, TTag::LowReKEpsilonNI> { using type = FreeflowNonIsothermalIOFields<LowReKEpsilonIOFields, true/*turbulenceModel*/>; };
// \}
}
} // end properties
} // end namespace
#endif
#endif // DUMUX_LOWREKEPSILON_MODEL_HH
......@@ -232,15 +232,10 @@ public:
{ return eddyThermalConductivity_; }
/*!
* \brief Returns the effective diffusion coefficient \f$\mathrm{[m^2/s]}\f$
*
* \param compIIdx the index of the component which diffusive
* \param compJIdx the index of the component with respect to which compIIdx diffuses
* \brief Returns the binary diffusion coefficients for a phase in \f$[m^2/s]\f$.
*/
Scalar effectiveDiffusivity(int compIIdx, int compJIdx) const
{
return NavierStokesParentType::diffusionCoefficient(compIIdx, compJIdx) + eddyDiffusivity();
}
Scalar effectiveDiffusionCoefficient(int phaseIdx, int compIIdx, int compJIdx) const
{ return NavierStokesParentType::diffusionCoefficient(0, compIIdx, compJIdx) + eddyDiffusivity(); }
/*!
* \brief Returns the effective thermal conductivity \f$\mathrm{[W/(m*K)]}\f$
......
......@@ -43,8 +43,7 @@
#include "problem.hh"
#include "volumevariables.hh"
namespace Dumux {
namespace Properties {
namespace Dumux::Properties {
///////////////////////////////////////////////////////////////////////////
// default property values for the isothermal RANS 0-Eq. model
......@@ -145,9 +144,6 @@ public:
using type = ZeroEqVolumeVariables<Traits, NSVolVars>;
};
// \}
}
} // end namespace
} // end namespace Dumux::Properties
#endif // DUMUX_ZEROEQ_MODEL_HH
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