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

Merge branch 'fix/material-spline-capture' into 'master'

Fix/material spline capture

See merge request !2440

(cherry picked from commit b1f87621)

65800cc4 [material] Use implicit capture mode to avoid clang compiler warning about unused capture
parent 7424e19c
No related branches found
No related tags found
1 merge request!2441Merge branch 'fix/material-spline-capture' into 'master'
...@@ -90,16 +90,16 @@ public: ...@@ -90,16 +90,16 @@ public:
numSwSamples_ = getParamFromGroup<Scalar>(paramGroup, "SplineNumSwSamples", 30); numSwSamples_ = getParamFromGroup<Scalar>(paramGroup, "SplineNumSwSamples", 30);
pcSpline_ = makeSweSpline_( pcSpline_ = makeSweSpline_(
[this](const auto s){ return TwoPMaterialLaw::pc(s); }, [&](const auto s){ return TwoPMaterialLaw::pc(s); },
approximatePcSwInverse approximatePcSwInverse
); );
krwSpline_ = makeSweSpline_( krwSpline_ = makeSweSpline_(
[this](const auto s){ return TwoPMaterialLaw::krw(s); } [&](const auto s){ return TwoPMaterialLaw::krw(s); }
); );
krnSpline_ = makeSweSpline_( krnSpline_ = makeSweSpline_(
[this](const auto s){ return TwoPMaterialLaw::krn(s); } [&](const auto s){ return TwoPMaterialLaw::krn(s); }
); );
} }
......
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