Skip to content

Commit 0432e81

Browse files
bmhan12bmhan12
authored
Merge branch 'develop' into feature/han12/docker_updates
2 parents 7863173 + 798a88c commit 0432e81

6 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎src/axom/quest/examples/CMakeLists.txt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ if(AXOM_ENABLE_MPI AND MFEM_FOUND AND MFEM_USE_MPI
165165
COMMAND quest_shaping_driver_ex
166166
-i ${shaping_data_dir}/circles.yaml
167167
--method sampling
168-
inline_mesh --min -6 -6 --max 6 6 --res 25 25 -d 2
168+
inline_mesh --min -6 -6 --max 6 6 --resolution 25 25 -d 2
169169
NUM_MPI_TASKS ${_nranks})
170170
# Analytic area for annulus w/ outer/inner radii 5 and 2.5 is ~58.905
171171
set_tests_properties(${_testname} PROPERTIES
@@ -177,7 +177,7 @@ if(AXOM_ENABLE_MPI AND MFEM_FOUND AND MFEM_USE_MPI
177177
COMMAND quest_shaping_driver_ex
178178
-i ${shaping_data_dir}/circles_opposite.yaml
179179
--method sampling
180-
inline_mesh --min -6 -6 --max 6 6 --res 25 25 -d 2
180+
inline_mesh --min -6 -6 --max 6 6 --resolution 25 25 -d 2
181181
NUM_MPI_TASKS ${_nranks})
182182
# Analytic area for annulus w/ outer/inner radii 5 and 2.5 is ~65.97
183183
set_tests_properties(${_testname} PROPERTIES
@@ -190,7 +190,7 @@ if(AXOM_ENABLE_MPI AND MFEM_FOUND AND MFEM_USE_MPI
190190
-i ${shaping_data_dir}/balls_and_jacks.yaml
191191
--method sampling
192192
--background-material air
193-
inline_mesh --min -10 0 --max 60 50 --res 25 25 -d 2
193+
inline_mesh --min -10 0 --max 60 50 --resolution 25 25 -d 2
194194
NUM_MPI_TASKS ${_nranks})
195195
# background: 3500; balls: ~373; jacks: ~230; air ~2897
196196
set_tests_properties(${_testname} PROPERTIES
@@ -203,7 +203,7 @@ if(AXOM_ENABLE_MPI AND MFEM_FOUND AND MFEM_USE_MPI
203203
-i ${shaping_data_dir}/ball_impact.yaml
204204
--method sampling
205205
--background-material air
206-
inline_mesh --min -10 0 --max 40 30 --res 25 25 -d 2
206+
inline_mesh --min -10 0 --max 40 30 --resolution 25 25 -d 2
207207
NUM_MPI_TASKS ${_nranks})
208208
# steel ball: semi-cirle of radius 5.5 has area ~47.516
209209
set_tests_properties(${_testname} PROPERTIES
@@ -217,7 +217,7 @@ if(AXOM_ENABLE_MPI AND MFEM_FOUND AND MFEM_USE_MPI
217217
-i ${shaping_data_dir}/ball_impact.yaml
218218
--method sampling
219219
--background-material air
220-
inline_mesh --min -30 -30 -10 --max 30 30 40 --res 16 16 16 -d3
220+
inline_mesh --min -30 -30 -10 --max 30 30 40 --resolution 16 16 16 -d3
221221
NUM_MPI_TASKS ${_nranks})
222222
# steel ball: cirle of radius 5.5 has analytic volume ~696.91
223223
set_tests_properties(${_testname} PROPERTIES
@@ -231,7 +231,7 @@ if(AXOM_ENABLE_MPI AND MFEM_FOUND AND MFEM_USE_MPI
231231
COMMAND quest_shaping_driver_ex
232232
-i ${shaping_data_dir}/flat_star.yaml
233233
--method intersection
234-
inline_mesh --min 0 0 --max 1 1 --res 4 4 -d 2
234+
inline_mesh --min 0 0 --max 1 1 --resolution 4 4 -d 2
235235
NUM_MPI_TASKS ${_nranks})
236236
# steel triangle: star composed of 16 right triangles with
237237
# leg length 0.25 has analytic volume 0.5
@@ -265,7 +265,7 @@ if(AXOM_ENABLE_MPI AND MFEM_FOUND AND MFEM_USE_MPI
265265
--policy ${_policy}
266266
--segments-per-knot-span 50
267267
--method intersection
268-
inline_mesh --min 0 0 --max 3 3 --res 3 3 -d 2
268+
inline_mesh --min 0 0 --max 3 3 --resolution 3 3 -d 2
269269
NUM_MPI_TASKS ${_nranks}
270270
NUM_OMP_THREADS ${_num_threads})
271271
# steel unit semi-circle with an area of pi/2
@@ -283,7 +283,7 @@ if(AXOM_ENABLE_MPI AND MFEM_FOUND AND MFEM_USE_MPI
283283
COMMAND quest_shaping_driver_ex
284284
-i ${shaping_data_dir}/heroic_roses_mfem.yaml
285285
--method sampling
286-
inline_mesh --min 0 0 --max 300 400 --res 150 200 -d 2
286+
inline_mesh --min 0 0 --max 300 400 --resolution 150 200 -d 2
287287
NUM_MPI_TASKS ${_nranks})
288288
set_tests_properties(${_testname} PROPERTIES
289289
PASS_REGULAR_EXPRESSION "Volume of material 'black' is 36,?595.")
@@ -295,7 +295,7 @@ if(AXOM_ENABLE_MPI AND MFEM_FOUND AND MFEM_USE_MPI
295295
COMMAND quest_shaping_driver_ex
296296
-i ${shaping_data_dir}/heroic_roses_mfem_cp.yaml
297297
--method sampling --sampling windingnumber
298-
inline_mesh --min 0 0 --max 300 400 --res 150 200 -d 2
298+
inline_mesh --min 0 0 --max 300 400 --resolution 150 200 -d 2
299299
NUM_MPI_TASKS ${_nranks})
300300
set_tests_properties(${_testname} PROPERTIES
301301
PASS_REGULAR_EXPRESSION "Volume of material 'black' is 36,?654.")
@@ -308,7 +308,7 @@ if(AXOM_ENABLE_MPI AND MFEM_FOUND AND MFEM_USE_MPI
308308
COMMAND quest_shaping_driver_ex
309309
-i ${shaping_data_dir}/sphere.yaml
310310
--method sampling
311-
inline_mesh --min -6 -6 -6 --max 6 6 6 --res 16 16 16 -d 3
311+
inline_mesh --min -6 -6 -6 --max 6 6 6 --resolution 16 16 16 -d 3
312312
NUM_MPI_TASKS ${_nranks})
313313
# sphere of radius 5 has volume: 4/3 pi * r^3 ~523.6
314314
# input sphere is discretized and mesh is coarse; accuracy is within ~1%
@@ -322,7 +322,7 @@ if(AXOM_ENABLE_MPI AND MFEM_FOUND AND MFEM_USE_MPI
322322
-i ${shaping_data_dir}/spheres.yaml
323323
--method sampling
324324
--background-material void
325-
inline_mesh --min -6 -6 -6 --max 6 6 6 --res 16 16 16 -d 3
325+
inline_mesh --min -6 -6 -6 --max 6 6 6 --resolution 16 16 16 -d 3
326326
NUM_MPI_TASKS ${_nranks})
327327
# bbox volume: 12^3 = 1728; sphere(r=5): ~523.6; sphere(r=2): 33.5
328328
# expected analytic volume when fully resolved: ~1237.9
@@ -336,7 +336,7 @@ if(AXOM_ENABLE_MPI AND MFEM_FOUND AND MFEM_USE_MPI
336336
-i ${shaping_data_dir}/plane.yaml
337337
--method sampling
338338
--background-material air
339-
inline_mesh --min -430 -45 -35 --max 430 855 210 --res 16 16 16 -d 3
339+
inline_mesh --min -430 -45 -35 --max 430 855 210 --resolution 16 16 16 -d 3
340340
NUM_MPI_TASKS ${_nranks})
341341
# background: 860*900*245=189,630,000; airplane volume from meshlab: 7,420,578.5
342342
# expected volume when fully resolved: 182,209,421.5

‎src/axom/quest/examples/shaping_driver.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ struct Input
283283
->expected(2, 3)
284284
->required();
285285

286-
inline_mesh_subcommand->add_option("--res", boxResolution)
286+
inline_mesh_subcommand->add_option("--res, --resolution", boxResolution)
287287
->description("Resolution of the box mesh (i,j[,k])")
288288
->expected(2, 3)
289289
->required();

‎src/axom/quest/tests/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ if(AXOM_ENABLE_KLEE AND AXOM_ENABLE_SIDRE AND CONDUIT_FOUND AND RAJA_FOUND AND A
297297
--scale .99 .99 .99
298298
--dir 8 4 2
299299
--meshType ${_meshType}
300-
inline_mesh --min -2 -2 -2 --max 2 2 2 --res 16 16 16
300+
inline_mesh --min -2 -2 -2 --max 2 2 2 --resolution 16 16 16
301301
NUM_MPI_TASKS ${_nranks}
302302
NUM_OMP_THREADS ${_num_threads})
303303
endforeach()

‎src/axom/quest/tests/quest_mesh_clipper.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ struct Input
225225
->expected(2, 3)
226226
->required();
227227

228-
inline_mesh_subcommand->add_option("--res", boxResolution)
228+
inline_mesh_subcommand->add_option("--res, --resolution", boxResolution)
229229
->description("Resolution of the box mesh (i,j[,k])")
230230
->expected(2, 3)
231231
->required();

‎src/tools/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,12 @@ if(AXOM_ENABLE_SIDRE AND AXOM_ENABLE_PRIMAL AND MFEM_FOUND)
140140

141141
axom_add_test(
142142
NAME data_collection_util_box2D
143-
COMMAND data_collection_util --min -1 -1 --max 1 1 --res 16 16 -p 1
143+
COMMAND data_collection_util --min -1 -1 --max 1 1 --resolution 16 16 -p 1
144144
NUM_MPI_TASKS ${_nranks}
145145
)
146146
axom_add_test(
147147
NAME data_collection_util_box3D
148-
COMMAND data_collection_util --min -1 -1 -1 --max 1 1 1 --res 16 16 16 -p 1
148+
COMMAND data_collection_util --min -1 -1 -1 --max 1 1 1 --resolution 16 16 16 -p 1
149149
NUM_MPI_TASKS ${_nranks}
150150
)
151151

‎src/tools/data_collection_util.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ struct Input
195195
minbb->needs(maxbb);
196196
maxbb->needs(minbb);
197197

198-
box_options->add_option("--res", boxResolution)
198+
box_options->add_option("--res, --resolution", boxResolution)
199199
->description("Resolution of the box mesh (i,j[,k])")
200200
->expected(2, 3);
201201

0 commit comments

Comments
 (0)