Skip to content
Snippets Groups Projects
Commit db40bc7c authored by Kilian Weishaupt's avatar Kilian Weishaupt
Browse files

[staggeredGrid][localJacobian] Fix compiler error with clang

* clang yielded a linker error related to the array-type baseEps
parent 56e81315
No related branches found
No related tags found
2 merge requests!617[WIP] Next,!449[staggeredGrid][localJacobian] Fix compiler error with clang
......@@ -120,7 +120,6 @@ public:
StaggeredLocalJacobian()
{
numericDifferenceMethod_ = GET_PARAM_FROM_GROUP(TypeTag, int, Implicit, NumericDifferenceMethod);
baseEps_ = GET_PROP_VALUE(TypeTag, BaseEpsilon);
}
/*!
......@@ -573,7 +572,8 @@ protected:
AssemblyMap assemblyMap_;
std::array<std::array<Scalar, 2>, 2> baseEps_;
using BaseEpsilon = typename GET_PROP(TypeTag, BaseEpsilon);
const std::array<std::array<Scalar, 2>, 2> baseEps_ = BaseEpsilon::getEps();
};
}
......
......@@ -262,8 +262,11 @@ private:
static constexpr Scalar dFacedFace = 1e-8;
public:
static constexpr std::array<std::array<Scalar, 2>, 2> value{{{dCCdCC, dCCdFace},
{dFacedCC, dFacedFace}}};
static constexpr auto getEps()
{
return std::array<std::array<Scalar, 2>, 2>{{{dCCdCC, dCCdFace},
{dFacedCC, dFacedFace}}};
}
};
} // namespace Properties
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment