Skip to content

Commit 800cc86

Browse files
committed
first fixes after merge
1 parent 208f18c commit 800cc86

File tree

3 files changed

+3
-13
lines changed

3 files changed

+3
-13
lines changed

ikarus/finiteelements/mechanics/enhancedassumedstrains.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public:
6464
using LocalView = typename Traits::LocalView;
6565
using Geometry = typename Traits::Geometry;
6666
using GridView = typename Traits::GridView;
67-
using Pre = EnhancedAssumedStrainsPre;
67+
using Pre = EnhancedAssumedStrainsPre<ES>;
6868

6969
static constexpr auto enhancedStrain = ES;
7070

ikarus/finiteelements/mechanics/linearelastic.hh

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -236,21 +236,10 @@ public:
236236
return RTWrapperType<RT>{};
237237
if constexpr (isSameResultType<RT, ResultTypes::linearStress> or
238238
isSameResultType<RT, ResultTypes::linearStressFull>) {
239-
const auto eps = strainFunction(req);
240-
auto epsVoigt = eps.evaluate(local, Dune::on(Dune::DerivativeDirections::gridElement));
241-
decltype(auto) mat = [&]() -> decltype(auto) {
242-
if constexpr (isSameResultType<RT, ResultTypes::linearStressFull> and requires { mat_.underlying(); })
243-
return mat_.underlying();
244-
else
245-
return mat_;
246-
}();
247-
return RTWrapper{mat.template stresses<StrainTags::linear>(enlargeIfReduced<Material>(epsVoigt))};
248-
//
249239
const auto rFunction = resultFunction<RT>();
250240
const auto eps = strainFunction(req);
251241
auto epsVoigt = eps.evaluate(local, Dune::on(Dune::DerivativeDirections::gridElement));
252242
return rFunction(epsVoigt);
253-
// TODO
254243
}
255244
}
256245

tests/src/checkfebyautodiff.hh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ auto checkFESByAutoDiffImpl(const GridView& gridView, const BasisHandler& basis,
3535

3636
fe.bind(element);
3737

38-
fe.updateState(req, d); // here d = correction vector (DeltaD)
38+
if constexpr (requires { fe.updateStateImpl(req, d); })
39+
fe.updateStateImpl(req, d); // here d = correction vector (DeltaD)
3940
req.insertGlobalSolution(d).insertParameter(lambda);
4041

4142
const std::string feClassName = Dune::className(fe);

0 commit comments

Comments
 (0)