Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
pugs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
code
pugs
Commits
c62f475b
Commit
c62f475b
authored
Jan 11, 2022
by
Stéphane Del Pino
Browse files
Options
Downloads
Patches
Plain Diff
Add tests for DiamondDualMeshBuilder
parent
04ea6239
No related branches found
No related tags found
1 merge request
!125
Rename DualConnectivityBuilder and MedianDualMeshBuilder's files
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/mesh/DiamondDualMeshBuilder.cpp
+2
-0
2 additions, 0 deletions
src/mesh/DiamondDualMeshBuilder.cpp
tests/CMakeLists.txt
+1
-0
1 addition, 0 deletions
tests/CMakeLists.txt
tests/test_DiamondDualMeshBuilder.cpp
+153
-0
153 additions, 0 deletions
tests/test_DiamondDualMeshBuilder.cpp
with
156 additions
and
0 deletions
src/mesh/DiamondDualMeshBuilder.cpp
+
2
−
0
View file @
c62f475b
...
...
@@ -53,8 +53,10 @@ DiamondDualMeshBuilder::DiamondDualMeshBuilder(const IMesh& i_mesh)
this
->
_buildDualDiamondMeshFrom
<
3
>
(
i_mesh
);
break
;
}
// LCOV_EXCL_START
default
:
{
throw
UnexpectedError
(
"invalid mesh dimension: "
+
std
::
to_string
(
i_mesh
.
dimension
()));
}
// LCOV_EXCL_STOP
}
}
This diff is collapsed.
Click to expand it.
tests/CMakeLists.txt
+
1
−
0
View file @
c62f475b
...
...
@@ -66,6 +66,7 @@ add_executable (unit_tests
test_DataVariant.cpp
test_Demangle.cpp
test_DiamondDualConnectivityBuilder.cpp
test_DiamondDualMeshBuilder.cpp
test_DiscreteFunctionDescriptorP0.cpp
test_DiscreteFunctionDescriptorP0Vector.cpp
test_DiscreteFunctionType.cpp
...
...
This diff is collapsed.
Click to expand it.
tests/test_DiamondDualMeshBuilder.cpp
0 → 100644
+
153
−
0
View file @
c62f475b
#include
<catch2/catch_test_macros.hpp>
#include
<catch2/matchers/catch_matchers_all.hpp>
#include
<MeshDataBaseForTests.hpp>
#include
<mesh/DualMeshManager.hpp>
#include
<mesh/MeshData.hpp>
#include
<mesh/MeshDataManager.hpp>
#include
<mesh/Connectivity.hpp>
#include
<mesh/ItemValueUtils.hpp>
#include
<mesh/Mesh.hpp>
// clazy:excludeall=non-pod-global-static
TEST_CASE
(
"DiamondDualMeshBuilder"
,
"[mesh]"
)
{
SECTION
(
"2D"
)
{
constexpr
static
size_t
Dimension
=
2
;
using
ConnectivityType
=
Connectivity
<
Dimension
>
;
using
MeshType
=
Mesh
<
ConnectivityType
>
;
std
::
shared_ptr
p_mesh
=
MeshDataBaseForTests
::
get
().
hybrid2DMesh
();
const
MeshType
&
primal_mesh
=
*
p_mesh
;
REQUIRE
(
primal_mesh
.
numberOfNodes
()
==
53
);
REQUIRE
(
primal_mesh
.
numberOfFaces
()
==
110
);
REQUIRE
(
primal_mesh
.
numberOfCells
()
==
58
);
std
::
shared_ptr
p_diamond_dual_mesh
=
DualMeshManager
::
instance
().
getDiamondDualMesh
(
primal_mesh
);
const
MeshType
&
dual_mesh
=
*
p_diamond_dual_mesh
;
REQUIRE
(
dual_mesh
.
numberOfNodes
()
==
111
);
REQUIRE
(
dual_mesh
.
numberOfFaces
()
==
220
);
REQUIRE
(
dual_mesh
.
numberOfCells
()
==
110
);
auto
dual_cell_volume
=
MeshDataManager
::
instance
().
getMeshData
(
dual_mesh
).
Vj
();
REQUIRE
(
sum
(
dual_cell_volume
)
==
Catch
::
Approx
(
2
));
auto
coord_comp
=
[](
const
TinyVector
<
Dimension
>&
a
,
const
TinyVector
<
Dimension
>&
b
)
->
bool
{
return
(
a
[
0
]
<
b
[
0
])
or
((
a
[
0
]
==
b
[
0
])
and
(
a
[
1
]
<
b
[
1
]));
};
auto
dual_cell_to_node
=
dual_mesh
.
connectivity
().
cellToNodeMatrix
();
auto
primal_face_to_node
=
primal_mesh
.
connectivity
().
faceToNodeMatrix
();
auto
primal_face_to_cell
=
primal_mesh
.
connectivity
().
faceToCellMatrix
();
auto
dual_xr
=
dual_mesh
.
xr
();
auto
primal_xr
=
primal_mesh
.
xr
();
auto
primal_xj
=
MeshDataManager
::
instance
().
getMeshData
(
primal_mesh
).
xj
();
using
CoordSet
=
std
::
set
<
TinyVector
<
Dimension
>
,
std
::
function
<
bool
(
const
TinyVector
<
Dimension
>&
a
,
const
TinyVector
<
Dimension
>&
b
)
>>
;
CellId
dual_cell_id
=
0
;
FaceId
primal_face_id
=
0
;
for
(;
dual_cell_id
<
dual_mesh
.
numberOfCells
();
++
dual_cell_id
,
++
primal_face_id
)
{
CoordSet
dual_cell_node_coords
{
coord_comp
};
{
auto
dual_cell_node_list
=
dual_cell_to_node
[
dual_cell_id
];
for
(
size_t
i_node
=
0
;
i_node
<
dual_cell_node_list
.
size
();
++
i_node
)
{
dual_cell_node_coords
.
insert
(
dual_xr
[
dual_cell_node_list
[
i_node
]]);
}
}
CoordSet
primal_coords
{
coord_comp
};
{
auto
primal_face_node_list
=
primal_face_to_node
[
primal_face_id
];
for
(
size_t
i_node
=
0
;
i_node
<
primal_face_node_list
.
size
();
++
i_node
)
{
primal_coords
.
insert
(
primal_xr
[
primal_face_node_list
[
i_node
]]);
}
auto
primal_face_cell_list
=
primal_face_to_cell
[
primal_face_id
];
for
(
size_t
i_cell
=
0
;
i_cell
<
primal_face_cell_list
.
size
();
++
i_cell
)
{
primal_coords
.
insert
(
primal_xj
[
primal_face_cell_list
[
i_cell
]]);
}
}
REQUIRE
(
primal_coords
==
dual_cell_node_coords
);
}
}
SECTION
(
"3D"
)
{
constexpr
static
size_t
Dimension
=
3
;
using
ConnectivityType
=
Connectivity
<
Dimension
>
;
using
MeshType
=
Mesh
<
ConnectivityType
>
;
std
::
shared_ptr
p_mesh
=
MeshDataBaseForTests
::
get
().
hybrid3DMesh
();
const
MeshType
&
primal_mesh
=
*
p_mesh
;
REQUIRE
(
primal_mesh
.
numberOfNodes
()
==
132
);
REQUIRE
(
primal_mesh
.
numberOfEdges
()
==
452
);
REQUIRE
(
primal_mesh
.
numberOfFaces
()
==
520
);
REQUIRE
(
primal_mesh
.
numberOfCells
()
==
199
);
std
::
shared_ptr
p_diamond_dual_mesh
=
DualMeshManager
::
instance
().
getDiamondDualMesh
(
primal_mesh
);
const
MeshType
&
dual_mesh
=
*
p_diamond_dual_mesh
;
REQUIRE
(
dual_mesh
.
numberOfNodes
()
==
331
);
REQUIRE
(
dual_mesh
.
numberOfEdges
()
==
1461
);
REQUIRE
(
dual_mesh
.
numberOfFaces
()
==
1651
);
REQUIRE
(
dual_mesh
.
numberOfCells
()
==
520
);
auto
dual_cell_volume
=
MeshDataManager
::
instance
().
getMeshData
(
dual_mesh
).
Vj
();
REQUIRE
(
sum
(
dual_cell_volume
)
==
Catch
::
Approx
(
2
));
auto
coord_comp
=
[](
const
TinyVector
<
Dimension
>&
a
,
const
TinyVector
<
Dimension
>&
b
)
->
bool
{
return
(
a
[
0
]
<
b
[
0
])
or
((
a
[
0
]
==
b
[
0
])
and
(
a
[
1
]
<
b
[
1
]))
or
((
a
[
0
]
==
b
[
0
])
and
(
a
[
1
]
==
b
[
1
])
and
(
a
[
2
]
<
b
[
2
]));
};
auto
dual_cell_to_node
=
dual_mesh
.
connectivity
().
cellToNodeMatrix
();
auto
primal_face_to_node
=
primal_mesh
.
connectivity
().
faceToNodeMatrix
();
auto
primal_face_to_cell
=
primal_mesh
.
connectivity
().
faceToCellMatrix
();
auto
dual_xr
=
dual_mesh
.
xr
();
auto
primal_xr
=
primal_mesh
.
xr
();
auto
primal_xj
=
MeshDataManager
::
instance
().
getMeshData
(
primal_mesh
).
xj
();
using
CoordSet
=
std
::
set
<
TinyVector
<
Dimension
>
,
std
::
function
<
bool
(
const
TinyVector
<
Dimension
>&
a
,
const
TinyVector
<
Dimension
>&
b
)
>>
;
CellId
dual_cell_id
=
0
;
FaceId
primal_face_id
=
0
;
for
(;
dual_cell_id
<
dual_mesh
.
numberOfCells
();
++
dual_cell_id
,
++
primal_face_id
)
{
CoordSet
dual_cell_node_coords
{
coord_comp
};
{
auto
dual_cell_node_list
=
dual_cell_to_node
[
dual_cell_id
];
for
(
size_t
i_node
=
0
;
i_node
<
dual_cell_node_list
.
size
();
++
i_node
)
{
dual_cell_node_coords
.
insert
(
dual_xr
[
dual_cell_node_list
[
i_node
]]);
}
}
CoordSet
primal_coords
{
coord_comp
};
{
auto
primal_face_node_list
=
primal_face_to_node
[
primal_face_id
];
for
(
size_t
i_node
=
0
;
i_node
<
primal_face_node_list
.
size
();
++
i_node
)
{
primal_coords
.
insert
(
primal_xr
[
primal_face_node_list
[
i_node
]]);
}
auto
primal_face_cell_list
=
primal_face_to_cell
[
primal_face_id
];
for
(
size_t
i_cell
=
0
;
i_cell
<
primal_face_cell_list
.
size
();
++
i_cell
)
{
primal_coords
.
insert
(
primal_xj
[
primal_face_cell_list
[
i_cell
]]);
}
}
REQUIRE
(
primal_coords
==
dual_cell_node_coords
);
}
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment