diff --git a/reframe_tests/__init__.py b/reframe_tests/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/reframe_tests/regression_checks/TestFractalBoxGeometry_015c587f/fractal_box_weighted.h5 b/reframe_tests/regression_checks/TestFractalBoxGeometry_015c587f/fractal_box_weighted.h5 new file mode 100644 index 00000000..d1e3e419 Binary files /dev/null and b/reframe_tests/regression_checks/TestFractalBoxGeometry_015c587f/fractal_box_weighted.h5 differ diff --git a/reframe_tests/regression_checks/TestFractalBoxGeometry_1887bd81/fractal_box_half.h5 b/reframe_tests/regression_checks/TestFractalBoxGeometry_1887bd81/fractal_box_half.h5 new file mode 100644 index 00000000..8308fe53 Binary files /dev/null and b/reframe_tests/regression_checks/TestFractalBoxGeometry_1887bd81/fractal_box_half.h5 differ diff --git a/reframe_tests/regression_checks/TestFractalBoxGeometry_89b5811d/fractal_box_full.h5 b/reframe_tests/regression_checks/TestFractalBoxGeometry_89b5811d/fractal_box_full.h5 index 985f9b43..47bb8246 100644 Binary files a/reframe_tests/regression_checks/TestFractalBoxGeometry_89b5811d/fractal_box_full.h5 and b/reframe_tests/regression_checks/TestFractalBoxGeometry_89b5811d/fractal_box_full.h5 differ diff --git a/reframe_tests/regression_checks/TestFractalBoxGeometry_b174be31/fractal_box_small.h5 b/reframe_tests/regression_checks/TestFractalBoxGeometry_b174be31/fractal_box_small.h5 new file mode 100644 index 00000000..8c114867 Binary files /dev/null and b/reframe_tests/regression_checks/TestFractalBoxGeometry_b174be31/fractal_box_small.h5 differ diff --git a/reframe_tests/regression_checks/TestGeometryObject_a6a096cb/full_volume.h5 b/reframe_tests/regression_checks/TestGeometryObject_a6a096cb/full_volume.h5 deleted file mode 100644 index fe81bea6..00000000 --- a/reframe_tests/regression_checks/TestGeometryObject_a6a096cb/full_volume.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a23ccc9ed81685385ff300c0c00e70329945db364dd7eb9607a511870469c720 -size 75462640 diff --git a/reframe_tests/regression_checks/TestGeometryObject_a6a096cb/partial_volume.h5 b/reframe_tests/regression_checks/TestGeometryObject_a6a096cb/partial_volume.h5 deleted file mode 100644 index 91fe354b..00000000 --- a/reframe_tests/regression_checks/TestGeometryObject_a6a096cb/partial_volume.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4b8f8c4979f4c82eb4be8a9a63cfaf19408b9f493d1bf3082a8226e97542ae4a -size 4980400 diff --git a/reframe_tests/regression_checks/TestGeometryView_5176823e/full_volume.vtkhdf b/reframe_tests/regression_checks/TestGeometryView_5176823e/full_volume.vtkhdf deleted file mode 100644 index bc9105d9..00000000 --- a/reframe_tests/regression_checks/TestGeometryView_5176823e/full_volume.vtkhdf +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c7c7303daffcd4debb8df4c0c5e6cd62a6fd07c6e4b33e8c47c9e190c42d75cf -size 75736481 diff --git a/reframe_tests/regression_checks/TestGeometryView_5176823e/partial_volume.vtkhdf b/reframe_tests/regression_checks/TestGeometryView_5176823e/partial_volume.vtkhdf deleted file mode 100644 index cafe9d38..00000000 --- a/reframe_tests/regression_checks/TestGeometryView_5176823e/partial_volume.vtkhdf +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a0a195bfeec73f72083e6dbeb5e3713259721d2d4e9118bf019ee9905f02f5a8 -size 4927361 diff --git a/reframe_tests/regression_checks/TestGeometryView_77980202/full_volume.vtkhdf b/reframe_tests/regression_checks/TestGeometryView_77980202/full_volume.vtkhdf deleted file mode 100644 index 2c7583b3..00000000 --- a/reframe_tests/regression_checks/TestGeometryView_77980202/full_volume.vtkhdf +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:67c7c15c0025feac5b5899c3a691929ae1d7338c68714708c7a41e51a7f71441 -size 4009216 diff --git a/reframe_tests/tests/src/geometry_tests/add_surface_roughness_geometry/fractal_box_full.in b/reframe_tests/tests/src/geometry_tests/add_surface_roughness_geometry/fractal_box_full.in new file mode 100644 index 00000000..4e74ae74 --- /dev/null +++ b/reframe_tests/tests/src/geometry_tests/add_surface_roughness_geometry/fractal_box_full.in @@ -0,0 +1,14 @@ +#title: Heterogeneous soil using a stochastic distribution of dielectric properties given by a mixing model from Peplinski +#domain: 0.100 0.100 0.100 +#dx_dy_dz: 0.001 0.001 0.001 +#time_window: 3e-9 + +#waveform: ricker 1 1.5e9 my_ricker +#hertzian_dipole: y 0.02 0.02 0.02 my_ricker +#rx: 0.080 0.080 0.080 + +#soil_peplinski: 0.5 0.5 2.0 2.66 0.001 0.25 my_soil +#fractal_box: 0 0 0 0.1 0.1 0.07 1.5 1 1 1 50 my_soil my_soil_box 42 +#add_surface_roughness: 0 0 0.7 0.1 0.1 0.07 1 1 1 0.05 0.1 my_soil_box 22 + +#geometry_objects_write: 0 0 0 0.1 0.1 0.1 full_volume diff --git a/reframe_tests/tests/src/geometry_tests/fractal_box_geometry/fractal_box_half.in b/reframe_tests/tests/src/geometry_tests/fractal_box_geometry/fractal_box_half.in new file mode 100644 index 00000000..a52817d6 --- /dev/null +++ b/reframe_tests/tests/src/geometry_tests/fractal_box_geometry/fractal_box_half.in @@ -0,0 +1,13 @@ +#title: Heterogeneous soil using a stochastic distribution of dielectric properties given by a mixing model from Peplinski +#domain: 0.100 0.100 0.100 +#dx_dy_dz: 0.001 0.001 0.001 +#time_window: 3e-9 + +#waveform: ricker 1 1.5e9 my_ricker +#hertzian_dipole: y 0.02 0.02 0.02 my_ricker +#rx: 0.080 0.080 0.080 + +#soil_peplinski: 0.5 0.5 2.0 2.66 0.001 0.25 my_soil +#fractal_box: 0 0 0 0.05 0.05 0.1 1.5 1 1 1 50 my_soil my_soil_box 42 + +#geometry_objects_write: 0 0 0 0.1 0.1 0.1 full_volume diff --git a/reframe_tests/tests/src/geometry_tests/fractal_box_geometry/fractal_box_small.in b/reframe_tests/tests/src/geometry_tests/fractal_box_geometry/fractal_box_small.in new file mode 100644 index 00000000..3547405c --- /dev/null +++ b/reframe_tests/tests/src/geometry_tests/fractal_box_geometry/fractal_box_small.in @@ -0,0 +1,13 @@ +#title: Heterogeneous soil using a stochastic distribution of dielectric properties given by a mixing model from Peplinski +#domain: 0.100 0.100 0.100 +#dx_dy_dz: 0.001 0.001 0.001 +#time_window: 3e-9 + +#waveform: ricker 1 1.5e9 my_ricker +#hertzian_dipole: y 0.02 0.02 0.02 my_ricker +#rx: 0.080 0.080 0.080 + +#soil_peplinski: 0.5 0.5 2.0 2.66 0.001 0.25 my_soil +#fractal_box: 0.015 0.015 0.015 0.045 0.045 0.045 1.5 1 1 1 50 my_soil my_soil_box 42 + +#geometry_objects_write: 0 0 0 0.1 0.1 0.1 full_volume diff --git a/reframe_tests/tests/src/geometry_tests/fractal_box_geometry/fractal_box_weighted.in b/reframe_tests/tests/src/geometry_tests/fractal_box_geometry/fractal_box_weighted.in new file mode 100644 index 00000000..654aa6f4 --- /dev/null +++ b/reframe_tests/tests/src/geometry_tests/fractal_box_geometry/fractal_box_weighted.in @@ -0,0 +1,13 @@ +#title: Heterogeneous soil using a stochastic distribution of dielectric properties given by a mixing model from Peplinski +#domain: 0.100 0.100 0.100 +#dx_dy_dz: 0.001 0.001 0.001 +#time_window: 3e-9 + +#waveform: ricker 1 1.5e9 my_ricker +#hertzian_dipole: y 0.02 0.02 0.02 my_ricker +#rx: 0.080 0.080 0.080 + +#soil_peplinski: 0.5 0.5 2.0 2.66 0.001 0.25 my_soil +#fractal_box: 0 0 0 0.1 0.1 0.1 1.5 1.5 1 0.8 50 my_soil my_soil_box 42 + +#geometry_objects_write: 0 0 0 0.1 0.1 0.1 full_volume diff --git a/reframe_tests/tests/test_geometry.py b/reframe_tests/tests/test_geometry.py index 412afca0..f75d82bd 100644 --- a/reframe_tests/tests/test_geometry.py +++ b/reframe_tests/tests/test_geometry.py @@ -101,7 +101,9 @@ class TestEllipsoidGeometry(GprMaxRegressionTest): class TestFractalBoxGeometry(GprMaxRegressionTest): tags = {"test", "serial", "geometery", "fractal", "box", "fractal_box"} sourcesdir = "src/geometry_tests/fractal_box_geometry" - model = parameter(["fractal_box_full"]) + model = parameter( + ["fractal_box_full", "fractal_box_half", "fractal_box_small", "fractal_box_weighted"] + ) # TODO: Add Mixin class to enable testing that invalid geometry throws an error