Skip to content

Commit fd116a9

Browse files
author
Martin D. Weinberg
committed
Removed gas particle tests, decrease basis resolution to speed up tests, added corrected total mass checks
1 parent 1480253 commit fd116a9

1 file changed

Lines changed: 27 additions & 27 deletions

File tree

‎tests/CMakeLists.txt‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ if(ENABLE_NBODY)
6969
if(ENABLE_UTILS)
7070
# Makes some spherical ICs using utils/ICs/gensph
7171
add_test(NAME makeICTest
72-
COMMAND ${EXP_MPI_LAUNCH} ${CMAKE_BINARY_DIR}/utils/ICs/gensph -N 10000 -i SLGridSph.model
72+
COMMAND ${EXP_MPI_LAUNCH} ${CMAKE_BINARY_DIR}/utils/ICs/gensph -N 10000 -i SLGridSph.model --NUMG 100
7373
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/Halo)
7474

7575
# Runs those ICs using exp
@@ -171,6 +171,7 @@ if(ENABLE_NBODY)
171171
add_test(NAME makeSphHDF5ICTest
172172
COMMAND ${EXP_MPI_LAUNCH} ${CMAKE_BINARY_DIR}/utils/ICs/gensph
173173
--hdf5 -N 16 -i SLGridSph.model --SEED 17 --zerovel -o hdf5-sph.bods
174+
--NUMG 100
174175
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/Halo)
175176

176177
add_test(NAME checkSphHDF5ICTest
@@ -186,7 +187,7 @@ if(ENABLE_NBODY)
186187
set_tests_properties(removeSphHDF5ICFiles PROPERTIES DEPENDS checkSphHDF5ICTest
187188
REQUIRED_FILES "hdf5-sph.bods.h5")
188189
set_tests_properties(makeSphHDF5ICTest checkSphHDF5ICTest removeSphHDF5ICFiles
189-
PROPERTIES LABELS "quick")
190+
PROPERTIES LABELS "long")
190191

191192
# Check slab body file generation
192193
add_test(NAME makeSlabHDF5ICTest
@@ -228,67 +229,66 @@ if(ENABLE_NBODY)
228229
set_tests_properties(makeCubeHDF5ICTest checkCubeHDF5ICTest removeCubeHDF5ICFiles
229230
PROPERTIES LABELS "quick")
230231

231-
# Check gendisk body file generation, including gas auxiliary fields
232+
# Check gendisk body file generation with a pared-down
233+
# low-resolution basis
232234
add_test(NAME makeGendiskHDF5ICTest
233235
COMMAND ${EXP_MPI_LAUNCH} ${CMAKE_BINARY_DIR}/utils/ICs/gendisk
234-
--hdf5 --nhalo 8 --ndisk 8 --ngas 8 --ngparam 2 --SEED 17
236+
--nhalo 10000 --ndisk 10000
237+
--hdf5 --SEED 17 --ignore --MMAX 2 --NUMX 128 --NUMY 64
238+
--LMAXFID 32 --NMAXFID 24 --PNUM 0 --TNUM 32
235239
--hbods hdf5-gendisk-halo.bods --dbods hdf5-gendisk-disk.bods
236-
--gbods hdf5-gendisk-gas.bods --cachefile hdf5-gendisk.cache
237-
--suffix hdf5-gendisk
240+
--cachefile hdf5-gendisk.cache --suffix hdf5-gendisk
238241
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/Halo)
239242

240243
add_test(NAME checkGendiskDiskHDF5ICTest
241244
COMMAND ${Python3_EXECUTABLE}
242245
${CMAKE_CURRENT_LIST_DIR}/check_hdf5_particles.py
243-
hdf5-gendisk-disk.bods.h5 --count 8
246+
hdf5-gendisk-disk.bods.h5 --count 10000 --mass 0.05
244247
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/Halo)
245248
set_tests_properties(checkGendiskDiskHDF5ICTest PROPERTIES DEPENDS makeGendiskHDF5ICTest)
246249

247250
add_test(NAME checkGendiskHaloHDF5ICTest
248251
COMMAND ${Python3_EXECUTABLE}
249252
${CMAKE_CURRENT_LIST_DIR}/check_hdf5_particles.py
250-
hdf5-gendisk-halo.bods.h5 --count 8
253+
hdf5-gendisk-halo.bods.h5 --count 10000 --mass 1.0079
251254
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/Halo)
252255
set_tests_properties(checkGendiskHaloHDF5ICTest PROPERTIES DEPENDS makeGendiskHDF5ICTest)
253256

254-
add_test(NAME checkGendiskGasHDF5ICTest
255-
COMMAND ${Python3_EXECUTABLE}
256-
${CMAKE_CURRENT_LIST_DIR}/check_hdf5_particles.py
257-
hdf5-gendisk-gas.bods.h5 --count 8 --aux-floats 2
258-
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/Halo)
259-
set_tests_properties(checkGendiskGasHDF5ICTest PROPERTIES DEPENDS makeGendiskHDF5ICTest)
260-
261257
add_test(NAME removeGendiskHDF5ICFiles
262258
COMMAND ${CMAKE_COMMAND} -E remove
263-
hdf5-gendisk-halo.bods.h5 hdf5-gendisk-disk.bods.h5 hdf5-gendisk-gas.bods.h5
259+
hdf5-gendisk-halo.bods.h5 hdf5-gendisk-disk.bods.h5
264260
hdf5-gendisk.cache hdf5-gendisk.ortho_check
265261
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/Halo)
266262
set_tests_properties(removeGendiskHDF5ICFiles PROPERTIES DEPENDS
267-
"checkGendiskDiskHDF5ICTest;checkGendiskHaloHDF5ICTest;checkGendiskGasHDF5ICTest"
268-
REQUIRED_FILES "hdf5-gendisk-halo.bods.h5;hdf5-gendisk-disk.bods.h5;hdf5-gendisk-gas.bods.h5")
269-
set_tests_properties(makeGendiskHDF5ICTest checkGendiskDiskHDF5ICTest checkGendiskHaloHDF5ICTest
270-
checkGendiskGasHDF5ICTest removeGendiskHDF5ICFiles
271-
PROPERTIES LABELS "quick")
272-
273-
# Check gendisk2d body file generation
263+
"checkGendiskDiskHDF5ICTest;checkGendiskHaloHDF5ICTest"
264+
REQUIRED_FILES "hdf5-gendisk-halo.bods.h5;hdf5-gendisk-disk.bods.h5")
265+
set_tests_properties(makeGendiskHDF5ICTest
266+
checkGendiskDiskHDF5ICTest checkGendiskHaloHDF5ICTest
267+
removeGendiskHDF5ICFiles
268+
PROPERTIES LABELS "long")
269+
270+
# Check gendisk2d body file generation with a pared-down
271+
# low-resolution basis
274272
add_test(NAME makeGendisk2dHDF5ICTest
275273
COMMAND ${EXP_MPI_LAUNCH} ${CMAKE_BINARY_DIR}/utils/ICs/gendisk2d
276-
--hdf5 --nhalo 8 --ndisk 8 --SEED 17
274+
--hdf5 --nhalo 10000 --ndisk 10000 --SEED 17 --NUMX 128 --NUMY 64
275+
--PNUM 0 --TNUM 40 --LMAX 4 --MMAX 2 --NMAXH 4 --NMAXD 4
276+
# --RMIN 3.333e-05
277277
--hbods hdf5-gendisk2d-halo.bods --dbods hdf5-gendisk2d-disk.bods
278278
--cachefile hdf5-gendisk2d.cache
279279
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/Halo)
280280

281281
add_test(NAME checkGendisk2dHaloHDF5ICTest
282282
COMMAND ${Python3_EXECUTABLE}
283283
${CMAKE_CURRENT_LIST_DIR}/check_hdf5_particles.py
284-
hdf5-gendisk2d-halo.bods.h5 --count 8
284+
hdf5-gendisk2d-halo.bods.h5 --count 10000 --mass 1.0079
285285
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/Halo)
286286
set_tests_properties(checkGendisk2dHaloHDF5ICTest PROPERTIES DEPENDS makeGendisk2dHDF5ICTest)
287287

288288
add_test(NAME checkGendisk2dDiskHDF5ICTest
289289
COMMAND ${Python3_EXECUTABLE}
290290
${CMAKE_CURRENT_LIST_DIR}/check_hdf5_particles.py
291-
hdf5-gendisk2d-disk.bods.h5 --count 8
291+
hdf5-gendisk2d-disk.bods.h5 --count 10000 --mass 0.05
292292
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/Halo)
293293
set_tests_properties(checkGendisk2dDiskHDF5ICTest PROPERTIES DEPENDS makeGendisk2dHDF5ICTest)
294294

@@ -302,7 +302,7 @@ if(ENABLE_NBODY)
302302
REQUIRED_FILES "hdf5-gendisk2d-halo.bods.h5;hdf5-gendisk2d-disk.bods.h5")
303303
set_tests_properties(makeGendisk2dHDF5ICTest checkGendisk2dHaloHDF5ICTest
304304
checkGendisk2dDiskHDF5ICTest removeGendisk2dHDF5ICFiles
305-
PROPERTIES LABELS "quick")
305+
PROPERTIES LABELS "long")
306306
endif()
307307

308308
# Set labels for pyEXP tests

0 commit comments

Comments
 (0)