Skip to content

Commit 4c954af

Browse files
committed
[HyperElastic] Fix CUDA compilation error - type and overload discerning
1 parent 784f1a0 commit 4c954af

File tree

1 file changed

+3
-3
lines changed
  • Sofa/Component/SolidMechanics/FEM/HyperElastic/src/sofa/component/solidmechanics/fem/hyperelastic/material

1 file changed

+3
-3
lines changed

Sofa/Component/SolidMechanics/FEM/HyperElastic/src/sofa/component/solidmechanics/fem/hyperelastic/material/Ogden.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,13 +145,13 @@ class Ogden: public HyperelasticMaterial<DataTypes>
145145
const MatrixSym D = MatrixSym(pow(Evalue[0], aBy2Minus1), 0, pow(Evalue[1], aBy2Minus1), 0, 0, pow(Evalue[2], aBy2Minus1));
146146
const Matrix3 Ca = EigenBasis*D.SymMatMultiply(EigenBasis.transposed());
147147
MatrixSym CaBy2Minus1;
148-
sofa::type::MatSym<3>::Mat2Sym(Ca, CaBy2Minus1);
148+
sofa::type::MatSym<3, Real>::Mat2Sym(Ca, CaBy2Minus1);
149149

150150
// Invert deformation tensor
151151
MatrixSym invC;
152152
invertMatrix(invC, C);
153153

154-
SPKTensorGeneral = fj * mu1 / alpha1 * (CaBy2Minus1 + -1./3. * trCaBy2 * invC) + k0*log(sinfo->J)*invC;
154+
SPKTensorGeneral = fj * mu1 / alpha1 * (CaBy2Minus1 - invC * trCaBy2 * 1./3.) + invC * k0 * log(sinfo->J);
155155
}
156156

157157
void ElasticityTensor(StrainInformation<DataTypes> *sinfo, const MaterialParameters<DataTypes> &param, Matrix6& outputTensor) override
@@ -190,7 +190,7 @@ class Ogden: public HyperelasticMaterial<DataTypes>
190190
const Real aBy2Minus1 = aBy2 - 1.;
191191
MatrixSym D(pow(Evalue[0], aBy2Minus1), 0, pow(Evalue[1], aBy2Minus1), 0, 0, pow(Evalue[2], aBy2Minus1));
192192
MatrixSym CaBy2Minus1;
193-
sofa::type::MatSym<3>::Mat2Sym(EigenBasis*D.SymMatMultiply(EigenBasis.transposed()), CaBy2Minus1);
193+
sofa::type::MatSym<3, Real>::Mat2Sym(EigenBasis*D.SymMatMultiply(EigenBasis.transposed()), CaBy2Minus1);
194194

195195
// Invert deformation tensor
196196
MatrixSym invC;

0 commit comments

Comments
 (0)