Skip to content

Commit cc1113a

Browse files
mohd-afeef-badrimohd-afeef-badri
authored
Merge pull request #331 from arcaneframework/mab/elasticity-test-rename
test consistant naming for solution files
2 parents d6e89e0 + 07db1f0 commit cc1113a

17 files changed

+56
-56
lines changed

‎modules/elasticity/CMakeLists.txt‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -45,63 +45,63 @@ if(FEMUTILS_HAS_SOLVER_BACKEND_PETSC)
4545
-A,//fem/petsc-flags=-ksp_monitor\ -ksp_type\ gmres\ -pc_type\ bjacobi\ -ksp_rtol\ 1e-15)
4646

4747
add_test(NAME [elasticity]Dirichlet COMMAND Elasticity
48-
-A,//fem/solution-comparison-file=check/test_elasticity_results.txt
49-
inputs/bar.2D.arc)
48+
-A,//fem/solution-comparison-file=check/bar.2D.Dirichlet.bodyForce.txt
49+
inputs/bar.2D.Dirichlet.bodyForce.arc)
5050

5151
add_test(NAME [elasticity]Dirichlet_quad COMMAND Elasticity
52-
-A,//fem/solution-comparison-file=check/dirichlet.quad.txt
53-
inputs/bar.2D.quad.arc)
52+
-A,//fem/solution-comparison-file=check/bar.2D.Dirichlet.bodyForce.quad.txt
53+
inputs/bar.2D.Dirichlet.bodyForce.quad.arc)
5454

5555
add_test(NAME [elasticity]Dirichlet_traction COMMAND Elasticity
56-
-A,//fem/solution-comparison-file=check/elasticity_traction_bar_test_ref.txt
57-
inputs/bar.2D.traction.arc)
56+
-A,//fem/solution-comparison-file=check/bar.2D.Dirichlet.traction.txt
57+
inputs/bar.2D.Dirichlet.traction.arc)
5858

5959
add_test(NAME [elasticity]Dirichlet_pointBC COMMAND Elasticity
60-
-A,//fem/solution-comparison-file=check/elasticity_point-dirichlet_bar_test_ref.txt
61-
inputs/bar.2D.PointDirichlet.arc)
60+
-A,//fem/solution-comparison-file=check/bar.2D.PointDirichlet.Dirichlet.bodyForce.txt
61+
inputs/bar.2D.PointDirichlet.Dirichlet.bodyForce.arc)
6262

6363
add_test(NAME [elasticity]Dirichlet_pointBC_via_RowElimination COMMAND Elasticity
64-
-A,//fem/solution-comparison-file=check/elasticity_point-dirichlet_bar_test_ref.txt
64+
-A,//fem/solution-comparison-file=check/bar.2D.PointDirichlet.Dirichlet.bodyForce.txt
6565
-A,//fem/boundary-conditions/dirichlet[1]/enforce-Dirichlet-method=RowElimination
6666
-A,//fem/boundary-conditions/dirichlet[2]/enforce-Dirichlet-method=RowElimination
6767
-A,//fem/boundary-conditions/dirichlet-point[1]/enforce-Dirichlet-method=RowElimination
6868
-A,//fem/boundary-conditions/dirichlet-point[2]/enforce-Dirichlet-method=RowElimination
6969
${SOLVER_PETSC_GMRES}
70-
inputs/bar.2D.PointDirichlet.arc)
70+
inputs/bar.2D.PointDirichlet.Dirichlet.bodyForce.arc)
7171

7272
add_test(NAME [elasticity]Dirichlet_pointBC_via_RowColElimination COMMAND Elasticity
73-
-A,//fem/solution-comparison-file=check/elasticity_point-dirichlet_bar_test_ref.txt
73+
-A,//fem/solution-comparison-file=check/bar.2D.PointDirichlet.Dirichlet.bodyForce.txt
7474
-A,//fem/boundary-conditions/dirichlet[1]/enforce-Dirichlet-method=RowColumnElimination
7575
-A,//fem/boundary-conditions/dirichlet[2]/enforce-Dirichlet-method=RowColumnElimination
7676
-A,//fem/boundary-conditions/dirichlet-point[1]/enforce-Dirichlet-method=RowColumnElimination
7777
-A,//fem/boundary-conditions/dirichlet-point[2]/enforce-Dirichlet-method=RowColumnElimination
78-
inputs/bar.2D.PointDirichlet.arc)
78+
inputs/bar.2D.PointDirichlet.Dirichlet.bodyForce.arc)
7979

8080
add_test(NAME [elasticity]Dirichlet_via_RowElimination COMMAND Elasticity
81-
-A,//fem/solution-comparison-file=check/test_elasticity_results.txt
81+
-A,//fem/solution-comparison-file=check/bar.2D.Dirichlet.bodyForce.txt
8282
-A,//fem/boundary-conditions/dirichlet/enforce-Dirichlet-method=RowElimination
8383
${SOLVER_PETSC_GMRES}
84-
inputs/bar.2D.arc)
84+
inputs/bar.2D.Dirichlet.bodyForce.arc)
8585

8686
add_test(NAME [elasticity]Dirichlet_via_RowColElimination COMMAND Elasticity
87-
-A,//fem/solution-comparison-file=check/test_elasticity_results.txt
87+
-A,//fem/solution-comparison-file=check/bar.2D.Dirichlet.bodyForce.txt
8888
-A,//fem/boundary-conditions/dirichlet/enforce-Dirichlet-method=RowColumnElimination
89-
inputs/bar.2D.arc)
89+
inputs/bar.2D.Dirichlet.bodyForce.arc)
9090

9191
add_test(NAME [elasticity]Dirichlet_bodyforce_quad COMMAND Elasticity
92-
-A,//fem/solution-comparison-file=check/dirichlet_bodyforce.quad.txt
92+
-A,//fem/solution-comparison-file=check/2D.dirichlet.bodyforce.quad.txt
9393
inputs/2D.dirichlet.bodyforce.quad.arc)
9494

9595
add_test(NAME [elasticity]Dirichlet_traction_bodyforce_quad COMMAND Elasticity
96-
-A,//fem/solution-comparison-file=check/dirichlet_traction_bodyforce.quad.txt
96+
-A,//fem/solution-comparison-file=check/2D.dirichlet.traction.bodyforce.quad.txt
9797
inputs/2D.dirichlet.traction.bodyforce.quad.arc)
9898

9999
add_test(NAME [elasticity]Dirichlet_traction_bodyforce COMMAND Elasticity
100-
-A,//fem/solution-comparison-file=check/elasticity_traction_bodyforce_bar_test_ref.txt
100+
-A,//fem/solution-comparison-file=check/bar.2D.traction.bodyforce.txt
101101
inputs/bar.2D.traction.bodyforce.arc)
102102

103103
add_test(NAME [elasticity]2D_Dirichlet_traction_bodyforce_quad COMMAND Elasticity
104-
-A,//fem/solution-comparison-file=check/elasticity_traction_bodyforce_bar.quad.txt
104+
-A,//fem/solution-comparison-file=check/bar.2D.traction.bodyforce.quad.txt
105105
inputs/bar.2D.traction.bodyforce.quad.arc)
106106

107107
add_test(NAME [elasticity]2D_Dirichlet_cartesian COMMAND Elasticity
@@ -111,78 +111,78 @@ if(FEMUTILS_HAS_SOLVER_BACKEND_PETSC)
111111
add_test(NAME [elasticity]bar_parse_and_exit COMMAND Elasticity
112112
-A,//fem/assemble-linear-system=false
113113
-A,//fem/solve-linear-system=false
114-
inputs/bar.2D.arc)
114+
inputs/bar.2D.Dirichlet.bodyForce.arc)
115115

116116
add_test(NAME [elasticity]3D_Dirichlet_cartesian COMMAND Elasticity
117117
-A,//fem/solution-comparison-file=check/bar.3D.cartesian.Dirichlet.bodyForce.txt
118118
inputs/bar.3D.cartesian.Dirichlet.bodyForce.arc)
119119

120120
add_test(NAME [elasticity]3D_Dirichlet_bodyforce_hexa COMMAND Elasticity
121-
-A,//fem/solution-comparison-file=check/3D_dirichlet_bodyforce.hexa.txt
121+
-A,//fem/solution-comparison-file=check/3D.dirichlet.bodyforce.hexa.txt
122122
inputs/3D.dirichlet.bodyforce.hexa.arc)
123123

124124
add_test(NAME [elasticity]3D_Dirichlet_traction_bodyforce_hexa COMMAND Elasticity
125-
-A,//fem/solution-comparison-file=check/3D_dirichlet_traction_bodyforce.hexa.txt
125+
-A,//fem/solution-comparison-file=check/3D.dirichlet.traction.bodyforce.hexa.txt
126126
inputs/3D.dirichlet.traction.bodyforce.hexa.arc)
127127

128128
add_test(NAME [elasticity]3D_Dirichlet_bodyforce_subdivider COMMAND Elasticity ARGS
129129
-A,//meshes/mesh/subdivider/nb-subdivision=2
130130
inputs/bar.3D.Dirichlet.bodyForce.arc)
131131

132132
arcanefem_add_gpu_test(NAME [elasticity]Dirichlet_pointBC_bsr COMMAND ./Elasticity ARGS
133-
-A,//fem/solution-comparison-file=check/3D_dirichlet_bodyforce_test_ref.txt
133+
-A,//fem/solution-comparison-file=check/bar.3D.Dirichlet.bodyForce.txt
134134
-A,//fem/matrix-format=BSR
135135
inputs/bar.3D.Dirichlet.bodyForce.arc)
136136

137137
arcanefem_add_gpu_test(NAME [elasticity]3D_Dirichlet_bodyforce_bsr COMMAND ./Elasticity ARGS
138-
-A,//fem/solution-comparison-file=check/3D_dirichlet_bodyforce_test_ref.txt
138+
-A,//fem/solution-comparison-file=check/bar.3D.Dirichlet.bodyForce.txt
139139
-A,//fem/matrix-format=BSR
140140
inputs/bar.3D.Dirichlet.bodyForce.arc)
141141

142142
arcanefem_add_gpu_test(NAME [elasticity]3D_Dirichlet_bodyforce_af-bsr COMMAND ./Elasticity ARGS
143-
-A,//fem/solution-comparison-file=check/3D_dirichlet_bodyforce_test_ref.txt
143+
-A,//fem/solution-comparison-file=check/bar.3D.Dirichlet.bodyForce.txt
144144
-A,//fem/matrix-format=AF-BSR
145145
inputs/bar.3D.Dirichlet.bodyForce.arc)
146146

147147
arcanefem_add_gpu_test(NAME [elasticity]Dirichlet_traction_bsr COMMAND ./Elasticity ARGS
148-
-A,//fem/solution-comparison-file=check/elasticity_traction_bar_test_ref.txt
148+
-A,//fem/solution-comparison-file=check/bar.2D.Dirichlet.traction.txt
149149
-A,//fem/matrix-format=BSR
150-
inputs/bar.2D.traction.arc)
150+
inputs/bar.2D.Dirichlet.traction.arc)
151151

152152
arcanefem_add_gpu_test(NAME [elasticity]Dirichlet_traction_bodyforce_bsr COMMAND ./Elasticity ARGS
153-
-A,//fem/solution-comparison-file=check/elasticity_traction_bodyforce_bar_test_ref.txt
153+
-A,//fem/solution-comparison-file=check/bar.2D.traction.bodyforce.txt
154154
-A,//fem/matrix-format=BSR
155155
inputs/bar.2D.traction.bodyforce.arc)
156156

157157
arcanefem_add_gpu_test(NAME [elasticity]Dirichlet_traction_bodyforce_af-bsr COMMAND ./Elasticity ARGS
158-
-A,//fem/solution-comparison-file=check/elasticity_traction_bodyforce_bar_test_ref.txt
158+
-A,//fem/solution-comparison-file=check/bar.2D.traction.bodyforce.txt
159159
-A,//fem/matrix-format=AF-BSR
160160
inputs/bar.2D.traction.bodyforce.arc)
161161

162162
if(FEMUTILS_HAS_PARALLEL_SOLVER)
163163
add_test(NAME [elasticity]Dirichlet_2p COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Elasticity
164-
-A,//fem/solution-comparison-file=check/test_elasticity_results.txt
165-
inputs/bar.2D.arc)
164+
-A,//fem/solution-comparison-file=check/bar.2D.Dirichlet.bodyForce.txt
165+
inputs/bar.2D.Dirichlet.bodyForce.arc)
166166

167167
add_test(NAME [elasticity]Dirichlet_quad_2p COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Elasticity
168-
-A,//fem/solution-comparison-file=check/dirichlet.quad.txt
169-
inputs/bar.2D.quad.arc)
168+
-A,//fem/solution-comparison-file=check/bar.2D.Dirichlet.bodyForce.quad.txt
169+
inputs/bar.2D.Dirichlet.bodyForce.quad.arc)
170170

171171
add_test(NAME [elasticity]Dirichlet_via_RowElimination_2p COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Elasticity
172-
-A,//fem/solution-comparison-file=check/test_elasticity_results.txt
172+
-A,//fem/solution-comparison-file=check/bar.2D.Dirichlet.bodyForce.txt
173173
-A,//fem/boundary-conditions/dirichlet/enforce-Dirichlet-method=RowElimination
174174
${SOLVER_PETSC_GMRES}
175-
inputs/bar.2D.arc)
175+
inputs/bar.2D.Dirichlet.bodyForce.arc)
176176

177177
add_test(NAME [elasticity]Dirichlet_RowColumnElim_quad_2p COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Elasticity
178-
-A,//fem/solution-comparison-file=check/dirichlet.quad.txt
178+
-A,//fem/solution-comparison-file=check/bar.2D.Dirichlet.bodyForce.quad.txt
179179
-A,//fem/boundary-conditions/dirichlet/enforce-Dirichlet-method=RowColumnElimination
180-
inputs/bar.2D.quad.arc)
180+
inputs/bar.2D.Dirichlet.bodyForce.quad.arc)
181181

182182
add_test(NAME [elasticity]Dirichlet_via_RowColElimination_2p COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Elasticity
183-
-A,//fem/solution-comparison-file=check/test_elasticity_results.txt
183+
-A,//fem/solution-comparison-file=check/bar.2D.Dirichlet.bodyForce.txt
184184
-A,//fem/boundary-conditions/dirichlet/enforce-Dirichlet-method=RowColumnElimination
185-
inputs/bar.2D.arc)
185+
inputs/bar.2D.Dirichlet.bodyForce.arc)
186186

187187
add_test(NAME [elasticity]Dirichlet_cartesian_2p COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Elasticity
188188
-A,//fem/solution-comparison-file=check/bar.2D.cartesian.Dirichlet.bodyForce.txt
@@ -222,70 +222,70 @@ if(FEMUTILS_HAS_SOLVER_BACKEND_HYPRE)
222222
inputs/bar.3D.Dirichlet.traction.bodyForce.arc)
223223

224224
arcanefem_add_gpu_test(NAME [elasticity]3D_Dirichlet_bodyforce_hypre_bsr COMMAND ./Elasticity ARGS
225-
-A,//fem/solution-comparison-file=check/3D_dirichlet_bodyforce_test_ref.txt
225+
-A,//fem/solution-comparison-file=check/bar.3D.Dirichlet.bodyForce.txt
226226
-A,//fem/matrix-format=BSR
227227
${SOLVER_HYPRE_CG}
228228
inputs/bar.3D.Dirichlet.bodyForce.arc)
229229

230230
arcanefem_add_gpu_test(NAME [elasticity]3D_Dirichlet_bodyforce_hypre_af-bsr COMMAND ./Elasticity ARGS
231-
-A,//fem/solution-comparison-file=check/3D_dirichlet_bodyforce_test_ref.txt
231+
-A,//fem/solution-comparison-file=check/bar.3D.Dirichlet.bodyForce.txt
232232
-A,//fem/matrix-format=AF-BSR
233233
${SOLVER_HYPRE_CG}
234234
inputs/bar.3D.Dirichlet.bodyForce.arc)
235235

236236
arcanefem_add_gpu_test(NAME [elasticity]3D_sphere_Dirichlet_bodyforce_hypre_af-bsr COMMAND ./Elasticity ARGS
237237
-A,//fem/matrix-format=AF-BSR
238238
${SOLVER_HYPRE_CG}
239-
inputs/bar.3D.sphere.Dirichlet.bodyForce.arc)
239+
inputs/3D.sphere.dirichlet.traction.bodyforce.tetra.arc)
240240

241241
arcanefem_add_gpu_test(NAME [elasticity]Dirichlet_pointBC_RowElimination_bsr COMMAND ./Elasticity ARGS
242-
-A,//fem/solution-comparison-file=check/elasticity_point-dirichlet_bar_test_ref.txt
242+
-A,//fem/solution-comparison-file=check/bar.2D.PointDirichlet.Dirichlet.bodyForce.txt
243243
-A,//fem/matrix-format=BSR
244244
${SOLVER_HYPRE_BICGSTAB}
245245
-A,//fem/boundary-conditions/dirichlet[1]/enforce-Dirichlet-method=RowElimination
246246
-A,//fem/boundary-conditions/dirichlet[2]/enforce-Dirichlet-method=RowElimination
247247
-A,//fem/boundary-conditions/dirichlet-point[1]/enforce-Dirichlet-method=RowElimination
248248
-A,//fem/boundary-conditions/dirichlet-point[2]/enforce-Dirichlet-method=RowElimination
249-
inputs/bar.2D.PointDirichlet.arc)
249+
inputs/bar.2D.PointDirichlet.Dirichlet.bodyForce.arc)
250250

251251
arcanefem_add_gpu_test(NAME [elasticity]Dirichlet_pointBC_RowElimination_af-bsr COMMAND ./Elasticity ARGS
252-
-A,//fem/solution-comparison-file=check/elasticity_point-dirichlet_bar_test_ref.txt
252+
-A,//fem/solution-comparison-file=check/bar.2D.PointDirichlet.Dirichlet.bodyForce.txt
253253
-A,//fem/matrix-format=AF-BSR
254254
${SOLVER_HYPRE_BICGSTAB}
255255
-A,//fem/boundary-conditions/dirichlet[1]/enforce-Dirichlet-method=RowElimination
256256
-A,//fem/boundary-conditions/dirichlet[2]/enforce-Dirichlet-method=RowElimination
257257
-A,//fem/boundary-conditions/dirichlet-point[1]/enforce-Dirichlet-method=RowElimination
258258
-A,//fem/boundary-conditions/dirichlet-point[2]/enforce-Dirichlet-method=RowElimination
259-
inputs/bar.2D.PointDirichlet.arc)
259+
inputs/bar.2D.PointDirichlet.Dirichlet.bodyForce.arc)
260260

261261
arcanefem_add_gpu_test(NAME [elasticity]Dirichlet_pointBC_RowColElimination_af-bsr COMMAND ./Elasticity ARGS
262-
-A,//fem/solution-comparison-file=check/elasticity_point-dirichlet_bar_test_ref.txt
262+
-A,//fem/solution-comparison-file=check/bar.2D.PointDirichlet.Dirichlet.bodyForce.txt
263263
-A,//fem/matrix-format=AF-BSR
264264
${SOLVER_HYPRE_GMRES}
265265
-A,//fem/boundary-conditions/dirichlet[1]/enforce-Dirichlet-method=RowColumnElimination
266266
-A,//fem/boundary-conditions/dirichlet[2]/enforce-Dirichlet-method=RowColumnElimination
267267
-A,//fem/boundary-conditions/dirichlet-point[1]/enforce-Dirichlet-method=RowColumnElimination
268268
-A,//fem/boundary-conditions/dirichlet-point[2]/enforce-Dirichlet-method=RowColumnElimination
269-
inputs/bar.2D.PointDirichlet.arc)
269+
inputs/bar.2D.PointDirichlet.Dirichlet.bodyForce.arc)
270270

271271
arcanefem_add_gpu_test(NAME [elasticity]Dirichlet_pointBC_hypre_bsr COMMAND ./Elasticity ARGS
272-
-A,//fem/solution-comparison-file=check/elasticity_point-dirichlet_bar_test_ref.txt
272+
-A,//fem/solution-comparison-file=check/bar.2D.PointDirichlet.Dirichlet.bodyForce.txt
273273
-A,//fem/matrix-format=BSR
274274
${SOLVER_HYPRE_CG}
275275
-A,//fem/boundary-conditions/dirichlet[1]/enforce-Dirichlet-method=Penalty
276276
-A,//fem/boundary-conditions/dirichlet[2]/enforce-Dirichlet-method=Penalty
277277
-A,//fem/boundary-conditions/dirichlet-point[1]/enforce-Dirichlet-method=Penalty
278278
-A,//fem/boundary-conditions/dirichlet-point[2]/enforce-Dirichlet-method=Penalty
279-
inputs/bar.2D.PointDirichlet.arc)
279+
inputs/bar.2D.PointDirichlet.Dirichlet.bodyForce.arc)
280280

281281
arcanefem_add_gpu_test(NAME [elasticity]Dirichlet_traction_bsr_hypre COMMAND ./Elasticity ARGS
282-
-A,//fem/solution-comparison-file=check/elasticity_traction_bar_test_ref.txt
282+
-A,//fem/solution-comparison-file=check/bar.2D.Dirichlet.traction.txt
283283
-A,//fem/matrix-format=BSR
284284
${SOLVER_HYPRE_CG}
285-
inputs/bar.2D.traction.arc)
285+
inputs/bar.2D.Dirichlet.traction.arc)
286286

287287
arcanefem_add_gpu_test(NAME [elasticity]Dirichlet_traction_bodyforce_af-bsr_hypre COMMAND ./Elasticity ARGS
288-
-A,//fem/solution-comparison-file=check/elasticity_traction_bodyforce_bar_test_ref.txt
288+
-A,//fem/solution-comparison-file=check/bar.2D.traction.bodyforce.txt
289289
-A,//fem/matrix-format=AF-BSR
290290
${SOLVER_HYPRE_CG}
291291
inputs/bar.2D.traction.bodyforce.arc)

modules/elasticity/check/dirichlet_bodyforce.quad.txt renamed to modules/elasticity/check/2D.dirichlet.bodyforce.quad.txt

File renamed without changes.

modules/elasticity/check/dirichlet_traction_bodyforce.quad.txt renamed to modules/elasticity/check/2D.dirichlet.traction.bodyforce.quad.txt

File renamed without changes.

modules/elasticity/check/3D_dirichlet_bodyforce.hexa.txt renamed to modules/elasticity/check/3D.dirichlet.bodyforce.hexa.txt

File renamed without changes.

modules/elasticity/check/3D_dirichlet_traction_bodyforce.hexa.txt renamed to modules/elasticity/check/3D.dirichlet.traction.bodyforce.hexa.txt

File renamed without changes.

modules/elasticity/check/dirichlet.quad.txt renamed to modules/elasticity/check/bar.2D.Dirichlet.bodyForce.quad.txt

File renamed without changes.

modules/elasticity/check/test_elasticity_results.txt renamed to modules/elasticity/check/bar.2D.Dirichlet.bodyForce.txt

File renamed without changes.

modules/elasticity/check/elasticity_traction_bar_test_ref.txt renamed to modules/elasticity/check/bar.2D.Dirichlet.traction.txt

File renamed without changes.

modules/elasticity/check/elasticity_point-dirichlet_bar_test_ref.txt renamed to modules/elasticity/check/bar.2D.PointDirichlet.Dirichlet.bodyForce.txt

File renamed without changes.

modules/elasticity/check/elasticity_traction_bodyforce_bar.quad.txt renamed to modules/elasticity/check/bar.2D.traction.bodyforce.quad.txt

File renamed without changes.

0 commit comments

Comments
 (0)