From 4bc5d5cebbbd9e130f9c361f326dfcb8b9467ea7 Mon Sep 17 00:00:00 2001
From: Charles-Antoine Leger <ca@leger.email>
Date: Fri, 11 Oct 2024 09:47:04 +0200
Subject: [PATCH 1/2] fix[poisson]: update tests

---
 poisson/Test.L-shape.2D.nwcsr.arc  |  8 ++++----
 poisson/Test.L-shape.3D.nwcsr.arc  |  6 +++---
 poisson/Test.sphere.3D.csr-gpu.arc | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/poisson/Test.L-shape.2D.nwcsr.arc b/poisson/Test.L-shape.2D.nwcsr.arc
index 3584840..2c7eb0d 100644
--- a/poisson/Test.L-shape.2D.nwcsr.arc
+++ b/poisson/Test.L-shape.2D.nwcsr.arc
@@ -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>
 
@@ -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>
diff --git a/poisson/Test.L-shape.3D.nwcsr.arc b/poisson/Test.L-shape.3D.nwcsr.arc
index ba854da..6b05429 100644
--- a/poisson/Test.L-shape.3D.nwcsr.arc
+++ b/poisson/Test.L-shape.3D.nwcsr.arc
@@ -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>
 
@@ -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>
diff --git a/poisson/Test.sphere.3D.csr-gpu.arc b/poisson/Test.sphere.3D.csr-gpu.arc
index 5c45376..f966df1 100644
--- a/poisson/Test.sphere.3D.csr-gpu.arc
+++ b/poisson/Test.sphere.3D.csr-gpu.arc
@@ -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>
 
@@ -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>

From b1348141e4fc807eed334a0d62b8573fb01fbada Mon Sep 17 00:00:00 2001
From: Charles-Antoine Leger <ca@leger.email>
Date: Fri, 11 Oct 2024 10:19:41 +0200
Subject: [PATCH 2/2] test[poisson]: Add missing multi-proc tests

---
 poisson/CMakeLists.txt | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/poisson/CMakeLists.txt b/poisson/CMakeLists.txt
index 6a0b1dc..eb179df 100644
--- a/poisson/CMakeLists.txt
+++ b/poisson/CMakeLists.txt
@@ -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()