diff --git a/tests/Makefile.am b/tests/Makefile.am index cf967db56a405dd67ebba3f1eb901bd43ce1caae..9cd6e9ab9e09935d39bf416dfbb65b83a874b382 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -100,6 +100,6 @@ EXTRA_DIST = testReading.sh makeInput.py testActivePair.sh \ test27cells.sh test27cellsPerturbed.sh testParser.sh testPeriodicBC.sh \ testPeriodicBCPerturbed.sh test125cells.sh test125cellsPerturbed.sh testParserInput.yaml \ difffloat.py tolerance_125_normal.dat tolerance_125_perturbed.dat \ - tolerance_27_normal.dat tolerance_27_perturbed.dat tolerance_27_perturbed_h.dat \ + tolerance_27_normal.dat tolerance_27_perturbed.dat tolerance_27_perturbed_h.dat tolerance_27_perturbed_h2.dat \ tolerance_testInteractions.dat tolerance_pair_active.dat \ fft_params.yml tolerance_periodic_BC_normal.dat tolerance_periodic_BC_perturbed.dat diff --git a/tests/test27cells.sh.in b/tests/test27cells.sh.in index b327cb1bd89b0e5f6b7c9a6a5e643cb452f59f6b..059a7a208aa8e570ad5035fac16ffd201bf3dddd 100755 --- a/tests/test27cells.sh.in +++ b/tests/test27cells.sh.in @@ -28,6 +28,34 @@ do done +# Test for particles with random smoothing lengths +for v in {0..3} +do + echo "" + + rm -f brute_force_27_standard.dat swift_dopair_27_standard.dat + + echo "Running ./test27cells -n 6 -r 1 -d 0 -f standard -v $v -p 1.1" + ./test27cells -n 6 -r 1 -d 0 -f standard -v $v -p 1.1 + + if [ -e brute_force_27_standard.dat ] + then + if python @srcdir@/difffloat.py brute_force_27_standard.dat swift_dopair_27_standard.dat @srcdir@/tolerance_27_perturbed_h.dat 6 + then + echo "Accuracy test passed" + else + echo "Accuracy test failed" + exit 1 + fi + else + echo "Error Missing test output file" + exit 1 + fi + + echo "------------" + +done + # Test for particles with random smoothing lengths for v in {0..3} do @@ -40,7 +68,7 @@ do if [ -e brute_force_27_standard.dat ] then - if python @srcdir@/difffloat.py brute_force_27_standard.dat swift_dopair_27_standard.dat @srcdir@/tolerance_27_perturbed_h.dat 6 + if python @srcdir@/difffloat.py brute_force_27_standard.dat swift_dopair_27_standard.dat @srcdir@/tolerance_27_perturbed_h2.dat 6 then echo "Accuracy test passed" else diff --git a/tests/test27cellsPerturbed.sh.in b/tests/test27cellsPerturbed.sh.in index 3680bff7a3999ad4aa87332234948c8fe4fba1cd..f875504e541588377ca6e40fe55681ebec3466f6 100755 --- a/tests/test27cellsPerturbed.sh.in +++ b/tests/test27cellsPerturbed.sh.in @@ -35,8 +35,8 @@ do rm -f brute_force_27_perturbed.dat swift_dopair_27_perturbed.dat - echo "Running ./test27cells -n 6 -r 1 -d 0.1 -f perturbed -v $v -p 1.3" - ./test27cells -n 6 -r 1 -d 0.1 -f perturbed -v $v -p 1.3 + echo "Running ./test27cells -n 6 -r 1 -d 0.1 -f perturbed -v $v -p 1.1" + ./test27cells -n 6 -r 1 -d 0.1 -f perturbed -v $v -p 1.1 if [ -e brute_force_27_perturbed.dat ] then @@ -56,4 +56,31 @@ do done +# Test for particles with random smoothing lengths +for v in {0..3} +do + echo "" + + rm -f brute_force_27_perturbed.dat swift_dopair_27_perturbed.dat + + echo "Running ./test27cells -n 6 -r 1 -d 0.1 -f perturbed -v $v -p 1.3" + ./test27cells -n 6 -r 1 -d 0.1 -f perturbed -v $v -p 1.3 + + if [ -e brute_force_27_perturbed.dat ] + then + if python @srcdir@/difffloat.py brute_force_27_perturbed.dat swift_dopair_27_perturbed.dat @srcdir@/tolerance_27_perturbed_h2.dat 6 + then + echo "Accuracy test passed" + else + echo "Accuracy test failed" + exit 1 + fi + else + echo "Error Missing test output file" + exit 1 + fi + + echo "------------" + +done exit $? diff --git a/tests/tolerance_27_perturbed_h2.dat b/tests/tolerance_27_perturbed_h2.dat new file mode 100644 index 0000000000000000000000000000000000000000..23f6a5006124f6233aebd111005760a5dcc5b6a3 --- /dev/null +++ b/tests/tolerance_27_perturbed_h2.dat @@ -0,0 +1,4 @@ +# ID pos_x pos_y pos_z v_x v_y v_z rho rho_dh wcount wcount_dh div_v curl_vx curl_vy curl_vz + 0 1e-6 1e-6 1e-6 1e-6 1e-6 1e-6 3e-6 1e-4 5e-4 1.5e-2 1.4e-5 3e-6 3e-6 9e-6 + 0 1e-6 1e-6 1e-6 1e-6 1e-6 1e-6 1.5e-6 1.57e-2 1e-5 4.74e-3 3.89e-4 3e-3 3e-3 3e-3 + 0 1e-6 1e-6 1e-6 1e-6 1e-6 1e-6 1e-6 1e-6 1e-6 1e0 1e-6 4e-6 4e-6 4e-6