Skip to content

GitLab

Commit aada80e2 authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#820 Poromechanics: add new meshes (including one smaller to use during dev).... 

#820 Poromechanics: add new meshes (including one smaller to use during dev). Also add a check about the fact meshes must currently be the same for fluid and solid.
parent 7e28eca0
Hide whitespace changes
Inline Side-by-side
Data/Lua/demo_input_poromechanics.lua
View file @ aada80e2
......@@ -214,7 +214,7 @@ Mesh1 = {
-- Path of the mesh file to use.
-- Expected format: "VALUE"
mesh = '${HOME}/Codes/HappyHeart/Data/Mesh/poromechanics.mesh',
mesh = '${HOME}/Codes/HappyHeart/Data/Mesh/poromechanics_2x2.mesh',
-- Format of the input mesh.
-- Expected format: "VALUE"
......@@ -241,7 +241,7 @@ Mesh2 = {
-- Path of the mesh file to use.
-- Expected format: "VALUE"
mesh = '${HOME}/Codes/HappyHeart/Data/Mesh/poromechanics.mesh',
mesh = '${HOME}/Codes/HappyHeart/Data/Mesh/poromechanics_6x6.mesh',
-- Format of the input mesh.
-- Expected format: "VALUE"
......
Data/Mesh/poromechanics_2x2.mesh 0 → 100644
View file @ aada80e2
MeshVersionFormatted 2
Dimension
2
Vertices
9
0 0 4
0.005 0 1
0.01 0 2
0 0.005 4
0.005 0.005 0
0.01 0.005 2
0 0.01 4
0.005 0.01 3
0.01 0.01 3
Edges
8
1 2 1
2 3 1
3 6 2
6 9 2
8 7 3
9 8 3
4 1 4
7 4 4
Triangles
8
1 2 5 0
1 5 4 0
2 3 6 0
2 6 5 0
4 5 8 0
4 8 7 0
5 6 9 0
5 9 8 0
End
Data/Mesh/poromechanics_5x5.mesh 0 → 100644
View file @ aada80e2
MeshVersionFormatted 2
Dimension
2
Vertices
36
0 0 4
0.002 0 1
0.004 0 1
0.006 0 1
0.008 0 1
0.01 0 2
0 0.002 4
0.002 0.002 0
0.004 0.002 0
0.006 0.002 0
0.008 0.002 0
0.01 0.002 2
0 0.004 4
0.002 0.004 0
0.004 0.004 0
0.006 0.004 0
0.008 0.004 0
0.01 0.004 2
0 0.006 4
0.002 0.006 0
0.004 0.006 0
0.006 0.006 0
0.008 0.006 0
0.01 0.006 2
0 0.008 4
0.002 0.008 0
0.004 0.008 0
0.006 0.008 0
0.008 0.008 0
0.01 0.008 2
0 0.01 4
0.002 0.01 3
0.004 0.01 3
0.006 0.01 3
0.008 0.01 3
0.01 0.01 3
Edges
20
1 2 1
2 3 1
3 4 1
4 5 1
5 6 1
6 12 2
12 18 2
18 24 2
24 30 2
30 36 2
32 31 3
33 32 3
34 33 3
35 34 3
36 35 3
7 1 4
13 7 4
19 13 4
25 19 4
31 25 4
Triangles
50
1 2 8 0
1 8 7 0
2 3 9 0
2 9 8 0
3 4 10 0
3 10 9 0
4 5 11 0
4 11 10 0
5 6 12 0
5 12 11 0
7 8 14 0
7 14 13 0
8 9 15 0
8 15 14 0
9 10 16 0
9 16 15 0
10 11 17 0
10 17 16 0
11 12 18 0
11 18 17 0
13 14 20 0
13 20 19 0
14 15 21 0
14 21 20 0
15 16 22 0
15 22 21 0
16 17 23 0
16 23 22 0
17 18 24 0
17 24 23 0
19 20 26 0
19 26 25 0
20 21 27 0
20 27 26 0
21 22 28 0
21 28 27 0
22 23 29 0
22 29 28 0
23 24 30 0
23 30 29 0
25 26 32 0
25 32 31 0
26 27 33 0
26 33 32 0
27 28 34 0
27 34 33 0
28 29 35 0
28 35 34 0
29 30 36 0
29 36 35 0
End
Data/Mesh/poromechanics_6x6.mesh 0 → 100644
View file @ aada80e2
MeshVersionFormatted 2
Dimension
2
Vertices
49
0 0 4
0.00166666666667 0 1
0.00333333333333 0 1
0.005 0 1
0.00666666666667 0 1
0.00833333333333 0 1
0.01 0 2
0 0.00166666666667 4
0.00166666666667 0.00166666666667 0
0.00333333333333 0.00166666666667 0
0.005 0.00166666666667 0
0.00666666666667 0.00166666666667 0
0.00833333333333 0.00166666666667 0
0.01 0.00166666666667 2
0 0.00333333333333 4
0.00166666666667 0.00333333333333 0
0.00333333333333 0.00333333333333 0
0.005 0.00333333333333 0
0.00666666666667 0.00333333333333 0
0.00833333333333 0.00333333333333 0
0.01 0.00333333333333 2
0 0.005 4
0.00166666666667 0.005 0
0.00333333333333 0.005 0
0.005 0.005 0
0.00666666666667 0.005 0
0.00833333333333 0.005 0
0.01 0.005 2
0 0.00666666666667 4
0.00166666666667 0.00666666666667 0
0.00333333333333 0.00666666666667 0
0.005 0.00666666666667 0
0.00666666666667 0.00666666666667 0
0.00833333333333 0.00666666666667 0
0.01 0.00666666666667 2
0 0.00833333333333 4
0.00166666666667 0.00833333333333 0
0.00333333333333 0.00833333333333 0
0.005 0.00833333333333 0
0.00666666666667 0.00833333333333 0
0.00833333333333 0.00833333333333 0
0.01 0.00833333333333 2
0 0.01 4
0.00166666666667 0.01 3
0.00333333333333 0.01 3
0.005 0.01 3
0.00666666666667 0.01 3
0.00833333333333 0.01 3
0.01 0.01 3
Edges
24
1 2 1
2 3 1
3 4 1
4 5 1
5 6 1
6 7 1
7 14 2
14 21 2
21 28 2
28 35 2
35 42 2
42 49 2
44 43 3
45 44 3
46 45 3
47 46 3
48 47 3
49 48 3
8 1 4
15 8 4
22 15 4
29 22 4
36 29 4
43 36 4
Triangles
72
1 2 9 0
1 9 8 0
2 3 10 0
2 10 9 0
3 4 11 0
3 11 10 0
4 5 12 0
4 12 11 0
5 6 13 0
5 13 12 0
6 7 14 0
6 14 13 0
8 9 16 0
8 16 15 0
9 10 17 0
9 17 16 0
10 11 18 0
10 18 17 0
11 12 19 0
11 19 18 0
12 13 20 0
12 20 19 0
13 14 21 0
13 21 20 0
15 16 23 0
15 23 22 0
16 17 24 0
16 24 23 0
17 18 25 0
17 25 24 0
18 19 26 0
18 26 25 0
19 20 27 0
19 27 26 0
20 21 28 0
20 28 27 0
22 23 30 0
22 30 29 0
23 24 31 0
23 31 30 0
24 25 32 0
24 32 31 0
25 26 33 0
25 33 32 0
26 27 34 0
26 34 33 0
27 28 35 0
27 35 34 0
29 30 37 0
29 37 36 0
30 31 38 0
30 38 37 0
31 32 39 0
31 39 38 0
32 33 40 0
32 40 39 0
33 34 41 0
33 41 40 0
34 35 42 0
34 42 41 0
36 37 44 0
36 44 43 0
37 38 45 0
37 45 44 0
38 39 46 0
38 46 45 0
39 40 47 0
39 47 46 0
40 41 48 0
40 48 47 0
41 42 49 0
41 49 48 0
End
Data/Mesh/poromechanics_8x8.mesh 0 → 100644
View file @ aada80e2
MeshVersionFormatted 2
Dimension
2
Vertices
81
0 0 4
0.00125 0 1
0.0025 0 1
0.00375 0 1
0.005 0 1
0.00625 0 1
0.0075 0 1
0.00875 0 1
0.01 0 2
0 0.00125 4
0.00125 0.00125 0
0.0025 0.00125 0
0.00375 0.00125 0
0.005 0.00125 0
0.00625 0.00125 0
0.0075 0.00125 0
0.00875 0.00125 0
0.01 0.00125 2
0 0.0025 4
0.00125 0.0025 0
0.0025 0.0025 0
0.00375 0.0025 0
0.005 0.0025 0
0.00625 0.0025 0
0.0075 0.0025 0
0.00875 0.0025 0
0.01 0.0025 2
0 0.00375 4
0.00125 0.00375 0
0.0025 0.00375 0
0.00375 0.00375 0
0.005 0.00375 0
0.00625 0.00375 0
0.0075 0.00375 0
0.00875 0.00375 0
0.01 0.00375 2
0 0.005 4
0.00125 0.005 0
0.0025 0.005 0
0.00375 0.005 0
0.005 0.005 0
0.00625 0.005 0
0.0075 0.005 0
0.00875 0.005 0
0.01 0.005 2
0 0.00625 4
0.00125 0.00625 0
0.0025 0.00625 0
0.00375 0.00625 0
0.005 0.00625 0
0.00625 0.00625 0
0.0075 0.00625 0
0.00875 0.00625 0
0.01 0.00625 2
0 0.0075 4
0.00125 0.0075 0
0.0025 0.0075 0
0.00375 0.0075 0
0.005 0.0075 0
0.00625 0.0075 0
0.0075 0.0075 0
0.00875 0.0075 0
0.01 0.0075 2
0 0.00875 4
0.00125 0.00875 0
0.0025 0.00875 0
0.00375 0.00875 0
0.005 0.00875 0
0.00625 0.00875 0
0.0075 0.00875 0
0.00875 0.00875 0
0.01 0.00875 2
0 0.01 4
0.00125 0.01 3
0.0025 0.01 3
0.00375 0.01 3
0.005 0.01 3
0.00625 0.01 3
0.0075 0.01 3
0.00875 0.01 3
0.01 0.01 3
Edges
32
1 2 1
2 3 1
3 4 1
4 5 1
5 6 1
6 7 1
7 8 1
8 9 1
9 18 2
18 27 2
27 36 2
36 45 2
45 54 2
54 63 2
63 72 2
72 81 2
74 73 3
75 74 3
76 75 3
77 76 3
78 77 3
79 78 3
80 79 3
81 80 3
10 1 4
19 10 4
28 19 4
37 28 4
46 37 4
55 46 4
64 55 4
73 64 4
Triangles
128
1 2 11 0
1 11 10 0
2 3 12 0
2 12 11 0
3 4 13 0
3 13 12 0
4 5 14 0
4 14 13 0
5 6 15 0
5 15 14 0
6 7 16 0
6 16 15 0
7 8 17 0
7 17 16 0
8 9 18 0
8 18 17 0
10 11 20 0
10 20 19 0
11 12 21 0
11 21 20 0
12 13 22 0
12 22 21 0
13 14 23 0
13 23 22 0
14 15 24 0
14 24 23 0
15 16 25 0
15 25 24 0
16 17 26 0
16 26 25 0
17 18 27 0
17 27 26 0
19 20 29 0
19 29 28 0
20 21 30 0
20 30 29 0
21 22 31 0
21 31 30 0
22 23 32 0
22 32 31 0
23 24 33 0
23 33 32 0
24 25 34 0
24 34 33 0
25 26 35 0
25 35 34 0
26 27 36 0
26 36 35 0
28 29 38 0
28 38 37 0
29 30 39 0
29 39 38 0
30 31 40 0
30 40 39 0
31 32 41 0
31 41 40 0
32 33 42 0
32 42 41 0
33 34 43 0
33 43 42 0
34 35 44 0
34 44 43 0
35 36 45 0
35 45 44 0
37 38 47 0
37 47 46 0
38 39 48 0
38 48 47 0
39 40 49 0
39 49 48 0
40 41 50 0
40 50 49 0
41 42 51 0
41 51 50 0
42 43 52 0
42 52 51 0
43 44 53 0
43 53 52 0
44 45 54 0
44 54 53 0
46 47 56 0
46 56 55 0
47 48 57 0
47 57 56 0
48 49 58 0
48 58 57 0
49 50 59 0
49 59 58 0
50 51 60 0
50 60 59 0
51 52 61 0
51 61 60 0
52 53 62 0
52 62 61 0
53 54 63 0
53 63 62 0
55 56 65 0
55 65 64 0
56 57 66 0
56 66 65 0
57 58 67 0
57 67 66 0
58 59 68 0
58 68 67 0
59 60 69 0
59 69 68 0
60 61 70 0
60 70 69 0
61 62 71 0
61 71 70 0
62 63 72 0
62 72 71 0
64 65 74 0
64 74 73 0
65 66 75 0
65 75 74 0
66 67 76 0
66 76 75 0
67 68 77 0
67 77 76 0
68 69 78 0
68 78 77 0
69 70 79 0
69 79 78 0
70 71 80 0
70 80 79 0
71 72 81 0
71 81 80 0
End
Sources/ModelInstances/UnderDevelopment/Poromechanics/ImplicitStepFluidVariationalFormulation.cpp
View file @ aada80e2
......@@ -58,7 +58,7 @@ namespace HappyHeart
parent::ApplyEssentialBoundaryCondition<OperatorNS::Nature::nonlinear>(numbering_subset,
numbering_subset);
rhs.View(parent::MpiHappyHeart(), __FILE__, __LINE__);
// rhs.View(parent::MpiHappyHeart(), __FILE__, __LINE__);
// parent::SolveLinear<IsFactorized::no>(numbering_subset, numbering_subset);
// parent::WriteSolution(time_manager, numbering_subset);
......
Sources/ModelInstances/UnderDevelopment/Poromechanics/ModelInitialize.hxx
View file @ aada80e2
......@@ -24,7 +24,20 @@ namespace HappyHeart
Model<SolidVariationalFormulationPolicyT>::Model(const Wrappers::Mpi& mpi_ptr,
const InputParameterList& input_parameter_data)
: parent(mpi_ptr, input_parameter_data)
{ }
{
namespace ipl = Utilities::InputParameterListNS;
decltype(auto) solid_mesh_path =
ipl::Extract<InputParameter::Mesh<EnumUnderlyingType(MeshIndex::solid)>::Path>::Value(input_parameter_data);
decltype(auto) fluid_mesh_path =
ipl::Extract<InputParameter::Mesh<EnumUnderlyingType(MeshIndex::fluid)>::Path>::Value(input_parameter_data);
if (solid_mesh_path != fluid_mesh_path)
throw Exception("At the moment model is written with the assumption solid and fluid use up the same mesh!",
__FILE__, __LINE__);
}
template<class SolidVariationalFormulationPolicyT>
......
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