Commit 4dc2a972 authored by DIAZ Jerome's avatar DIAZ Jerome Committed by GILLES Sebastien

#20 modified the numerical values used in the integration test for the 2nd...

#20 modified the numerical values used in the integration test for the 2nd Piola-Kirchhoff tensor so that the input displacement field used is mechanically compatible.
parent a47f0657
......@@ -77,30 +77,30 @@ namespace MoReFEM
return expected_results_type<IsMatrixOrVector::matrix>
{
{ 0.276918, 0.0109222, 0.0109222, -0.0558125, -0.121755, -0.121755,
-0.110553, 0.113216, -0.00238355, -0.110553, -0.00238355, 0.113216 },
{ 0.0109222, 0.315643, -0.193767, 0.112061, -0.0725773, 0.0456531,
-0.0443309, -0.0292346, 0.00736394, -0.0786526, -0.213832, 0.14075 },
{ 0.0109222, -0.193767, 0.315643, 0.112061, 0.0456531, -0.0725773,
-0.0786526, 0.14075, -0.213832, -0.0443309, 0.00736394, -0.0292346 },
{ -0.0558125, 0.112061, 0.112061, 0.140605, 0.00962944, 0.00962944,
-0.0423962, 0.074993, -0.196684, -0.0423962, -0.196684, 0.074993 },
{ -0.121755, -0.0725773, 0.0456531, 0.00962944, 0.152302, -0.0897037,
0.0920734, -0.0617898, 0.0405748, 0.0200523, -0.0179353, 0.00347586 },
{ -0.121755, 0.0456531, -0.0725773, 0.00962944, -0.0897037, 0.152302,
0.0200523, 0.00347586, -0.0179353, 0.0920734, 0.0405748, -0.0617898 },
{ -0.110553, -0.0443309, -0.0786526, -0.0423962, 0.0920734, 0.0200523,
0.243893, -0.112954, 0.133855, -0.0909445, 0.065212, -0.075255 },
{ 0.113216, -0.0292346, 0.14075, 0.074993, -0.0617898, 0.00347586,
-0.112954, 0.918354, -0.873746, -0.075255, -0.82733, 0.72952 },
{ -0.00238355, 0.00736394, -0.213832, -0.196684, 0.0405748,
-0.0179353, 0.133855, -0.873746, 1.0591, 0.065212, 0.825807, -0.82733 },
{ -0.110553, -0.0786526, -0.0443309, -0.0423962, 0.0200523, 0.0920734,
-0.0909445, -0.075255, 0.065212, 0.243893, 0.133855, -0.112954 },
{ -0.00238355, -0.213832, 0.00736394, -0.196684, -0.0179353, 0.0405748,
0.065212, -0.82733, 0.825807, 0.133855, 1.0591, -0.873746 },
{ 0.113216, 0.14075, -0.0292346, 0.074993, 0.00347586, -0.0617898,
-0.075255, 0.72952, -0.82733, -0.112954, -0.873746, 0.918354 },
{ 1.15923, 1.68971, 3.28419, -0.0288125, -0.584961, -1.58309,
1.25911, 3.71166, 5.13138, -2.38953, -4.8164, -6.83248 },
{ 1.68971, 5.66856, 9.05772, 1.11914, 1.66658, 2.53174,
2.03308, 6.7066, 7.44842, -4.84192, -14.04174, -19.03788 },
{ 3.28419, 9.05772, 15.23546, 2.0445, 2.71089, 3.83645,
5.64333, 16.80386, 22.39913, -10.97202, -28.57247, -41.47103 },
{ -0.0288125, 1.11914, 2.0445, 0.107905, -0.0204103, 0.137774,
-0.132169, 2.1174, 3.11114, 0.0530768, -3.21613, -5.29341 },
{ -0.584961, 1.66658, 2.71089, -0.0204103, 0.984933, 1.16694,
-1.35447, 2.06823, 2.40858, 1.95984, -4.71974, -6.2864 },
{ -1.58309, 2.53174, 3.83645 ,0.137774, 1.16694, 1.92849,
-2.19711, 4.58799, 5.55552, 3.64243, -8.28666, -11.32046 },
{ 1.25911, 2.03308, 5.64333, -0.132169, -1.35447, -2.19711,
3.12083, 4.63413, 10.04007, -4.24777, -5.31275, -13.48629 },
{ 3.71166, 6.7066, 16.80386, 2.1174, 2.06823, 4.58799,
4.63413, 9.29933, 18.44163, -10.46320, -18.07415, -39.83348 },
{ 5.13138, 7.44842, 22.39913, 3.11114, 2.40858, 5.55552,
10.04007, 18.44163, 38.09556, -18.28260, -28.29863, -66.05021 },
{ -2.38953, -4.84192, -10.97202, 0.0530768, 1.95984, 3.64243,
-4.24777, -10.46320, -18.28260, 6.58422, 13.34528, 25.61218 },
{ -4.8164, -14.041741, -28.57247, -3.21613, -4.71974, -8.28666,
-5.31275, -18.07415, -28.29863, 13.34528, 36.83563, 65.15777 },
{ -6.83248, -19.03788, -41.47103, -5.29341, -6.2864, -11.32046,
-13.48629, -39.83348, -66.05021, 25.61218, 65.15777, 118.8417 }
};
}
......@@ -123,9 +123,10 @@ namespace MoReFEM
{
return expected_results_type<IsMatrixOrVector::vector>
{
0.120398, 0.797626, 0.797626, 0.535767, -0.294971, -0.294971,
-0.328082, -0.209101, -0.293554, -0.328082, -0.293554, -0.209101,
0.677519, 2.38524, 7.96239, 1.47276, 1.10583, 1.62663,
2.28727, 6.69908, 10.50512, -4.43755, -10.19014, -20.09415,
};
}
......
......@@ -118,6 +118,7 @@ namespace MoReFEM
GlobalVectorWithCoefficient vec_inverted_elements(vector_inverted_elements_p1, 1.);
if (do_assemble_into_matrix == assemble_into_matrix::yes
&& do_assemble_into_vector == assemble_into_vector::yes)
{
......
......@@ -77,8 +77,8 @@ namespace MoReFEM
previous_iteration_other_p1.SetValue(2, 2., INSERT_VALUES, __FILE__, __LINE__);
[[fallthrough]];
case 1:
previous_iteration_other_p1.SetValue(0, 1., INSERT_VALUES, __FILE__, __LINE__);
previous_iteration_other_p1.SetValue(1, 2., INSERT_VALUES, __FILE__, __LINE__);
previous_iteration_other_p1.SetValue(0, -1., INSERT_VALUES, __FILE__, __LINE__);
previous_iteration_other_p1.SetValue(1, -2., INSERT_VALUES, __FILE__, __LINE__);
break;
}
......
......@@ -71,8 +71,10 @@ namespace MoReFEM
switch(dimension)
{
case 3:
for (PetscInt i = 0; i < 12; ++i)
previous_iteration_p2.SetValue(i, 2., INSERT_VALUES, __FILE__, __LINE__);
previous_iteration_p2.SetValue(3, 0.1, INSERT_VALUES, __FILE__, __LINE__);
previous_iteration_p2.SetValue(6, 0.1, INSERT_VALUES, __FILE__, __LINE__);
previous_iteration_p2.SetValue(7, 0.1, INSERT_VALUES, __FILE__, __LINE__);
previous_iteration_p2.SetValue(10, 0.1, INSERT_VALUES, __FILE__, __LINE__);
break;
case 2:
assert(false && "Not yet implemented");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment