diff --git a/CHANGELOG.md b/CHANGELOG.md
index 995fdd707b1d4547e91f0fb8b35f8ba80a9c4e7f..8b727bebfb4160afa21515317ad19706fb4a29f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -69,15 +69,12 @@ template<class TypeTag>
struct EnableThermalDispersion<TypeTag, TTag::MyTest> { static constexpr bool value = true; };
```
-To determine the type of dispersion tensor, please define the property `DispersionTensorType` within your `properties.hh` header. For example:
+To determine the type of dispersion tensor, please define the property `CompositionalDispersionModel` within your `properties.hh` header. Per default, the `ThermalDispersionModel` is set to the same model as the `CompositionalDispersionModel`, but this can be set specifically as well. For example:
```cpp
template<class TypeTag>
-struct DispersionTensorType<TypeTag, TTag::MyTest> { using type = ScheideggersDispersionTensor<TypeTag>; };
-```
-or
-```cpp
+struct CompositionalDispersionModel<TypeTag, TTag::MyTest> { using type = ScheideggersDispersionTensor<TypeTag>; };
template<class TypeTag>
-struct DispersionTensorType<TypeTag, TTag::MyTest> { using type = FullDispersionTensor<TypeTag>; };
+struct ThermalDispersionModel<TypeTag, TTag::MyTest> { using type = FullDispersionTensor<TypeTag>; };
```
The parameters describing your dispersion tensor can then be included in your `spatialparameters.hh` file, and passed via input parameters. An example of this can be seen in the `test/porousmediumflow/1pnc/dispersion/` folder, and in the `test/porousmediumflow/tracer/constvel/` folders.
diff --git a/dumux/common/deprecated.hh b/dumux/common/deprecated.hh
index 6fa7e99347b5e0560fdc4598afacc00ce64321cd..dd896bb57c9f7c04ea13d92baec016258c52c53e 100644
--- a/dumux/common/deprecated.hh
+++ b/dumux/common/deprecated.hh
@@ -73,8 +73,8 @@ static constexpr bool hasEnableThermalDispersion()
{ return Dune::Std::is_detected<HasEnableThermalDispersionDetector, ModelTraits>::value; }
template<class ModelTraits>
-static constexpr bool hasThermalDispersionTensorType()
-{ return !std::is_same<typename ModelTraits::ThermalDispersionTensorType, int>::value; }
+static constexpr bool hasThermalDispersionModel()
+{ return !std::is_same<typename ModelTraits::ThermalDispersionModel, int>::value; }
template<class SpatialParams, class Element, class Scv, class ElemSol>
using HasNewTemperatureDetector = decltype(std::declval<SpatialParams>().temperature(
diff --git a/dumux/common/properties.hh b/dumux/common/properties.hh
index 40c76a98e909a5cfae45c5eb72776ba4550f7483..2a7d1fdbb015bff26031776f95e4870608b6ae17 100644
--- a/dumux/common/properties.hh
+++ b/dumux/common/properties.hh
@@ -150,9 +150,9 @@ struct SolutionDependentMolecularDiffusion { using type = UndefinedProperty; };
template<class TypeTag, class MyTypeTag>
struct HeatConductionType { using type = UndefinedProperty; }; //!< The type for the calculation of the heat conduction fluxes
template<class TypeTag, class MyTypeTag>
-struct CompositionalDispersionTensorType { using type = UndefinedProperty; }; //!< The type for the calculation of the compositional dispersion tensor
+struct CompositionalDispersionModel { using type = UndefinedProperty; }; //!< The type for the calculation of the compositional dispersion tensor
template<class TypeTag, class MyTypeTag>
-struct ThermalDispersionTensorType { using type = UndefinedProperty; }; //!< The type for the calculation of the thermal dispersion tensor
+struct ThermalDispersionModel { using type = UndefinedProperty; }; //!< The type for the calculation of the thermal dispersion tensor
template<class TypeTag, class MyTypeTag>
struct SolutionDependentHeatConduction { using type = UndefinedProperty; }; //!< specifies if the parameters for the heat conduction fluxes depend on the solution
diff --git a/dumux/flux/box/dispersionflux.hh b/dumux/flux/box/dispersionflux.hh
index cd9a18588882bfe14636e579a28a2402f8c69291..37cfa1ee68d80ecad306775ce20466f97d52190a 100644
--- a/dumux/flux/box/dispersionflux.hh
+++ b/dumux/flux/box/dispersionflux.hh
@@ -118,8 +118,9 @@ public:
{
// collect the dispersion tensor, the fluxVarsCache and the shape values
const auto& dispersionTensor =
- VolumeVariables::CompositionalDispersionTensorType::compositionalDispersionTensor(problem, scvf, fvGeometry,
- elemVolVars, elemFluxVarsCache, phaseIdx, compIdx);
+ VolumeVariables::CompositionalDispersionModel::compositionalDispersionTensor(problem, scvf, fvGeometry,
+ elemVolVars, elemFluxVarsCache,
+ phaseIdx, compIdx);
// the mole/mass fraction gradient
Dune::FieldVector<Scalar, dimWorld> gradX(0.0);
@@ -151,9 +152,9 @@ public:
{
// collect the dispersion tensor
const auto& dispersionTensor =
- ModelTraits::ThermalDispersionTensorType::thermalDispersionTensor(problem, scvf, fvGeometry,
- elemVolVars, elemFluxVarsCache,
- phaseIdx);
+ ModelTraits::ThermalDispersionModel::thermalDispersionTensor(problem, scvf, fvGeometry,
+ elemVolVars, elemFluxVarsCache,
+ phaseIdx);
// compute the temperature gradient with the shape functions
const auto& fluxVarsCache = elemFluxVarsCache[scvf];
Dune::FieldVector<Scalar, GridView::dimensionworld> gradTemp(0.0);
diff --git a/dumux/flux/cctpfa/dispersionflux.hh b/dumux/flux/cctpfa/dispersionflux.hh
index 446394728bb53172f3e78e955465e4843f76ce78..dde3eb414fb8bfddd16c9d0cbc800e2409eef86e 100644
--- a/dumux/flux/cctpfa/dispersionflux.hh
+++ b/dumux/flux/cctpfa/dispersionflux.hh
@@ -118,9 +118,9 @@ public:
for (int compIdx = 0; compIdx < numComponents; compIdx++)
{
const auto& dispersionTensor =
- VolumeVariables::CompositionalDispersionTensorType::compositionalDispersionTensor(problem, scvf, fvGeometry,
- elemVolVars, elemFluxVarsCache,
- phaseIdx, compIdx);
+ VolumeVariables::CompositionalDispersionModel::compositionalDispersionTensor(problem, scvf, fvGeometry,
+ elemVolVars, elemFluxVarsCache,
+ phaseIdx, compIdx);
const auto dij = computeTpfaTransmissibility(scvf, fvGeometry.scv(scvf.insideScvIdx()), dispersionTensor, insideVolVars.extrusionFactor());
const auto xInside = massOrMoleFraction(insideVolVars, referenceSystem, phaseIdx, compIdx);
@@ -152,9 +152,9 @@ public:
const auto& outsideVolVars = elemVolVars[scvf.outsideScvIdx()];
const auto& dispersionTensor =
- ModelTraits::ThermalDispersionTensorType::thermalDispersionTensor(problem, scvf, fvGeometry,
- elemVolVars, elemFluxVarsCache,
- phaseIdx);
+ ModelTraits::ThermalDispersionModel::thermalDispersionTensor(problem, scvf, fvGeometry,
+ elemVolVars, elemFluxVarsCache,
+ phaseIdx);
const auto dij = computeTpfaTransmissibility(scvf, fvGeometry.scv(scvf.insideScvIdx()), dispersionTensor, insideVolVars.extrusionFactor());
// get the inside/outside temperatures
diff --git a/dumux/porenetwork/1pnc/model.hh b/dumux/porenetwork/1pnc/model.hh
index ea5b2db2afe1d4a9b3358f4e61b1333e341d42f0..c42fb3bdb7d0ee8f9986134e3841e792f88726b3 100644
--- a/dumux/porenetwork/1pnc/model.hh
+++ b/dumux/porenetwork/1pnc/model.hh
@@ -158,19 +158,19 @@ private:
static_assert(FST::numPhases == MT::numFluidPhases(), "Number of phases mismatch between model and fluid state");
using BaseTraits = OnePVolumeVariablesTraits<PV, FSY, FST, SSY, SST, PT, MT>;
- using CDTT = GetPropType<TypeTag, Properties::CompositionalDispersionTensorType>;
+ using CDM = GetPropType<TypeTag, Properties::CompositionalDispersionModel>;
using DT = GetPropType<TypeTag, Properties::MolecularDiffusionType>;
using EDM = GetPropType<TypeTag, Properties::EffectiveDiffusivityModel>;
- template<class BaseTraits, class CDTT, class DT, class EDM>
+ template<class BaseTraits, class CDM, class DT, class EDM>
struct NCTraits : public BaseTraits
{
- using CompositionalDispersionTensorType = CDTT;
+ using CompositionalDispersionModel = CDM;
using DiffusionType = DT;
using EffectiveDiffusivityModel = EDM;
};
public:
- using type = PoreNetwork::OnePNCVolumeVariables<NCTraits<BaseTraits, CDTT, DT, EDM>>;
+ using type = PoreNetwork::OnePNCVolumeVariables<NCTraits<BaseTraits, CDM, DT, EDM>>;
};
//!< Set the vtk output fields specific to this model
@@ -216,21 +216,21 @@ private:
static_assert(FST::numPhases == MT::numFluidPhases(), "Number of phases mismatch between model and fluid state");
using BaseTraits = OnePVolumeVariablesTraits<PV, FSY, FST, SSY, SST, PT, MT>;
- using CDTT = GetPropType<TypeTag, Properties::CompositionalDispersionTensorType>;
+ using CDM = GetPropType<TypeTag, Properties::CompositionalDispersionModel>;
using DT = GetPropType<TypeTag, Properties::MolecularDiffusionType>;
using EDM = GetPropType<TypeTag, Properties::EffectiveDiffusivityModel>;
using ETCM = GetPropType< TypeTag, Properties:: ThermalConductivityModel>;
- template<class BaseTraits, class CDTT, class TDTT, class DT, class EDM, class ETCM>
+ template<class BaseTraits, class CDM, class DT, class EDM, class ETCM>
struct NCNITraits : public BaseTraits
{
- using CompositionalDispersionTensorType = CDTT;
+ using CompositionalDispersionModel = CDM;
using DiffusionType = DT;
using EffectiveDiffusivityModel = EDM;
using EffectiveThermalConductivityModel = ETCM;
};
public:
- using type = PoreNetwork::OnePNCVolumeVariables<NCNITraits<BaseTraits, CDTT, TDTT, DT, EDM, ETCM>>;
+ using type = PoreNetwork::OnePNCVolumeVariables<NCNITraits<BaseTraits, CDM, DT, EDM, ETCM>>;
};
template<class TypeTag>
diff --git a/dumux/porousmediumflow/1pnc/model.hh b/dumux/porousmediumflow/1pnc/model.hh
index 003b8814a1d14c851b00ad5fa66300788fdb1925..56620d4e3b5d1a5d318fd53b451ba3640384d462 100644
--- a/dumux/porousmediumflow/1pnc/model.hh
+++ b/dumux/porousmediumflow/1pnc/model.hh
@@ -190,19 +190,19 @@ private:
static_assert(FST::numPhases == MT::numFluidPhases(), "Number of phases mismatch between model and fluid state");
using BaseTraits = OnePVolumeVariablesTraits<PV, FSY, FST, SSY, SST, PT, MT>;
- using CDTT = GetPropType<TypeTag, Properties::CompositionalDispersionTensorType>;
+ using CDM = GetPropType<TypeTag, Properties::CompositionalDispersionModel>;
using DT = GetPropType<TypeTag, Properties::MolecularDiffusionType>;
using EDM = GetPropType<TypeTag, Properties::EffectiveDiffusivityModel>;
- template<class BaseTraits, class CDTT, class DT, class EDM>
+ template<class BaseTraits, class CDM, class DT, class EDM>
struct NCTraits : public BaseTraits
{
- using CompositionalDispersionTensorType = CDTT;
+ using CompositionalDispersionModel = CDM;
using DiffusionType = DT;
using EffectiveDiffusivityModel = EDM;
};
public:
- using type = OnePNCVolumeVariables<NCTraits<BaseTraits, CDTT, DT, EDM>>;
+ using type = OnePNCVolumeVariables<NCTraits<BaseTraits, CDM, DT, EDM>>;
};
//! Set the vtk output fields specific to this model
@@ -228,9 +228,9 @@ struct ModelTraits<TypeTag, TTag::OnePNCNI>
{
private:
using IsothermalTraits = GetPropType<TypeTag, Properties::BaseModelTraits>;
- using TDTT = GetPropType<TypeTag, Properties::ThermalDispersionTensorType>;
+ using TDM = GetPropType<TypeTag, Properties::ThermalDispersionModel>;
public:
- using type = PorousMediumFlowNIModelTraits<IsothermalTraits, TDTT>;
+ using type = PorousMediumFlowNIModelTraits<IsothermalTraits, TDM>;
};
template<class TypeTag>
@@ -250,21 +250,21 @@ private:
static_assert(FST::numPhases == MT::numFluidPhases(), "Number of phases mismatch between model and fluid state");
using BaseTraits = OnePVolumeVariablesTraits<PV, FSY, FST, SSY, SST, PT, MT>;
- using CDTT = GetPropType<TypeTag, Properties::CompositionalDispersionTensorType>;
+ using CDM = GetPropType<TypeTag, Properties::CompositionalDispersionModel>;
using DT = GetPropType<TypeTag, Properties::MolecularDiffusionType>;
using EDM = GetPropType<TypeTag, Properties::EffectiveDiffusivityModel>;
using ETCM = GetPropType< TypeTag, Properties:: ThermalConductivityModel>;
- template<class BaseTraits, class CDTT, class DT, class EDM, class ETCM>
+ template<class BaseTraits, class CDM, class DT, class EDM, class ETCM>
struct NCNITraits : public BaseTraits
{
- using CompositionalDispersionTensorType = CDTT;
+ using CompositionalDispersionModel = CDM;
using DiffusionType = DT;
using EffectiveDiffusivityModel = EDM;
using EffectiveThermalConductivityModel = ETCM;
};
public:
- using type = OnePNCVolumeVariables<NCNITraits<BaseTraits, CDTT, DT, EDM, ETCM>>;
+ using type = OnePNCVolumeVariables<NCNITraits<BaseTraits, CDM, DT, EDM, ETCM>>;
};
} // end namespace Properties
@@ -355,22 +355,22 @@ private:
using PT = typename GetPropType<TypeTag, Properties::SpatialParams>::PermeabilityType;
using BaseTraits = OnePVolumeVariablesTraits<PV, FSY, FST, SSY, SST, PT, MT>;
- using CDTT = GetPropType<TypeTag, Properties::CompositionalDispersionTensorType>;
+ using CDM = GetPropType<TypeTag, Properties::CompositionalDispersionModel>;
using DT = GetPropType<TypeTag, Properties::MolecularDiffusionType>;
using EDM = GetPropType<TypeTag, Properties::EffectiveDiffusivityModel>;
using ETCM = GetPropType< TypeTag, Properties:: ThermalConductivityModel>;
- template<class BaseTraits, class CDTT, class DT, class EDM, class ETCM>
+ template<class BaseTraits, class CDM, class DT, class EDM, class ETCM>
struct NCNITraits : public BaseTraits
{
- using CompositionalDispersionTensorType = CDTT;
+ using CompositionalDispersionModel = CDM;
using DiffusionType = DT;
using EffectiveDiffusivityModel = EDM;
using EffectiveThermalConductivityModel = ETCM;
};
- using EquilibriumVolVars = OnePNCVolumeVariables<NCNITraits<BaseTraits, CDTT, DT, EDM, ETCM>>;
+ using EquilibriumVolVars = OnePNCVolumeVariables<NCNITraits<BaseTraits, CDM, DT, EDM, ETCM>>;
public:
- using type = NonEquilibriumVolumeVariables<NCNITraits<BaseTraits, CDTT, DT, EDM, ETCM>, EquilibriumVolVars>;
+ using type = NonEquilibriumVolumeVariables<NCNITraits<BaseTraits, CDM, DT, EDM, ETCM>, EquilibriumVolVars>;
};
} // end namespace Properties
diff --git a/dumux/porousmediumflow/1pnc/volumevariables.hh b/dumux/porousmediumflow/1pnc/volumevariables.hh
index 61c6ccf863374dc20e4d78bbe8fa8c37f9a4eb28..380fcccebf05b6eda05ee14b0a755dc70228fba3 100644
--- a/dumux/porousmediumflow/1pnc/volumevariables.hh
+++ b/dumux/porousmediumflow/1pnc/volumevariables.hh
@@ -65,7 +65,7 @@ class OnePNCVolumeVariables
public:
//! Export the compositional dispersion tensor law
- using CompositionalDispersionTensorType = typename Traits::CompositionalDispersionTensorType;
+ using CompositionalDispersionModel = typename Traits::CompositionalDispersionModel;
//! Export fluid state type
using FluidState = typename Traits::FluidState;
//! Export fluid system type
diff --git a/dumux/porousmediumflow/1pncmin/model.hh b/dumux/porousmediumflow/1pncmin/model.hh
index 9560a531b687aff605153be7bfe792381793e812..0db57078fc8724324726532656b1ad46f24f7d79 100644
--- a/dumux/porousmediumflow/1pncmin/model.hh
+++ b/dumux/porousmediumflow/1pncmin/model.hh
@@ -115,20 +115,20 @@ private:
static_assert(FST::numPhases == MT::numFluidPhases(), "Number of phases mismatch between model and fluid state");
using BaseTraits = OnePVolumeVariablesTraits<PV, FSY, FST, SSY, SST, PT, MT>;
- using CDTT = GetPropType<TypeTag, Properties::CompositionalDispersionTensorType>;
+ using CDM = GetPropType<TypeTag, Properties::CompositionalDispersionModel>;
using DT = GetPropType<TypeTag, Properties::MolecularDiffusionType>;
using EDM = GetPropType<TypeTag, Properties::EffectiveDiffusivityModel>;
- template<class BaseTraits, class CDTT, class DT, class EDM>
+ template<class BaseTraits, class CDM, class DT, class EDM>
struct NCTraits : public BaseTraits
{
- using CompositionalDispersionTensorType = CDTT;
+ using CompositionalDispersionModel = CDM;
using DiffusionType = DT;
using EffectiveDiffusivityModel = EDM;
};
- using NonMinVolVars = OnePNCVolumeVariables<NCTraits<BaseTraits, CDTT, DT, EDM>>;
+ using NonMinVolVars = OnePNCVolumeVariables<NCTraits<BaseTraits, CDM, DT, EDM>>;
public:
- using type = MineralizationVolumeVariables<NCTraits<BaseTraits, CDTT, DT, EDM>, NonMinVolVars>;
+ using type = MineralizationVolumeVariables<NCTraits<BaseTraits, CDM, DT, EDM>, NonMinVolVars>;
};
// Use the mineralization local residual
@@ -203,21 +203,21 @@ private:
static_assert(FST::numPhases == MT::numFluidPhases(), "Number of phases mismatch between model and fluid state");
using BaseTraits = OnePVolumeVariablesTraits<PV, FSY, FST, SSY, SST, PT, MT>;
- using CDTT = GetPropType<TypeTag, Properties::CompositionalDispersionTensorType>;
+ using CDM = GetPropType<TypeTag, Properties::CompositionalDispersionModel>;
using DT = GetPropType<TypeTag, Properties::MolecularDiffusionType>;
using EDM = GetPropType<TypeTag, Properties::EffectiveDiffusivityModel>;
using ETCM = GetPropType< TypeTag, Properties:: ThermalConductivityModel>;
- template<class BaseTraits, class CDTT, class TDTT, class DT, class EDM, class ETCM>
+ template<class BaseTraits, class CDM, class DT, class EDM, class ETCM>
struct NCNITraits : public BaseTraits
{
- using CompositionalDispersionTensorType = CDTT;
+ using CompositionalDispersionModel = CDM;
using DiffusionType = DT;
using EffectiveDiffusivityModel = EDM;
using EffectiveThermalConductivityModel = ETCM;
};
- using NonMinVolVars = OnePNCVolumeVariables<NCNITraits<BaseTraits, CDTT, TDTT, DT, EDM, ETCM>>;
+ using NonMinVolVars = OnePNCVolumeVariables<NCNITraits<BaseTraits, CDM, DT, EDM, ETCM>>;
public:
- using type = MineralizationVolumeVariables<NCNITraits<BaseTraits, CDTT, TDTT, DT, EDM, ETCM>, NonMinVolVars>;
+ using type = MineralizationVolumeVariables<NCNITraits<BaseTraits, CDM, DT, EDM, ETCM>, NonMinVolVars>;
};
//! Use the average for effective conductivities
template<class TypeTag>
diff --git a/dumux/porousmediumflow/fluxvariables.hh b/dumux/porousmediumflow/fluxvariables.hh
index 7145211aa66aa4cf207fdbd9f81fa297a08a9105..9760a25fe72c03a2c2685d5e33d14eeffb5a9e2c 100644
--- a/dumux/porousmediumflow/fluxvariables.hh
+++ b/dumux/porousmediumflow/fluxvariables.hh
@@ -152,7 +152,7 @@ public:
if constexpr (enableThermalDispersion)
{
// TODO: Here?
- if constexpr (Deprecated::hasThermalDispersionTensorType<ModelTraits>())
+ if constexpr (Deprecated::hasThermalDispersionModel<ModelTraits>())
{
return DispersionFluxType::thermalDispersionFlux(this->problem(),
this->element(),
@@ -163,7 +163,7 @@ public:
this->elemFluxVarsCache());
}
else
- DUNE_THROW(Dune::InvalidStateException, "Please pass the ThermalDispersionTensorType to the model traits");
+ DUNE_THROW(Dune::InvalidStateException, "Please pass the ThermalDispersionModel to the model traits");
}
else
return Dune::FieldVector<Scalar, 1>(0.0);
diff --git a/dumux/porousmediumflow/nonisothermal/model.hh b/dumux/porousmediumflow/nonisothermal/model.hh
index 0f7ec5f3019650eea8abd3b1bfe6bdb088df469e..177b5b40a3c3bf6c9256e2e243eb8d55a013f209 100644
--- a/dumux/porousmediumflow/nonisothermal/model.hh
+++ b/dumux/porousmediumflow/nonisothermal/model.hh
@@ -65,14 +65,14 @@ namespace Dumux {
*
* \tparam IsothermalTraits Model traits of the isothermal model
*/
-template<class IsothermalT, class TDTT = int>
+template<class IsothermalT, class TDM = int>
struct PorousMediumFlowNIModelTraits : public IsothermalT
{
//! Export the isothermal model traits
using IsothermalTraits = IsothermalT;
//! Export the thermal dispersion tensor type
- using ThermalDispersionTensorType = TDTT;
+ using ThermalDispersionModel = TDM;
//! We solve for one more equation, i.e. the energy balance
static constexpr int numEq() { return IsothermalTraits::numEq()+1; }
diff --git a/dumux/porousmediumflow/properties.hh b/dumux/porousmediumflow/properties.hh
index ae6cbe75b8c18e9861840ae5498b94882a57ded4..c362bc318fe5101414f468912cba7bf0d8fe9d3c 100644
--- a/dumux/porousmediumflow/properties.hh
+++ b/dumux/porousmediumflow/properties.hh
@@ -89,12 +89,12 @@ struct DispersionFluxType<TypeTag, TTag::PorousMediumFlow> { using type = Diffus
//! By default, we use Scheideggers's law for the dispersive tensor calculation
template<class TypeTag>
-struct CompositionalDispersionTensorType<TypeTag, TTag::PorousMediumFlow> { using type = ScheideggersDispersionTensor<TypeTag>; };
+struct CompositionalDispersionModel<TypeTag, TTag::PorousMediumFlow> { using type = ScheideggersDispersionTensor<TypeTag>; };
//! By default, we use the same dispersion tensor type as the componsitonal dispersion for the thermal disperion tensor
template<class TypeTag>
-struct ThermalDispersionTensorType<TypeTag, TTag::PorousMediumFlow>
-{ using type = GetPropType<TypeTag, Properties::CompositionalDispersionTensorType>; };
+struct ThermalDispersionModel<TypeTag, TTag::PorousMediumFlow>
+{ using type = GetPropType<TypeTag, Properties::CompositionalDispersionModel>; };
//! By default, we use fourier's law as the default for heat conduction fluxes
template<class TypeTag>
diff --git a/dumux/porousmediumflow/tracer/model.hh b/dumux/porousmediumflow/tracer/model.hh
index 4498b0a00f54525f853e99ebf160148ca28f5938..871e121aba00d0f389737bb2b5abb43e6a65fefc 100644
--- a/dumux/porousmediumflow/tracer/model.hh
+++ b/dumux/porousmediumflow/tracer/model.hh
@@ -94,7 +94,7 @@ struct TracerModelTraits
* \tparam FSY The fluid system type
* \tparam MT The model traits
*/
-template<class PV, class FSY, class SSY, class SST, class MT, class CDTT, class DT, class EDM>
+template<class PV, class FSY, class SSY, class SST, class MT, class CDM, class DT, class EDM>
struct TracerVolumeVariablesTraits
{
using PrimaryVariables = PV;
@@ -102,7 +102,7 @@ struct TracerVolumeVariablesTraits
using SolidSystem = SSY;
using SolidState = SST;
using ModelTraits = MT;
- using CompositionalDispersionTensorType = CDTT;
+ using CompositionalDispersionModel = CDM;
using DiffusionType = DT;
using EffectiveDiffusivityModel = EDM;
};
@@ -158,11 +158,11 @@ private:
using SSY = GetPropType<TypeTag, Properties::SolidSystem>;
using SST = GetPropType<TypeTag, Properties::SolidState>;
using MT = GetPropType<TypeTag, Properties::ModelTraits>;
- using CDTT = GetPropType<TypeTag, Properties::CompositionalDispersionTensorType>;
+ using CDM = GetPropType<TypeTag, Properties::CompositionalDispersionModel>;
using DT = GetPropType<TypeTag, Properties::MolecularDiffusionType>;
using EDM = GetPropType<TypeTag, Properties::EffectiveDiffusivityModel>;
- using Traits = TracerVolumeVariablesTraits<PV, FSY, SSY, SST, MT, CDTT, DT, EDM>;
+ using Traits = TracerVolumeVariablesTraits<PV, FSY, SSY, SST, MT, CDM, DT, EDM>;
public:
using type = TracerVolumeVariables<Traits>;
};
diff --git a/dumux/porousmediumflow/tracer/volumevariables.hh b/dumux/porousmediumflow/tracer/volumevariables.hh
index ab42fc92ec5b7db00fbf18e25a34bf98c881ba74..4b8baf143bfdb2fbefdc968aa3e4bff3a4056666 100644
--- a/dumux/porousmediumflow/tracer/volumevariables.hh
+++ b/dumux/porousmediumflow/tracer/volumevariables.hh
@@ -64,7 +64,7 @@ class TracerVolumeVariables
public:
//! Export the dispersion tensor law
- using CompositionalDispersionTensorType = typename Traits::CompositionalDispersionTensorType;
+ using CompositionalDispersionModel = typename Traits::CompositionalDispersionModel;
//! Export the fluid system type
using FluidSystem = typename Traits::FluidSystem;
//! Export the solid state type
diff --git a/test/porousmediumflow/1pnc/dispersion/properties.hh b/test/porousmediumflow/1pnc/dispersion/properties.hh
index 837a96a8cad97342e79dec2d585812bd12b6d777..bf8c75367ace85b6541cddc75bb64dbd5a77c52f 100644
--- a/test/porousmediumflow/1pnc/dispersion/properties.hh
+++ b/test/porousmediumflow/1pnc/dispersion/properties.hh
@@ -103,7 +103,7 @@ template<class TypeTag>
struct EnableThermalDispersion<TypeTag, TTag::DispersionTest> { static constexpr bool value = NONISOTHERMAL; };
template<class TypeTag>
-struct CompositionalDispersionTensorType<TypeTag, TTag::DispersionTest>
+struct CompositionalDispersionModel<TypeTag, TTag::DispersionTest>
{
#if SCHEIDEGGER
using type = ScheideggersDispersionTensor<TypeTag>;