Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Orthotropy in MFront solid material models #2774

Merged
merged 10 commits into from
Feb 1, 2020
Prev Previous commit
Next Next commit
[MaL] KV; For MSVC, pass additional tpl parameters
Somehow the template deduction of MSVC could not handle
the additional parameters with default values.
  • Loading branch information
endJunction committed Feb 1, 2020
commit 696e51598654d8b2dfd4660df8e108328e39c238
4 changes: 2 additions & 2 deletions MathLib/KelvinVector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ kelvinVectorToSymmetricTensor(Eigen::Matrix<double,

template <>
KelvinMatrixType<2> fourthOrderRotationMatrix<2>(
Eigen::Matrix<double, 2, 2> const& transformation)
Eigen::Matrix<double, 2, 2, Eigen::ColMajor, 2, 2> const& transformation)
{
// 1-based index access for convenience.
auto Q = [&](int const i, int const j) {
Expand All @@ -200,7 +200,7 @@ KelvinMatrixType<2> fourthOrderRotationMatrix<2>(

template <>
KelvinMatrixType<3> fourthOrderRotationMatrix<3>(
Eigen::Matrix<double, 3, 3> const& transformation)
Eigen::Matrix<double, 3, 3, Eigen::ColMajor, 3, 3> const& transformation)
{
// 1-based index access for convenience.
auto Q = [&](int const i, int const j) {
Expand Down
4 changes: 2 additions & 2 deletions MathLib/KelvinVector.h
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,8 @@ KelvinVectorType<DisplacementDim> symmetricTensorToKelvinVector(
/// 2D and 3D implementations available.
template <int DisplacementDim>
KelvinMatrixType<DisplacementDim> fourthOrderRotationMatrix(
Eigen::Matrix<double, DisplacementDim, DisplacementDim> const&
transformation);
Eigen::Matrix<double, DisplacementDim, DisplacementDim, Eigen::ColMajor,
DisplacementDim, DisplacementDim> const& transformation);

} // namespace KelvinVector
} // namespace MathLib
Expand Down