Skip to content

Commit 1b6a642

Browse files
AlexlHerAlexlHer
authored
Merge pull request #1167 from arcaneframework/dev/ah-parallel-amr-cartesian-patch
Update AMR Patch for Cartesian Mesh
2 parents 16db86f + 301aca3 commit 1b6a642

10 files changed

+2266
-432
lines changed

‎arcane/ceapart/tests/CMakeLists.txt

+8-8
Original file line numberDiff line numberDiff line change
@@ -156,19 +156,19 @@ arcane_add_test_checkpoint(amr-checkpoint-cartesian3D-cell-renumbering-v2-1 test
156156
arcane_add_test_checkpoint_sequential(amr-checkpoint-cartesian3D-cell-renumbering-v2-2 testAMRCartesianMesh3D-Cell-RenumberingV2-2.arc 3 5)
157157
arcane_add_test_checkpoint_parallel(amr-checkpoint-cartesian3D-cell-renumbering-v2-2 testAMRCartesianMesh3D-Cell-RenumberingV2-2.arc 8 3 5)
158158

159-
arcane_add_test_sequential(amr-cartesian2D-patch-cartesian-mesh-only-1 testAMRCartesianMesh2D-PatchCartesianMeshOnly-1.arc "-m 20")
160-
arcane_add_test_parallel(amr-cartesian2D-patch-cartesian-mesh-only-1 testAMRCartesianMesh2D-PatchCartesianMeshOnly-1.arc 4 "-m 20")
161-
arcane_add_test_sequential(amr-cartesian2D-patch-cartesian-mesh-only-2 testAMRCartesianMesh2D-PatchCartesianMeshOnly-2.arc "-m 20")
162-
#arcane_add_test_parallel(amr-cartesian2D-patch-cartesian-mesh-only-2 testAMRCartesianMesh2D-PatchCartesianMeshOnly-2.arc 4 "-m 20")
163-
arcane_add_test_sequential(amr-cartesian2D-patch-cartesian-mesh-only-3 testAMRCartesianMesh2D-PatchCartesianMeshOnly-3.arc "-m 20")
164-
#arcane_add_test_parallel(amr-cartesian2D-patch-cartesian-mesh-only-3 testAMRCartesianMesh2D-PatchCartesianMeshOnly-3.arc 4 "-m 20")
159+
arcane_add_test(amr-cartesian2D-patch-cartesian-mesh-only-1 testAMRCartesianMesh2D-PatchCartesianMeshOnly-1.arc "-m 20")
160+
arcane_add_test(amr-cartesian2D-patch-cartesian-mesh-only-2 testAMRCartesianMesh2D-PatchCartesianMeshOnly-2.arc "-m 20")
161+
arcane_add_test(amr-cartesian2D-patch-cartesian-mesh-only-3 testAMRCartesianMesh2D-PatchCartesianMeshOnly-3.arc "-m 20")
162+
arcane_add_test(amr-cartesian2D-patch-cartesian-mesh-only-4 testAMRCartesianMesh2D-PatchCartesianMeshOnly-4.arc "-m 20")
165163

166164
arcane_add_test_sequential(amr-cartesian3D-patch-cartesian-mesh-only-1 testAMRCartesianMesh3D-PatchCartesianMeshOnly-1.arc "-m 20")
167165
arcane_add_test_parallel(amr-cartesian3D-patch-cartesian-mesh-only-1 testAMRCartesianMesh3D-PatchCartesianMeshOnly-1.arc 8 "-m 20")
168166
arcane_add_test_sequential(amr-cartesian3D-patch-cartesian-mesh-only-2 testAMRCartesianMesh3D-PatchCartesianMeshOnly-2.arc "-m 20")
169-
#arcane_add_test_parallel(amr-cartesian3D-patch-cartesian-mesh-only-2 testAMRCartesianMesh3D-PatchCartesianMeshOnly-2.arc 8 "-m 20")
167+
arcane_add_test_parallel(amr-cartesian3D-patch-cartesian-mesh-only-2 testAMRCartesianMesh3D-PatchCartesianMeshOnly-2.arc 8 "-m 20")
170168
arcane_add_test_sequential(amr-cartesian3D-patch-cartesian-mesh-only-3 testAMRCartesianMesh3D-PatchCartesianMeshOnly-3.arc "-m 20")
171-
#arcane_add_test_parallel(amr-cartesian3D-patch-cartesian-mesh-only-3 testAMRCartesianMesh3D-PatchCartesianMeshOnly-3.arc 8 "-m 20")
169+
arcane_add_test_parallel(amr-cartesian3D-patch-cartesian-mesh-only-3 testAMRCartesianMesh3D-PatchCartesianMeshOnly-3.arc 8 "-m 20")
170+
arcane_add_test_sequential(amr-cartesian3D-patch-cartesian-mesh-only-4 testAMRCartesianMesh3D-PatchCartesianMeshOnly-4.arc "-m 20")
171+
arcane_add_test_parallel(amr-cartesian3D-patch-cartesian-mesh-only-4 testAMRCartesianMesh3D-PatchCartesianMeshOnly-4.arc 8 "-m 20")
172172

173173
arcane_add_test(amr-cartesian2D-V1-coarse-1 testAMRCartesianMesh2D-V1-coarse-1.arc "-m 20" "-We,ARCANE_CARTESIANMESH_COARSENING_VERBOSITY_LEVEL,2")
174174
arcane_add_test(amr-cartesian2D-V1-coarse-2 testAMRCartesianMesh2D-V1-coarse-2.arc "-m 20")

‎arcane/ceapart/tests/testAMRCartesianMesh2D-PatchCartesianMeshOnly-3.arc

+15-7
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,26 @@
4040

4141
<a-m-r-cartesian-mesh-tester>
4242
<renumber-patch-method>0</renumber-patch-method>
43+
<refinement-2d>
44+
<position>2.0 0.0</position>
45+
<length>2.0 2.0</length>
46+
</refinement-2d>
47+
<refinement-2d>
48+
<position>2.0 2.0</position>
49+
<length>2.0 2.0</length>
50+
</refinement-2d>
4351
<refinement-2d>
4452
<position>0.0 0.0</position>
45-
<length>4.0 2.0</length>
53+
<length>2.0 2.0</length>
4654
</refinement-2d>
4755
<refinement-2d>
48-
<position>1.0 1.0</position>
49-
<length>2.0 1.0</length>
56+
<position>0.0 2.0</position>
57+
<length>2.0 2.0</length>
5058
</refinement-2d>
51-
<expected-number-of-cells-in-patchs>4 8 8</expected-number-of-cells-in-patchs>
52-
<nodes-uid-hash>4f6e3623644ee01fd476f5f385a86d63</nodes-uid-hash>
53-
<faces-uid-hash>3810620acfbfdb8356e0ae1321d234b2</faces-uid-hash>
54-
<cells-uid-hash>c308bbf6b06bb6f83ffcaf9669286a77</cells-uid-hash>
59+
<expected-number-of-cells-in-patchs>4 4 4 4 4</expected-number-of-cells-in-patchs>
60+
<nodes-uid-hash>c162b8092f50639d0e8d83ef6439043e</nodes-uid-hash>
61+
<faces-uid-hash>a4b9d143dabca55819722e363022c00c</faces-uid-hash>
62+
<cells-uid-hash>b1a1189e7febabd5c2b0e3d0f1e91c57</cells-uid-hash>
5563
</a-m-r-cartesian-mesh-tester>
5664

5765
<arcane-protections-reprises>

‎arcane/ceapart/tests/testAMRCartesianMesh2D-PatchCartesianMeshOnly-4.arc

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<?xml version="1.0"?>
2+
<cas codename="ArcaneTest" xml:lang="fr" codeversion="1.0">
3+
<arcane>
4+
<titre>Test CartesianMesh 2D PatchCartesianMeshOnly (Variant 4)</titre>
5+
6+
<description>Test du raffinement d'un maillage cartesian 2D avec le type d'AMR PatchCartesianMeshOnly</description>
7+
8+
<boucle-en-temps>AMRCartesianMeshTestLoop</boucle-en-temps>
9+
10+
<modules>
11+
<module name="ArcanePostProcessing" active="true" />
12+
<module name="ArcaneCheckpoint" active="true" />
13+
</modules>
14+
15+
</arcane>
16+
17+
<arcane-post-traitement>
18+
<periode-sortie>1</periode-sortie>
19+
<depouillement>
20+
<variable>Density</variable>
21+
<variable>NodeDensity</variable>
22+
<groupe>AllCells</groupe>
23+
<groupe>AllNodes</groupe>
24+
<groupe>AllFacesDirection0</groupe>
25+
<groupe>AllFacesDirection1</groupe>
26+
</depouillement>
27+
</arcane-post-traitement>
28+
29+
30+
<maillage amr-type="3">
31+
<meshgenerator>
32+
<cartesian>
33+
<nsd>2 2</nsd>
34+
<origine>0.0 0.0</origine>
35+
<lx nx='2'>4.0</lx>
36+
<ly ny='2'>4.0</ly>
37+
</cartesian>
38+
</meshgenerator>
39+
</maillage>
40+
41+
<a-m-r-cartesian-mesh-tester>
42+
<renumber-patch-method>0</renumber-patch-method>
43+
<refinement-2d>
44+
<position>0.0 0.0</position>
45+
<length>4.0 2.0</length>
46+
</refinement-2d>
47+
<refinement-2d>
48+
<position>1.0 1.0</position>
49+
<length>2.0 1.0</length>
50+
</refinement-2d>
51+
<expected-number-of-cells-in-patchs>4 8 8</expected-number-of-cells-in-patchs>
52+
<nodes-uid-hash>4f6e3623644ee01fd476f5f385a86d63</nodes-uid-hash>
53+
<faces-uid-hash>3810620acfbfdb8356e0ae1321d234b2</faces-uid-hash>
54+
<cells-uid-hash>c308bbf6b06bb6f83ffcaf9669286a77</cells-uid-hash>
55+
</a-m-r-cartesian-mesh-tester>
56+
57+
<arcane-protections-reprises>
58+
<service-protection name="ArcaneBasic2CheckpointWriter" />
59+
</arcane-protections-reprises>
60+
</cas>

‎arcane/ceapart/tests/testAMRCartesianMesh3D-PatchCartesianMeshOnly-3.arc

+30-6
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,42 @@
4141

4242
<a-m-r-cartesian-mesh-tester>
4343
<renumber-patch-method>0</renumber-patch-method>
44+
<refinement-3d>
45+
<position>2.0 0.0 0.0</position>
46+
<length>2.0 2.0 2.0</length>
47+
</refinement-3d>
48+
<refinement-3d>
49+
<position>2.0 2.0 0.0</position>
50+
<length>2.0 2.0 2.0</length>
51+
</refinement-3d>
52+
<refinement-3d>
53+
<position>0.0 0.0 2.0</position>
54+
<length>2.0 2.0 2.0</length>
55+
</refinement-3d>
4456
<refinement-3d>
4557
<position>0.0 0.0 0.0</position>
46-
<length>4.0 4.0 4.0</length>
58+
<length>2.0 2.0 2.0</length>
59+
</refinement-3d>
60+
<refinement-3d>
61+
<position>0.0 2.0 0.0</position>
62+
<length>2.0 2.0 2.0</length>
63+
</refinement-3d>
64+
<refinement-3d>
65+
<position>2.0 0.0 2.0</position>
66+
<length>2.0 2.0 2.0</length>
67+
</refinement-3d>
68+
<refinement-3d>
69+
<position>0.0 2.0 2.0</position>
70+
<length>2.0 2.0 2.0</length>
4771
</refinement-3d>
4872
<refinement-3d>
49-
<position>1.0 1.0 1.0</position>
73+
<position>2.0 2.0 2.0</position>
5074
<length>2.0 2.0 2.0</length>
5175
</refinement-3d>
52-
<expected-number-of-cells-in-patchs>8 64 64</expected-number-of-cells-in-patchs>
53-
<nodes-uid-hash>2a94c530c6fc1e564f43fcdc26673d45</nodes-uid-hash>
54-
<faces-uid-hash>14bda59f9a744a38dd0a47eb32292df4</faces-uid-hash>
55-
<cells-uid-hash>a02bbff14ec87be39f4672a8cd936501</cells-uid-hash>
76+
<expected-number-of-cells-in-patchs>8 8 8 8 8 8 8 8 8</expected-number-of-cells-in-patchs>
77+
<nodes-uid-hash>bfa069f213eef90d389efa5c3ca0745d</nodes-uid-hash>
78+
<faces-uid-hash>5b12ac3a6d9ed116b024074cdef808c6</faces-uid-hash>
79+
<cells-uid-hash>1ee6fc646290a97f10cef6795ac106f0</cells-uid-hash>
5680
</a-m-r-cartesian-mesh-tester>
5781

5882
<arcane-protections-reprises>

‎arcane/ceapart/tests/testAMRCartesianMesh3D-PatchCartesianMeshOnly-4.arc

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<?xml version="1.0"?>
2+
<cas codename="ArcaneTest" xml:lang="fr" codeversion="1.0">
3+
<arcane>
4+
<titre>Test CartesianMesh 3D PatchCartesianMeshOnly (Variant 4)</titre>
5+
6+
<description>Test du raffinement d'un maillage cartesian 3D avec le type d'AMR PatchCartesianMeshOnly</description>
7+
8+
<boucle-en-temps>AMRCartesianMeshTestLoop</boucle-en-temps>
9+
10+
<modules>
11+
<module name="ArcanePostProcessing" active="true"/>
12+
<module name="ArcaneCheckpoint" active="true"/>
13+
</modules>
14+
15+
</arcane>
16+
17+
<arcane-post-traitement>
18+
<periode-sortie>1</periode-sortie>
19+
<depouillement>
20+
<variable>Density</variable>
21+
<variable>NodeDensity</variable>
22+
<groupe>AllCells</groupe>
23+
<groupe>AllNodes</groupe>
24+
<groupe>AMRPatchCells0</groupe>
25+
<groupe>AMRPatchCells1</groupe>
26+
<groupe>AMRPatchCells2</groupe>
27+
</depouillement>
28+
</arcane-post-traitement>
29+
30+
<maillage amr-type="3">
31+
<meshgenerator>
32+
<cartesian>
33+
<nsd>2 2 2</nsd>
34+
<origine>0.0 0.0 0.0</origine>
35+
<lx nx='2'>4.0</lx>
36+
<ly ny='2'>4.0</ly>
37+
<lz nz='2'>4.0</lz>
38+
</cartesian>
39+
</meshgenerator>
40+
</maillage>
41+
42+
<a-m-r-cartesian-mesh-tester>
43+
<renumber-patch-method>0</renumber-patch-method>
44+
<refinement-3d>
45+
<position>0.0 0.0 0.0</position>
46+
<length>4.0 4.0 4.0</length>
47+
</refinement-3d>
48+
<refinement-3d>
49+
<position>1.0 1.0 1.0</position>
50+
<length>2.0 2.0 2.0</length>
51+
</refinement-3d>
52+
<expected-number-of-cells-in-patchs>8 64 64</expected-number-of-cells-in-patchs>
53+
<nodes-uid-hash>2a94c530c6fc1e564f43fcdc26673d45</nodes-uid-hash>
54+
<faces-uid-hash>14bda59f9a744a38dd0a47eb32292df4</faces-uid-hash>
55+
<cells-uid-hash>a02bbff14ec87be39f4672a8cd936501</cells-uid-hash>
56+
</a-m-r-cartesian-mesh-tester>
57+
58+
<arcane-protections-reprises>
59+
<service-protection name="ArcaneBasic2CheckpointWriter"/>
60+
</arcane-protections-reprises>
61+
</cas>

0 commit comments

Comments
 (0)