Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test[poisson]: Add missing multi-proc tests #173

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions poisson/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -104,22 +104,36 @@ if(FEMUTILS_HAS_SOLVER_BACKEND_PETSC)
add_test(NAME [poisson]porous COMMAND Poisson Test.porous.arc)
add_test(NAME [poisson]3D_Dirichlet_petsc_coo COMMAND Poisson Test.L-shape.3D.coo.arc)
add_test(NAME [poisson]3D_Dirichlet_petsc_coo-sort COMMAND Poisson Test.L-shape.3D.coo-sort.arc)
endif()

arcanefem_add_gpu_test(NAME [poisson]gpu COMMAND ./Poisson ARGS Test.petsc.arc)
arcanefem_add_gpu_test(NAME [poisson]L-shape_2D_petsc_coo-gpu COMMAND ./Poisson ARGS Test.L-shape.2D.coo-gpu.arc)
arcanefem_add_gpu_test(NAME [poisson]L-shape_3D_petsc_coo-gpu COMMAND ./Poisson ARGS Test.L-shape.3D.coo-gpu.arc)
arcanefem_add_gpu_test(NAME [poisson]L-shape_2D_nwcsr_gpu COMMAND ./Poisson ARGS Test.L-shape.2D.nwcsr.arc)
arcanefem_add_gpu_test(NAME [poisson]L-shape_3D_nwcsr_gpu COMMAND ./Poisson ARGS Test.L-shape.2D.nwcsr.arc)

if (FEMUTILS_HAS_PARALLEL_SOLVER)
add_test(NAME [poisson]L-shape_2D_petsc_coo_2pe COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Poisson Test.L-shape.2D.coo.arc)
add_test(NAME [poisson]L-shape_2D_petsc_coo-sort_2pe COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Poisson Test.L-shape.2D.coo-sort.arc)
add_test(NAME [poisson]3D_Dirichlet_petsc_coo_2pe COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Poisson Test.L-shape.3D.coo.arc)
add_test(NAME [poisson]3D_Dirichlet_petsc_coo-sort_2pe COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Poisson Test.L-shape.3D.coo-sort.arc)

arcanefem_add_gpu_test(NAME [poisson]L-shape_2D_petsc_coo-gpu_2pe NB_MPI 2 COMMAND ./Poisson ARGS Test.L-shape.2D.coo-gpu.arc)
arcanefem_add_gpu_test(NAME [poisson]L-shape_3D_petsc_coo-gpu_2pe NB_MPI 2 COMMAND ./Poisson ARGS Test.L-shape.3D.coo-gpu.arc)
arcanefem_add_gpu_test(NAME [poisson]L-shape_2D_nwcsr_gpu_2pe NB_MPI 2 COMMAND ./Poisson ARGS Test.L-shape.2D.nwcsr.arc)
arcanefem_add_gpu_test(NAME [poisson]L-shape_3D_nwcsr_gpu_2pe NB_MPI 2 COMMAND ./Poisson ARGS Test.L-shape.2D.nwcsr.arc)
endif()
endif()

arcanefem_add_gpu_test(NAME [poisson]gpu COMMAND ./Poisson ARGS Test.petsc.arc)
arcanefem_add_gpu_test(NAME [poisson]L-shape_2D_nwcsr_gpu COMMAND ./Poisson ARGS Test.L-shape.2D.nwcsr.arc)
arcanefem_add_gpu_test(NAME [poisson]L-shape_3D_nwcsr_gpu COMMAND ./Poisson ARGS Test.L-shape.2D.nwcsr.arc)
arcanefem_add_gpu_test(NAME [poisson]hypre_direct_3D_csr-gpu COMMAND ./Poisson ARGS Test.sphere.3D.csr-gpu.arc)
arcanefem_add_gpu_test(NAME [poisson]L-shape_2D_petsc_coo-gpu COMMAND ./Poisson ARGS Test.L-shape.2D.coo-gpu.arc)
arcanefem_add_gpu_test(NAME [poisson]L-shape_3D_petsc_coo-gpu COMMAND ./Poisson ARGS Test.L-shape.3D.coo-gpu.arc)
if(FEMUTILS_HAS_SOLVER_BACKEND_HYPRE)
arcanefem_add_gpu_test(NAME [poisson]hypre_direct_gpu COMMAND ./Poisson ARGS Test.hypre_direct.arc)
arcanefem_add_gpu_test(NAME [poisson]hypre_direct_3D_gpu COMMAND ./Poisson ARGS Test.sphere.3D.arc)
arcanefem_add_gpu_test(NAME [poisson]hypre_direct_3D_csr_noedge_gpu COMMAND ./Poisson ARGS Test.sphere.3D.csr.no-edge.arc)
arcanefem_add_gpu_test(NAME [poisson]hypre_direct_3D_csr-gpu COMMAND ./Poisson ARGS Test.sphere.3D.csr-gpu.arc)

if(FEMUTILS_HAS_PARALLEL_SOLVER)
arcanefem_add_gpu_test(NAME [poisson]hypre_direct_gpu_2pe NB_MPI 2 COMMAND ./Poisson ARGS Test.hypre_direct.arc)
arcanefem_add_gpu_test(NAME [poisson]hypre_direct_3D_gpu_2pe NB_MPI 2 COMMAND ./Poisson ARGS Test.sphere.3D.arc)
arcanefem_add_gpu_test(NAME [poisson]hypre_direct_3D_csr-gpu_2pe NB_MPI 2 COMMAND ./Poisson ARGS Test.sphere.3D.csr-gpu.arc)
endif()
endif()

Expand Down
8 changes: 4 additions & 4 deletions poisson/Test.L-shape.2D.nwcsr.arc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<case codename="Poisson" xml:lang="en" codeversion="1.0">
<arcane>
<title>L-shape 2D with CSR sparse matrix format Gpu compatible and node wise technique. The result of this test is compared with test_poisson_results.txt</title>
<title>L-shape 2D with CSR sparse matrix format Gpu compatible and node wise technique. The result of this test is compared with poisson_test_ref_L-shape-2D.txt</title>
<timeloop>PoissonLoop</timeloop>
</arcane>

Expand All @@ -21,11 +21,11 @@

<fem>
<nwcsr>true</nwcsr>
<result-file>test_poisson_results.txt</result-file>
<f>-1.0</f>
<result-file>poisson_test_ref_L-shape_2D.txt</result-file>
<f>-5.5</f>
<dirichlet-boundary-condition>
<surface>boundary</surface>
<value>0.0</value>
<value>0.5</value>
</dirichlet-boundary-condition>
</fem>
</case>
6 changes: 3 additions & 3 deletions poisson/Test.L-shape.3D.nwcsr.arc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<case codename="Poisson" xml:lang="en" codeversion="1.0">
<arcane>
<title>L-shape 3D with CSR sparse matrix format Gpu compatible and node wise technique. The result of this test is compared with test_poisson_results.txt</title>
<title>L-shape 3D with CSR sparse matrix format Gpu compatible and node wise technique. The result of this test is compared with poisson_test_ref_L-shape_3D.txt</title>
<timeloop>PoissonLoop</timeloop>
</arcane>

Expand All @@ -21,8 +21,8 @@

<fem>
<nwcsr>true</nwcsr>
<f>1.0</f>
<result-file>test_3D_L-shape_poisson.txt</result-file>
<f>5.5</f>
<result-file>poisson_test_ref_L-shape_3D.txt</result-file>
<mesh-type>TETRA4</mesh-type>
<dirichlet-boundary-condition>
<surface>bot</surface>
Expand Down
10 changes: 5 additions & 5 deletions poisson/Test.sphere.3D.csr-gpu.arc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<case codename="Poisson" xml:lang="en" codeversion="1.0">
<arcane>
<title>Sphere 3D with CSR sparse matrix format Gpu compatible. The result of this test is compared with test_sphere_3D_results.txt</title>
<title>Sphere 3D with CSR sparse matrix format Gpu compatible. The result of this test is compared with poisson_test_ref_sphere_3D.txt</title>
<timeloop>PoissonLoop</timeloop>
</arcane>

Expand All @@ -20,18 +20,18 @@
</meshes>

<fem>
<result-file>test_sphere_3D_results.txt</result-file>
<f>-0.01</f>
<result-file>poisson_test_ref_sphere_3D.txt</result-file>
<f>-0.035</f>
<mesh-type>TETRA4</mesh-type>
<enforce-Dirichlet-method>Penalty</enforce-Dirichlet-method>
<penalty>1.e31</penalty>
<dirichlet-boundary-condition>
<surface>sphere</surface>
<value>0.0</value>
<value>-5.5</value>
</dirichlet-boundary-condition>
<dirichlet-boundary-condition>
<surface>Cut</surface>
<value>10.0</value>
<value>50.0</value>
</dirichlet-boundary-condition>
<linear-system name="HypreLinearSystem">
<rtol>0.</rtol>
Expand Down