Commit 2120b97b authored by Kilian Weishaupt's avatar Kilian Weishaupt
Browse files

Merge branch 'fix/2pnc' into 'next'

[2pnc] Fix/2pnc

See merge request !258
parents 697e4ffd 4e3a71d7
......@@ -339,7 +339,7 @@ public:
for (int compIdx = 0; compIdx < numComponents; ++compIdx)
(*molarity[compIdx])[dofIdxGlobal] = (volVars.molarity(wPhaseIdx, compIdx));
auto K = perm_(this->problem_().spatialParams().intrinsicPermeability(scv));
auto K = perm_(this->problem_().spatialParams().intrinsicPermeability(scv, volVars));
for (int j = 0; j<dim; ++j)
(*Perm[j])[dofIdxGlobal] = K[j][j];
......
......@@ -121,7 +121,7 @@ class FuelCellProblem : public ImplicitPorousMediaProblem<TypeTag>
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
// Select the electrochemistry method
using ElectroChemistry = typename ElectroChemistry<TypeTag, ElectroChemistryModel::Ochs>;
using ElectroChemistry = typename Dumux::ElectroChemistry<TypeTag, ElectroChemistryModel::Ochs>;
using Constant = Constants<Scalar>;
enum { isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
......
......@@ -93,6 +93,7 @@ class FuelCellSpatialParams : public ImplicitSpatialParams<TypeTag>
using DimMatrix = Dune::FieldMatrix<CoordScalar,dim,dim>;
using FluxVariables = typename GET_PROP_TYPE(TypeTag, FluxVariables);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using Element = typename GridView::template Codim<0>::Entity;
......@@ -138,7 +139,8 @@ public:
* \param fvGeometry The current finite volume geometry of the element
* \param scvIdx The index of the sub-control volume
*/
const DimMatrix intrinsicPermeability(const SubControlVolume& scv) const
const DimMatrix intrinsicPermeability(const SubControlVolume& scv,
const VolumeVariables& volVars) const
{ return K_; }
/*!
......
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