Replace calls to wget with getting files from our ./data directory.
With #168 (closed) fixed we now should start using yade-data more widely. The first contender are the calls to wget
inside tests and examples. These are the offending files:
./examples/DEM2020Benchmark/Case1_SiloFlow.py
./examples/DEM2020Benchmark/Case1_SiloFlow_customFilling.py
./examples/DEM2020Benchmark/Case2_rotating_drum_mpi.py
./examples/DEM2020Benchmark/Case2_rotating_drum_openmp.py
./examples/DEM2020Benchmark/Case3_PenetrationTest.py
./examples/alphaShapes/toroid/torusConfine.py
./examples/alphaShapes/toroid/torusKUBC.py
./examples/alphaShapes/toroid/torusSUBC.py
./examples/gts-horse/gts-horse.py
./examples/openfoam/example_icoFoamYade/scriptYade.py
./examples/openfoam/example_pimpleFoamYade/scriptYade.py
./scripts/checks-and-tests/checks/checkMPISilo.py
But only checkMPISilo.py
actually is needed to pass the tests. I think that the other ones would work better if they had their files in yade-data.
The tests failed in !700 (merged) until I installed wget
in the archlinux docker image. So we have a nice way testing this by reverting docker-yade@23f6581a
Also we should move all stuff from other data directory: https://gitlab.com/yade-dev/trunk/-/tree/master/scripts/checks-and-tests/checks/data
So we have four points to do here
-
make checkMPISilo.py
pass tests without wget -
modify examples (files listed above, mostly DEM2020Benchmark, alphaShapes, openfoam, gts-horse) to use yade-data -
move old data dir to yade-data -
if I remember correctly there were also some capillary examples which needed some data files. I think Luc wrote them? @bchareyre can you ask him about that? I see he is not a member of yade-dev.
Also see !974 (comment 1605418261)
Edited by Janek Kozicki