Commit aa79b53d authored by Johannes Hommel's avatar Johannes Hommel Committed by Simon Scholz
Browse files

[2pncmin][next] using "using" in poro-perm laws

parent d10c5c7f
......@@ -69,7 +69,9 @@ public:
{
auto initPoro = spatialParams().initialPorosity(element, scv);
auto poro = spatialParams().porosity(element, scv, elemSol);
auto factor = std::pow((1.0 - initPoro)/(1.0 - poro), 2) * std::pow(poro/initPoro, 3);
using std::pow;
auto factor = pow((1.0 - initPoro)/(1.0 - poro), 2) * pow(poro/initPoro, 3);
return applyFactorToPermeability_(spatialParams().initialPermeability(element, scv), factor);
}
......
......@@ -72,7 +72,9 @@ public:
sumPrecipitates += priVars[numComponents + solidPhaseIdx];
auto minPoro = spatialParams_().minPorosity(element, scv);
return std::max(minPoro, spatialParams_().initialPorosity(element, scv) - sumPrecipitates);
using std::max;
return max(minPoro, spatialParams_().initialPorosity(element, scv) - sumPrecipitates);
}
private:
......
......@@ -289,7 +289,7 @@ public:
*/
static Scalar precipitateMolarDensity(int phaseIdx)
{
return precipitateDensity(phaseIdx)/molarMass(phaseIdx);
return precipitateDensity(phaseIdx)/molarMass(phaseIdx); //TODO this only works for this specific case here with phaseIdx=compIdx!
}
/****************************************
......
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