Skip to content
Snippets Groups Projects

Avoid direct calls of std:: namespaces

Merged Patrick Jaap requested to merge fix/namespaces into master
2 files
+ 10
4
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -92,7 +92,10 @@ public:
field_type strainEnergy = 0;
if (mooneyrivlin_energy == "ciarlet")
return mooneyrivlin_a*normFSquared + mooneyrivlin_b*normFinvSquared*detF + mooneyrivlin_c*detF*detF - ((dim-1)*mooneyrivlin_a + mooneyrivlin_b + 2*mooneyrivlin_c)*std::log(detF);
{
using std::log;
return mooneyrivlin_a*normFSquared + mooneyrivlin_b*normFinvSquared*detF + mooneyrivlin_c*detF*detF - ((dim-1)*mooneyrivlin_a + mooneyrivlin_b + 2*mooneyrivlin_c)*log(detF);
}
else {
strainEnergy = mooneyrivlin_10 * trCTildeMinus3 +
mooneyrivlin_01 * c2TildeMinus3 +
@@ -104,7 +107,8 @@ public:
mooneyrivlin_12 * trCTildeMinus3 * c2TildeMinus3 * c2TildeMinus3 +
mooneyrivlin_03 * c2TildeMinus3 * c2TildeMinus3 * c2TildeMinus3;
if (mooneyrivlin_energy == "log") {
field_type logDetF = std::log(detF);
using std::log;
field_type logDetF = log(detF);
return strainEnergy + 0.5 * mooneyrivlin_k* logDetF * logDetF;
} else if (mooneyrivlin_energy == "square") {
field_type detFMinus1 = detF - 1;
Loading