diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7465f11..50422f0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-22.04, macos-13, windows-2022] + os: [ubuntu-22.04, macos-14, windows-2022] sofa_branch: [master] steps: diff --git a/src/Shell/engine/FindClosePoints.inl b/src/Shell/engine/FindClosePoints.inl index 88b989c..422fbb7 100644 --- a/src/Shell/engine/FindClosePoints.inl +++ b/src/Shell/engine/FindClosePoints.inl @@ -59,7 +59,7 @@ void FindClosePoints::doUpdate() for (Index i=0; i(i,j)); + list.push_back(type::fixed_array{i, j}); } } } diff --git a/src/Shell/forcefield/TriangularShellForceField.inl b/src/Shell/forcefield/TriangularShellForceField.inl index fe379f7..7f4d347 100644 --- a/src/Shell/forcefield/TriangularShellForceField.inl +++ b/src/Shell/forcefield/TriangularShellForceField.inl @@ -1131,25 +1131,25 @@ void TriangularShellForceField::andesTemplate(StiffnessMatrix &K, con template void TriangularShellForceField::computeStiffnessMatrixAll3I(StiffnessMatrix &K, TriangleInformation &tinfo) { - return andesTemplate(K, tinfo, 1.0, AndesBeta(4.0/9.0, 1.0/12.0, 5.0/12.0, 1.0/2.0, 0.0, 1.0/3.0, -1.0/3.0, -1.0/12.0, -1.0/2.0, -5.0/12.0)); + return andesTemplate(K, tinfo, 1.0, AndesBeta{ 4.0 / 9.0, 1.0 / 12.0, 5.0 / 12.0, 1.0 / 2.0, 0.0, 1.0 / 3.0, -1.0 / 3.0, -1.0 / 12.0, -1.0 / 2.0, -5.0 / 12.0 }); } template void TriangularShellForceField::computeStiffnessMatrixAll3M(StiffnessMatrix &K, TriangleInformation &tinfo) { - return andesTemplate(K, tinfo, 1.0, AndesBeta(4.0/9.0, 1.0/4.0, 5.0/4.0, 3.0/2.0, 0.0, 1.0, -1.0, -1.0/4.0, -3.0/2.0, -5.0/4.0)); + return andesTemplate(K, tinfo, 1.0, AndesBeta{ 4.0/9.0, 1.0/4.0, 5.0/4.0, 3.0/2.0, 0.0, 1.0, -1.0, -1.0/4.0, -3.0/2.0, -5.0/4.0 }); } template void TriangularShellForceField::computeStiffnessMatrixAllLS(StiffnessMatrix &K, TriangleInformation &tinfo) { - return andesTemplate(K, tinfo, 1.0, AndesBeta(4.0/9.0, 3.0/20.0, 3.0/4.0, 9.0/10.0, 0.0, 3.0/5.0, -3.0/5.0, -3.0/20.0, -9.0/10.0, -3.0/4.0)); + return andesTemplate(K, tinfo, 1.0, AndesBeta{ 4.0/9.0, 3.0/20.0, 3.0/4.0, 9.0/10.0, 0.0, 3.0/5.0, -3.0/5.0, -3.0/20.0, -9.0/10.0, -3.0/4.0 }); } template void TriangularShellForceField::computeStiffnessMatrixLSTRet(StiffnessMatrix &K, TriangleInformation &tinfo) { - return andesTemplate(K, tinfo, 4.0/3.0, AndesBeta(1.0/2.0, 2.0/3.0, -2.0/3.0, 0.0, 0.0, -4.0/3.0, 4.0/3.0, -2.0/3.0, 0.0, 2.0/3.0)); + return andesTemplate(K, tinfo, 4.0/3.0, AndesBeta{ 1.0/2.0, 2.0/3.0, -2.0/3.0, 0.0, 0.0, -4.0/3.0, 4.0/3.0, -2.0/3.0, 0.0, 2.0/3.0 }); } // Optimal ANDES membrane element @@ -1158,7 +1158,7 @@ template void TriangularShellForceField::computeStiffnessMatrixAndesOpt(StiffnessMatrix &K, TriangleInformation &tinfo) { Real beta0 = helper::rmax(0.5 - 2.0*d_poisson.getValue()*d_poisson.getValue(), 0.01); - return andesTemplate(K, tinfo, 3.0/2.0, AndesBeta(beta0, 1.0, 2.0, 1.0, 0.0, 1.0, -1.0, -1.0, -1.0, -2.0)); + return andesTemplate(K, tinfo, 3.0 / 2.0, AndesBeta{ beta0, 1.0, 2.0, 1.0, 0.0, 1.0, -1.0, -1.0, -1.0, -2.0 }); } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -