Skip to content

Commit 1bcd2f4

Browse files
mohd-afeef-badrimohd-afeef-badri
authored
Merge pull request #261 from arcaneframework/mab/uniform-test-names
uniform naming for ctest
2 parents c3588a9 + 0d3e409 commit 1bcd2f4

File tree

4 files changed

+36
-36
lines changed

4 files changed

+36
-36
lines changed

‎femutils/FemUtils.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ class Tensor2
621621
}
622622

623623
ARCCORE_HOST_DEVICE explicit Tensor2(const Real3x3& mat) {
624-
ARCANE_ASSERT(real3x3IsSym(mat), true);
624+
ARCANE_ASSERT(real3x3IsSym(mat), ("true"));
625625
for (Arcane::Int32 i = 0; i < 3; i++) m_vec(i) = mat[i][i];
626626
for (Arcane::Int32 i = 3; i < 5; i++) m_vec(i) = mat[0][i - 2];
627627
m_vec(5) = mat[1][2];
@@ -699,7 +699,7 @@ class Tensor2
699699

700700
//! Define the = operator
701701
ARCCORE_HOST_DEVICE Tensor2& operator=(const Real3x3& mat) {
702-
ARCANE_ASSERT(real3x3IsSym(mat), true);
702+
ARCANE_ASSERT(real3x3IsSym(mat), ("true"));
703703
for (Arcane::Int32 i = 0; i < 3; i++) m_vec(i) = mat[i][i];
704704
for (Arcane::Int32 i = 3; i < 5; i++) m_vec(i) = mat[0][i - 2];
705705
m_vec(5) = mat[1][2];

‎modules/acoustics/CMakeLists.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,26 +31,26 @@ target_link_libraries(Acoustics PUBLIC FemUtils)
3131

3232
enable_testing()
3333

34-
add_test(NAME [Acoustics]2D_submarine COMMAND Acoustics inputs/sub.arc)
35-
add_test(NAME [Acoustics]3D_sphere COMMAND Acoustics inputs/3d_sub.arc)
34+
add_test(NAME [acoustics]2D_submarine COMMAND Acoustics inputs/sub.arc)
35+
add_test(NAME [acoustics]3D_sphere COMMAND Acoustics inputs/3d_sub.arc)
3636

3737

3838
if(FEMUTILS_HAS_SOLVER_BACKEND_PETSC)
39-
add_test(NAME [Acoustics]parse_and_exit COMMAND Acoustics
39+
add_test(NAME [acoustics]parse_and_exit COMMAND Acoustics
4040
-A,//fem/assemble-linear-system=false
4141
-A,//fem/solve-linear-system=false
4242
-A,//fem/cross-validation=false
4343
inputs/sub.arc)
4444
endif()
4545

4646
if(FEMUTILS_HAS_SOLVER_BACKEND_HYPRE)
47-
add_test(NAME [Acoustics]2D_submarine_hypre COMMAND Acoustics inputs/sub.hypre.arc)
48-
add_test(NAME [Acoustics]3D_sphere_hypre COMMAND Acoustics
47+
add_test(NAME [acoustics]2D_submarine_hypre COMMAND Acoustics inputs/sub.hypre.arc)
48+
add_test(NAME [acoustics]3D_sphere_hypre COMMAND Acoustics
4949
-A,//fem/linear-system/@name=AlephLinearSystem
5050
-A,//fem/linear-system/solver-backend=hypre
5151
-A,//fem/linear-system/solver-method=gmres
5252
inputs/3d_sub.arc)
5353
if(FEMUTILS_HAS_PARALLEL_SOLVER AND MPIEXEC_EXECUTABLE)
54-
add_test(NAME [Acoustics]2D_submarine_hypre_2p COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Acoustics inputs/sub.hypre.arc)
54+
add_test(NAME [acoustics]2D_submarine_hypre_2p COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Acoustics inputs/sub.hypre.arc)
5555
endif()
5656
endif()

‎modules/fourier/CMakeLists.txt‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -65,58 +65,58 @@ endif()
6565
enable_testing()
6666

6767
if(FEMUTILS_HAS_SOLVER_BACKEND_PETSC)
68-
add_test(NAME [Fourier]conduction COMMAND Fourier
68+
add_test(NAME [fourier]conduction COMMAND Fourier
6969
inputs/conduction.arc)
70-
add_test(NAME [Fourier]conduction_heterogeneous COMMAND Fourier
70+
add_test(NAME [fourier]conduction_heterogeneous COMMAND Fourier
7171
inputs/conduction.heterogeneous.arc)
72-
add_test(NAME [Fourier]manufacture_solution COMMAND Fourier
72+
add_test(NAME [fourier]manufacture_solution COMMAND Fourier
7373
-A,UsingDotNet=1
7474
inputs/manufacture.solution.arc)
75-
add_test(NAME [Fourier]conduction_3D COMMAND Fourier
75+
add_test(NAME [fourier]conduction_3D COMMAND Fourier
7676
inputs/conduction.3D.arc)
77-
add_test(NAME [Fourier]conduction_boolean_3D COMMAND Fourier
77+
add_test(NAME [fourier]conduction_boolean_3D COMMAND Fourier
7878
inputs/conduction.boolean.3D.arc)
79-
add_test(NAME [Fourier]manufacture_solution_3D COMMAND Fourier
79+
add_test(NAME [fourier]manufacture_solution_3D COMMAND Fourier
8080
-A,UsingDotNet=1
8181
-A,//meshes/mesh/filename=meshes/bar_dynamic_3D.msh
8282
inputs/manufacture.solution.arc)
8383

84-
arcanefem_add_gpu_test(NAME [Fourier]conduction_petsc_bsr COMMAND ./Fourier ARGS
84+
arcanefem_add_gpu_test(NAME [fourier]conduction_petsc_bsr COMMAND ./Fourier ARGS
8585
-A,//fem/matrix-format=BSR
8686
inputs/conduction.arc)
8787

88-
arcanefem_add_gpu_test(NAME [Fourier]conduction_petsc_af-bsr COMMAND ./Fourier ARGS
88+
arcanefem_add_gpu_test(NAME [fourier]conduction_petsc_af-bsr COMMAND ./Fourier ARGS
8989
-A,//fem/matrix-format=AF-BSR
9090
inputs/conduction.arc)
9191

92-
arcanefem_add_gpu_test(NAME [Fourier]3d_conduction_petsc_bsr COMMAND ./Fourier ARGS
92+
arcanefem_add_gpu_test(NAME [fourier]3d_conduction_petsc_bsr COMMAND ./Fourier ARGS
9393
-A,//fem/matrix-format=BSR
9494
inputs/conduction.3D.arc)
9595

96-
arcanefem_add_gpu_test(NAME [Fourier]3d_conduction_petsc_af-bsr COMMAND ./Fourier ARGS
96+
arcanefem_add_gpu_test(NAME [fourier]3d_conduction_petsc_af-bsr COMMAND ./Fourier ARGS
9797
-A,//fem/matrix-format=AF-BSR
9898
inputs/conduction.3D.arc)
9999

100100
if(FEMUTILS_HAS_PARALLEL_SOLVER AND MPIEXEC_EXECUTABLE)
101-
add_test(NAME [Fourier]conduction_2p COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Fourier
101+
add_test(NAME [fourier]conduction_2p COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Fourier
102102
inputs/conduction.arc)
103-
add_test(NAME [Fourier]conduction_heterogeneous_2p COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Fourier
103+
add_test(NAME [fourier]conduction_heterogeneous_2p COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Fourier
104104
inputs/conduction.heterogeneous.arc)
105-
add_test(NAME [Fourier]manufacture_solution_2p COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Fourier
105+
add_test(NAME [fourier]manufacture_solution_2p COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Fourier
106106
-A,UsingDotNet=1
107107
inputs/manufacture.solution.arc)
108-
add_test(NAME [Fourier]conduction_heterogeneous_3D_2p COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Fourier
108+
add_test(NAME [fourier]conduction_heterogeneous_3D_2p COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Fourier
109109
inputs/conduction.pipe.3D.arc)
110-
add_test(NAME [Fourier]manufacture_solution_3D_2p COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Fourier
110+
add_test(NAME [fourier]manufacture_solution_3D_2p COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Fourier
111111
-A,UsingDotNet=1
112112
-A,//meshes/mesh/filename=meshes/bar_dynamic_3D.msh
113113
inputs/manufacture.solution.arc)
114114
if(FEMTEST_HAS_GMSH_TEST)
115-
add_test(NAME [Fourier]conduction_10k_2p COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Fourier
115+
add_test(NAME [fourier]conduction_10k_2p COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Fourier
116116
-A,//meshes/mesh/filename=meshes/plancher.10k.msh
117117
-A,//fem/cross-validation=false
118118
inputs/conduction.arc)
119-
add_test(NAME [Fourier]conduction_heterogeneous_10k_2p COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Fourier
119+
add_test(NAME [fourier]conduction_heterogeneous_10k_2p COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Fourier
120120
-A,//meshes/mesh/filename=meshes//multi-material.10k.msh
121121
-A,//fem/cross-validation=false
122122
inputs/conduction.heterogeneous.arc)
@@ -131,22 +131,22 @@ if(FEMUTILS_HAS_SOLVER_BACKEND_HYPRE)
131131
-A,//fem/linear-system/atol=1e-9
132132
-A,//fem/linear-system/rtol=0)
133133

134-
arcanefem_add_gpu_test(NAME [Fourier]conduction_hypre_bsr COMMAND ./Fourier ARGS
134+
arcanefem_add_gpu_test(NAME [fourier]conduction_hypre_bsr COMMAND ./Fourier ARGS
135135
-A,//fem/matrix-format=BSR
136136
${SOLVER_HYPRE_CG}
137137
inputs/conduction.arc)
138138

139-
arcanefem_add_gpu_test(NAME [Fourier]conduction_hypre_af-bsr COMMAND ./Fourier ARGS
139+
arcanefem_add_gpu_test(NAME [fourier]conduction_hypre_af-bsr COMMAND ./Fourier ARGS
140140
-A,//fem/matrix-format=AF-BSR
141141
${SOLVER_HYPRE_CG}
142142
inputs/conduction.arc)
143143

144-
arcanefem_add_gpu_test(NAME [Fourier]3d_conduction_hypre_bsr COMMAND ./Fourier ARGS
144+
arcanefem_add_gpu_test(NAME [fourier]3d_conduction_hypre_bsr COMMAND ./Fourier ARGS
145145
-A,//fem/matrix-format=BSR
146146
${SOLVER_HYPRE_CG}
147147
inputs/conduction.3D.arc)
148148

149-
arcanefem_add_gpu_test(NAME [Fourier]3d_conduction_hypre_af-bsr COMMAND ./Fourier ARGS
149+
arcanefem_add_gpu_test(NAME [fourier]3d_conduction_hypre_af-bsr COMMAND ./Fourier ARGS
150150
-A,//fem/matrix-format=AF-BSR
151151
${SOLVER_HYPRE_CG}
152152
inputs/conduction.3D.arc)

‎modules/passmonl/CMakeLists.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ configure_file(${MSH_DIR}/bar_dynamic_3Dhexa.msh ${CMAKE_CURRENT_BINARY_DIR} COP
4747
# add_test(NAME [passmonl]bar3D_H8 COMMAND Passmonl bar3d_hexa.arc)
4848
#endif ()
4949

50-
if(FEMUTILS_HAS_PARALLEL_SOLVER AND MPIEXEC_EXECUTABLE)
51-
add_test(NAME [passmonl]bar2D_T3_2pu COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Passmonl bar2d_tria.arc)
52-
add_test(NAME [passmonl]bar2D_Q4_2pu COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Passmonl bar2d_quad.arc)
53-
add_test(NAME [passmonl]bar2D_T3-Q4_2pu COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Passmonl bar2d_tria_quad.arc)
54-
add_test(NAME [passmonl]bar3D_T4_2pu COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Passmonl bar3d_tetra.arc)
55-
add_test(NAME [passmonl]bar3D_H8_2pu COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Passmonl bar3d_hexa.arc)
56-
endif()
50+
#if(FEMUTILS_HAS_PARALLEL_SOLVER AND MPIEXEC_EXECUTABLE)
51+
# add_test(NAME [passmonl]bar2D_T3_2pu COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Passmonl bar2d_tria.arc)
52+
# add_test(NAME [passmonl]bar2D_Q4_2pu COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Passmonl bar2d_quad.arc)
53+
# add_test(NAME [passmonl]bar2D_T3-Q4_2pu COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Passmonl bar2d_tria_quad.arc)
54+
# add_test(NAME [passmonl]bar3D_T4_2pu COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Passmonl bar3d_tetra.arc)
55+
# add_test(NAME [passmonl]bar3D_H8_2pu COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Passmonl bar3d_hexa.arc)
56+
# endif()

0 commit comments

Comments
 (0)