From 7961ebcdb96c7ac277da3c064e5f3345080ef1fc Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Tue, 27 Apr 2021 23:59:20 -0500 Subject: [PATCH] Simplifying test cases based on @paulromano's recommendation. --- .../input_dat_-10_-5_0.dat | 60 --- .../input_dat_-10_0_-5.dat | 60 --- .../input_dat_-5_-10_0.dat | 60 --- .../input_dat_-5_0_-10.dat | 60 --- .../input_dat_0_-10_-5.dat | 60 --- .../input_dat_0_-5_-10.dat | 60 --- .../filter_translations/input_dat_0_10_5.dat | 60 --- .../filter_translations/input_dat_0_5_10.dat | 60 --- .../filter_translations/input_dat_10_0_5.dat | 60 --- .../filter_translations/input_dat_5_0_10.dat | 60 --- .../filter_translations/input_dat_5_10_0.dat | 60 --- .../{input_dat_10_5_0.dat => inputs_true.dat} | 40 +- .../filter_translations/results_true.dat | 343 +++++++++++++++++- .../filter_translations/test.py | 62 +++- 14 files changed, 416 insertions(+), 689 deletions(-) delete mode 100644 tests/regression_tests/filter_translations/input_dat_-10_-5_0.dat delete mode 100644 tests/regression_tests/filter_translations/input_dat_-10_0_-5.dat delete mode 100644 tests/regression_tests/filter_translations/input_dat_-5_-10_0.dat delete mode 100644 tests/regression_tests/filter_translations/input_dat_-5_0_-10.dat delete mode 100644 tests/regression_tests/filter_translations/input_dat_0_-10_-5.dat delete mode 100644 tests/regression_tests/filter_translations/input_dat_0_-5_-10.dat delete mode 100644 tests/regression_tests/filter_translations/input_dat_0_10_5.dat delete mode 100644 tests/regression_tests/filter_translations/input_dat_0_5_10.dat delete mode 100644 tests/regression_tests/filter_translations/input_dat_10_0_5.dat delete mode 100644 tests/regression_tests/filter_translations/input_dat_5_0_10.dat delete mode 100644 tests/regression_tests/filter_translations/input_dat_5_10_0.dat rename tests/regression_tests/filter_translations/{input_dat_10_5_0.dat => inputs_true.dat} (66%) diff --git a/tests/regression_tests/filter_translations/input_dat_-10_-5_0.dat b/tests/regression_tests/filter_translations/input_dat_-10_-5_0.dat deleted file mode 100644 index ed062f2aa9..0000000000 --- a/tests/regression_tests/filter_translations/input_dat_-10_-5_0.dat +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - eigenvalue - 1000 - 5 - 0 - - - - - 9 9 9 - 1 -4 -9 - 19 14 9 - - - 1.0 2.125 3.25 4.375 5.5 6.625 7.75 8.875 10.0 11.125 12.25 13.375 14.5 15.625 16.75 17.875 19.0 - -4.0 -2.875 -1.75 -0.625 0.5 1.625 2.75 3.875 5.0 6.125 7.25 8.375 9.5 10.625 11.75 12.875 14.0 - -9.0 -7.875 -6.75 -5.625 -4.5 -3.375 -2.25 -1.125 0.0 1.125 2.25 3.375 4.5 5.625 6.75 7.875 9.0 - - - 13 - - - 14 - - - 13 - total - - - 14 - total - - diff --git a/tests/regression_tests/filter_translations/input_dat_-10_0_-5.dat b/tests/regression_tests/filter_translations/input_dat_-10_0_-5.dat deleted file mode 100644 index e9a1119bb1..0000000000 --- a/tests/regression_tests/filter_translations/input_dat_-10_0_-5.dat +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - eigenvalue - 1000 - 5 - 0 - - - - - 9 9 9 - 1 -9 -4 - 19 9 14 - - - 1.0 2.125 3.25 4.375 5.5 6.625 7.75 8.875 10.0 11.125 12.25 13.375 14.5 15.625 16.75 17.875 19.0 - -9.0 -7.875 -6.75 -5.625 -4.5 -3.375 -2.25 -1.125 0.0 1.125 2.25 3.375 4.5 5.625 6.75 7.875 9.0 - -4.0 -2.875 -1.75 -0.625 0.5 1.625 2.75 3.875 5.0 6.125 7.25 8.375 9.5 10.625 11.75 12.875 14.0 - - - 15 - - - 16 - - - 15 - total - - - 16 - total - - diff --git a/tests/regression_tests/filter_translations/input_dat_-5_-10_0.dat b/tests/regression_tests/filter_translations/input_dat_-5_-10_0.dat deleted file mode 100644 index 88ae5c4346..0000000000 --- a/tests/regression_tests/filter_translations/input_dat_-5_-10_0.dat +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - eigenvalue - 1000 - 5 - 0 - - - - - 9 9 9 - -4 1 -9 - 14 19 9 - - - -4.0 -2.875 -1.75 -0.625 0.5 1.625 2.75 3.875 5.0 6.125 7.25 8.375 9.5 10.625 11.75 12.875 14.0 - 1.0 2.125 3.25 4.375 5.5 6.625 7.75 8.875 10.0 11.125 12.25 13.375 14.5 15.625 16.75 17.875 19.0 - -9.0 -7.875 -6.75 -5.625 -4.5 -3.375 -2.25 -1.125 0.0 1.125 2.25 3.375 4.5 5.625 6.75 7.875 9.0 - - - 17 - - - 18 - - - 17 - total - - - 18 - total - - diff --git a/tests/regression_tests/filter_translations/input_dat_-5_0_-10.dat b/tests/regression_tests/filter_translations/input_dat_-5_0_-10.dat deleted file mode 100644 index d523149d0f..0000000000 --- a/tests/regression_tests/filter_translations/input_dat_-5_0_-10.dat +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - eigenvalue - 1000 - 5 - 0 - - - - - 9 9 9 - -4 -9 1 - 14 9 19 - - - -4.0 -2.875 -1.75 -0.625 0.5 1.625 2.75 3.875 5.0 6.125 7.25 8.375 9.5 10.625 11.75 12.875 14.0 - -9.0 -7.875 -6.75 -5.625 -4.5 -3.375 -2.25 -1.125 0.0 1.125 2.25 3.375 4.5 5.625 6.75 7.875 9.0 - 1.0 2.125 3.25 4.375 5.5 6.625 7.75 8.875 10.0 11.125 12.25 13.375 14.5 15.625 16.75 17.875 19.0 - - - 19 - - - 20 - - - 19 - total - - - 20 - total - - diff --git a/tests/regression_tests/filter_translations/input_dat_0_-10_-5.dat b/tests/regression_tests/filter_translations/input_dat_0_-10_-5.dat deleted file mode 100644 index a29f8f63df..0000000000 --- a/tests/regression_tests/filter_translations/input_dat_0_-10_-5.dat +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - eigenvalue - 1000 - 5 - 0 - - - - - 9 9 9 - -9 1 -4 - 9 19 14 - - - -9.0 -7.875 -6.75 -5.625 -4.5 -3.375 -2.25 -1.125 0.0 1.125 2.25 3.375 4.5 5.625 6.75 7.875 9.0 - 1.0 2.125 3.25 4.375 5.5 6.625 7.75 8.875 10.0 11.125 12.25 13.375 14.5 15.625 16.75 17.875 19.0 - -4.0 -2.875 -1.75 -0.625 0.5 1.625 2.75 3.875 5.0 6.125 7.25 8.375 9.5 10.625 11.75 12.875 14.0 - - - 21 - - - 22 - - - 21 - total - - - 22 - total - - diff --git a/tests/regression_tests/filter_translations/input_dat_0_-5_-10.dat b/tests/regression_tests/filter_translations/input_dat_0_-5_-10.dat deleted file mode 100644 index 17c7af7dd3..0000000000 --- a/tests/regression_tests/filter_translations/input_dat_0_-5_-10.dat +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - eigenvalue - 1000 - 5 - 0 - - - - - 9 9 9 - -9 -4 1 - 9 14 19 - - - -9.0 -7.875 -6.75 -5.625 -4.5 -3.375 -2.25 -1.125 0.0 1.125 2.25 3.375 4.5 5.625 6.75 7.875 9.0 - -4.0 -2.875 -1.75 -0.625 0.5 1.625 2.75 3.875 5.0 6.125 7.25 8.375 9.5 10.625 11.75 12.875 14.0 - 1.0 2.125 3.25 4.375 5.5 6.625 7.75 8.875 10.0 11.125 12.25 13.375 14.5 15.625 16.75 17.875 19.0 - - - 23 - - - 24 - - - 23 - total - - - 24 - total - - diff --git a/tests/regression_tests/filter_translations/input_dat_0_10_5.dat b/tests/regression_tests/filter_translations/input_dat_0_10_5.dat deleted file mode 100644 index ce4d481e57..0000000000 --- a/tests/regression_tests/filter_translations/input_dat_0_10_5.dat +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - eigenvalue - 1000 - 5 - 0 - - - - - 9 9 9 - -9 -19 -14 - 9 -1 4 - - - -9.0 -7.875 -6.75 -5.625 -4.5 -3.375 -2.25 -1.125 0.0 1.125 2.25 3.375 4.5 5.625 6.75 7.875 9.0 - -19.0 -17.875 -16.75 -15.625 -14.5 -13.375 -12.25 -11.125 -10.0 -8.875 -7.75 -6.625 -5.5 -4.375 -3.25 -2.125 -1.0 - -14.0 -12.875 -11.75 -10.625 -9.5 -8.375 -7.25 -6.125 -5.0 -3.875 -2.75 -1.625 -0.5 0.625 1.75 2.875 4.0 - - - 9 - - - 10 - - - 9 - total - - - 10 - total - - diff --git a/tests/regression_tests/filter_translations/input_dat_0_5_10.dat b/tests/regression_tests/filter_translations/input_dat_0_5_10.dat deleted file mode 100644 index bdd361ce7f..0000000000 --- a/tests/regression_tests/filter_translations/input_dat_0_5_10.dat +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - eigenvalue - 1000 - 5 - 0 - - - - - 9 9 9 - -9 -14 -19 - 9 4 -1 - - - -9.0 -7.875 -6.75 -5.625 -4.5 -3.375 -2.25 -1.125 0.0 1.125 2.25 3.375 4.5 5.625 6.75 7.875 9.0 - -14.0 -12.875 -11.75 -10.625 -9.5 -8.375 -7.25 -6.125 -5.0 -3.875 -2.75 -1.625 -0.5 0.625 1.75 2.875 4.0 - -19.0 -17.875 -16.75 -15.625 -14.5 -13.375 -12.25 -11.125 -10.0 -8.875 -7.75 -6.625 -5.5 -4.375 -3.25 -2.125 -1.0 - - - 11 - - - 12 - - - 11 - total - - - 12 - total - - diff --git a/tests/regression_tests/filter_translations/input_dat_10_0_5.dat b/tests/regression_tests/filter_translations/input_dat_10_0_5.dat deleted file mode 100644 index 72c17754b9..0000000000 --- a/tests/regression_tests/filter_translations/input_dat_10_0_5.dat +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - eigenvalue - 1000 - 5 - 0 - - - - - 9 9 9 - -19 -9 -14 - -1 9 4 - - - -19.0 -17.875 -16.75 -15.625 -14.5 -13.375 -12.25 -11.125 -10.0 -8.875 -7.75 -6.625 -5.5 -4.375 -3.25 -2.125 -1.0 - -9.0 -7.875 -6.75 -5.625 -4.5 -3.375 -2.25 -1.125 0.0 1.125 2.25 3.375 4.5 5.625 6.75 7.875 9.0 - -14.0 -12.875 -11.75 -10.625 -9.5 -8.375 -7.25 -6.125 -5.0 -3.875 -2.75 -1.625 -0.5 0.625 1.75 2.875 4.0 - - - 3 - - - 4 - - - 3 - total - - - 4 - total - - diff --git a/tests/regression_tests/filter_translations/input_dat_5_0_10.dat b/tests/regression_tests/filter_translations/input_dat_5_0_10.dat deleted file mode 100644 index 753930f7db..0000000000 --- a/tests/regression_tests/filter_translations/input_dat_5_0_10.dat +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - eigenvalue - 1000 - 5 - 0 - - - - - 9 9 9 - -14 -9 -19 - 4 9 -1 - - - -14.0 -12.875 -11.75 -10.625 -9.5 -8.375 -7.25 -6.125 -5.0 -3.875 -2.75 -1.625 -0.5 0.625 1.75 2.875 4.0 - -9.0 -7.875 -6.75 -5.625 -4.5 -3.375 -2.25 -1.125 0.0 1.125 2.25 3.375 4.5 5.625 6.75 7.875 9.0 - -19.0 -17.875 -16.75 -15.625 -14.5 -13.375 -12.25 -11.125 -10.0 -8.875 -7.75 -6.625 -5.5 -4.375 -3.25 -2.125 -1.0 - - - 7 - - - 8 - - - 7 - total - - - 8 - total - - diff --git a/tests/regression_tests/filter_translations/input_dat_5_10_0.dat b/tests/regression_tests/filter_translations/input_dat_5_10_0.dat deleted file mode 100644 index 98a93483e3..0000000000 --- a/tests/regression_tests/filter_translations/input_dat_5_10_0.dat +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - eigenvalue - 1000 - 5 - 0 - - - - - 9 9 9 - -14 -19 -9 - 4 -1 9 - - - -14.0 -12.875 -11.75 -10.625 -9.5 -8.375 -7.25 -6.125 -5.0 -3.875 -2.75 -1.625 -0.5 0.625 1.75 2.875 4.0 - -19.0 -17.875 -16.75 -15.625 -14.5 -13.375 -12.25 -11.125 -10.0 -8.875 -7.75 -6.625 -5.5 -4.375 -3.25 -2.125 -1.0 - -9.0 -7.875 -6.75 -5.625 -4.5 -3.375 -2.25 -1.125 0.0 1.125 2.25 3.375 4.5 5.625 6.75 7.875 9.0 - - - 5 - - - 6 - - - 5 - total - - - 6 - total - - diff --git a/tests/regression_tests/filter_translations/input_dat_10_5_0.dat b/tests/regression_tests/filter_translations/inputs_true.dat similarity index 66% rename from tests/regression_tests/filter_translations/input_dat_10_5_0.dat rename to tests/regression_tests/filter_translations/inputs_true.dat index 73a11537a7..14481f804a 100644 --- a/tests/regression_tests/filter_translations/input_dat_10_5_0.dat +++ b/tests/regression_tests/filter_translations/inputs_true.dat @@ -34,21 +34,37 @@ - 9 9 9 - -19 -14 -9 - -1 4 9 + 3 4 5 + -19 -4 -9 + -1 14 9 - -19.0 -17.875 -16.75 -15.625 -14.5 -13.375 -12.25 -11.125 -10.0 -8.875 -7.75 -6.625 -5.5 -4.375 -3.25 -2.125 -1.0 - -14.0 -12.875 -11.75 -10.625 -9.5 -8.375 -7.25 -6.125 -5.0 -3.875 -2.75 -1.625 -0.5 0.625 1.75 2.875 4.0 - -9.0 -7.875 -6.75 -5.625 -4.5 -3.375 -2.25 -1.125 0.0 1.125 2.25 3.375 4.5 5.625 6.75 7.875 9.0 + -9.0 0.0 9.0 + -9.0 -3.0 3.0 9.0 + -9.0 -4.5 0.0 4.5 9.0 - + + 3 4 5 + -19 -4 -9 + -1 14 9 + + + -19.0 -10.0 -1.0 + -4.0 2.0 8.0 14.0 + -9.0 -4.5 0.0 4.5 9.0 + + 1 - + 2 + + 3 + + + 4 + 1 total @@ -57,4 +73,12 @@ 2 total + + 3 + total + + + 4 + total + diff --git a/tests/regression_tests/filter_translations/results_true.dat b/tests/regression_tests/filter_translations/results_true.dat index 105ef304ba..6782ab2aa2 100644 --- a/tests/regression_tests/filter_translations/results_true.dat +++ b/tests/regression_tests/filter_translations/results_true.dat @@ -1 +1,342 @@ -3e9446ca032f10b5d2c65529a55264eb7f995f9890180547a838d8cc130c7258e094742b7b20578e95667c63b5634eadab5b53273c9cf297e58536abb411b985 \ No newline at end of file +k-combined: +7.656044E-01 5.168921E-02 +tally 1: +0.000000E+00 +0.000000E+00 +2.220139E-02 +1.051536E-04 +2.437996E-01 +1.218585E-02 +0.000000E+00 +0.000000E+00 +2.076286E-02 +9.030648E-05 +2.355202E-01 +1.163053E-02 +0.000000E+00 +0.000000E+00 +2.087721E-02 +9.001706E-05 +4.525189E-02 +4.184578E-04 +0.000000E+00 +0.000000E+00 +2.481968E-03 +1.491717E-06 +4.714053E-03 +4.644899E-06 +0.000000E+00 +0.000000E+00 +2.998461E-02 +1.842671E-04 +3.718895E-01 +2.778255E-02 +0.000000E+00 +0.000000E+00 +2.936209E-02 +1.744066E-04 +3.714258E-01 +2.764128E-02 +0.000000E+00 +0.000000E+00 +2.430409E-02 +1.220833E-04 +5.554247E-02 +6.252448E-04 +0.000000E+00 +0.000000E+00 +3.277097E-03 +2.289856E-06 +5.878108E-03 +7.064854E-06 +0.000000E+00 +0.000000E+00 +3.732383E-02 +2.872115E-04 +5.140728E-01 +5.776753E-02 +0.000000E+00 +0.000000E+00 +2.888862E-02 +1.727185E-04 +3.995844E-01 +3.239513E-02 +0.000000E+00 +0.000000E+00 +2.245006E-02 +1.063493E-04 +6.012618E-02 +7.350842E-04 +0.000000E+00 +0.000000E+00 +2.364876E-03 +1.151142E-06 +6.103232E-03 +8.126910E-06 +0.000000E+00 +0.000000E+00 +3.151201E-02 +2.108865E-04 +3.437759E-01 +2.398626E-02 +0.000000E+00 +0.000000E+00 +2.757290E-02 +1.564838E-04 +3.374672E-01 +2.299073E-02 +0.000000E+00 +0.000000E+00 +2.008679E-02 +8.306765E-05 +5.170394E-02 +5.380731E-04 +0.000000E+00 +0.000000E+00 +1.931921E-03 +1.005318E-06 +5.262659E-03 +5.860208E-06 +0.000000E+00 +0.000000E+00 +2.095824E-02 +8.922951E-05 +2.186066E-01 +1.004483E-02 +0.000000E+00 +0.000000E+00 +2.494169E-02 +1.252761E-04 +2.315602E-01 +1.119928E-02 +0.000000E+00 +0.000000E+00 +1.851532E-02 +6.983649E-05 +4.501001E-02 +4.136072E-04 +0.000000E+00 +0.000000E+00 +2.221694E-03 +1.048753E-06 +5.820195E-03 +7.008120E-06 +tally 2: +2.194240E-01 +9.811952E-03 +2.718491E-01 +1.501408E-02 +5.823038E-01 +6.967280E-02 +5.955012E-01 +7.246929E-02 +2.496521E-01 +1.268521E-02 +2.623766E-01 +1.397567E-02 +3.475667E-01 +2.453188E-02 +3.290723E-01 +2.187833E-02 +1.123843E+00 +2.718539E-01 +1.060797E+00 +2.384769E-01 +3.373095E-01 +2.280788E-02 +3.563621E-01 +2.594087E-02 +3.442434E-01 +2.400708E-02 +3.319540E-01 +2.206590E-02 +1.051427E+00 +2.459968E-01 +1.065112E+00 +2.465202E-01 +3.182627E-01 +2.049613E-02 +3.724575E-01 +2.824300E-02 +2.274581E-01 +1.052009E-02 +2.558629E-01 +1.318940E-02 +5.434276E-01 +6.081708E-02 +5.623197E-01 +6.408372E-02 +2.320052E-01 +1.096050E-02 +2.380175E-01 +1.168927E-02 +tally 3: +4.195134E-02 +3.639654E-04 +7.345058E-02 +1.082591E-03 +5.325577E-02 +5.772001E-04 +1.390109E-01 +3.954675E-03 +3.829062E-01 +3.001419E-02 +1.408217E-01 +4.113283E-03 +1.412139E-01 +4.218445E-03 +3.567122E-01 +2.663446E-02 +1.393013E-01 +3.978946E-03 +5.117767E-02 +5.394412E-04 +8.111129E-02 +1.362452E-03 +5.594852E-02 +6.333549E-04 +6.298061E-02 +8.073054E-04 +9.082908E-02 +1.668351E-03 +6.783427E-02 +9.250122E-04 +1.999222E-01 +8.028088E-03 +5.909662E-01 +7.061368E-02 +1.896895E-01 +7.242074E-03 +1.877543E-01 +7.145844E-03 +6.189100E-01 +7.667032E-02 +1.847604E-01 +6.905108E-03 +6.017074E-02 +7.311068E-04 +1.109867E-01 +2.474797E-03 +7.322493E-02 +1.112742E-03 +6.859899E-02 +9.576740E-04 +1.062208E-01 +2.360724E-03 +6.762553E-02 +9.247454E-04 +2.367276E-01 +1.130443E-02 +9.674870E-01 +2.606562E-01 +2.113618E-01 +8.988266E-03 +2.079097E-01 +8.765092E-03 +9.535566E-01 +2.216359E-01 +2.131094E-01 +9.143533E-03 +6.644946E-02 +9.024189E-04 +1.064224E-01 +2.284439E-03 +8.143154E-02 +1.362849E-03 +6.209959E-02 +7.875797E-04 +9.702493E-02 +1.902685E-03 +6.416842E-02 +8.369934E-04 +1.727520E-01 +6.027045E-03 +5.966710E-01 +7.197863E-02 +1.889340E-01 +7.213441E-03 +1.914452E-01 +7.420265E-03 +5.726219E-01 +6.723631E-02 +1.646287E-01 +5.489910E-03 +5.663491E-02 +6.494568E-04 +9.923269E-02 +2.053123E-03 +6.809958E-02 +9.386140E-04 +4.850339E-02 +4.856214E-04 +8.169408E-02 +1.354206E-03 +5.474566E-02 +6.128204E-04 +1.208954E-01 +3.074917E-03 +3.393101E-01 +2.398955E-02 +1.358915E-01 +3.758521E-03 +1.347810E-01 +3.718991E-03 +3.404279E-01 +2.380238E-02 +1.315829E-01 +3.585161E-03 +4.754269E-02 +4.593490E-04 +7.591439E-02 +1.170776E-03 +5.121227E-02 +5.346435E-04 +tally 4: +2.194240E-01 +9.811952E-03 +2.718491E-01 +1.501408E-02 +5.823038E-01 +6.967280E-02 +5.955012E-01 +7.246929E-02 +2.496521E-01 +1.268521E-02 +2.623766E-01 +1.397567E-02 +3.475667E-01 +2.453188E-02 +3.290723E-01 +2.187833E-02 +1.123843E+00 +2.718539E-01 +1.060797E+00 +2.384769E-01 +3.373095E-01 +2.280788E-02 +3.563621E-01 +2.594087E-02 +3.442434E-01 +2.400708E-02 +3.319540E-01 +2.206590E-02 +1.051427E+00 +2.459968E-01 +1.065112E+00 +2.465202E-01 +3.182627E-01 +2.049613E-02 +3.724575E-01 +2.824300E-02 +2.274581E-01 +1.052009E-02 +2.558629E-01 +1.318940E-02 +5.434276E-01 +6.081708E-02 +5.623197E-01 +6.408372E-02 +2.320052E-01 +1.096050E-02 +2.380175E-01 +1.168927E-02 diff --git a/tests/regression_tests/filter_translations/test.py b/tests/regression_tests/filter_translations/test.py index a8d96158f5..6d2554ed2d 100644 --- a/tests/regression_tests/filter_translations/test.py +++ b/tests/regression_tests/filter_translations/test.py @@ -1,18 +1,16 @@ from itertools import permutations +from openmc import mesh import numpy as np import openmc import pytest -from tests.testing_harness import HashedPyAPITestHarness +from tests.testing_harness import PyAPITestHarness -translations = list(permutations((10, 5, 0))) + list(permutations((-10, -5, 0))) -@pytest.fixture(params=translations) +@pytest.fixture def model(request): - translation = np.array(request.param) - model = openmc.model.Model() fuel = openmc.Material() @@ -35,24 +33,49 @@ def model(request): model.settings.inactive = 0 model.settings.particles = 1000 - llc = np.array([-9, -9, -9]) - translation - urc = np.array([9, 9, 9]) - translation + translation = np.array((10, -5, 0)) + llc = np.array([-9, -9, -9]) + urc = np.array([9, 9, 9]) + + mesh_dims = (3, 4, 5) + + filters = [] + + # un-translated meshes reg_mesh = openmc.RegularMesh() - reg_mesh.dimension = [9, 9, 9] + reg_mesh.dimension = mesh_dims reg_mesh.lower_left = llc reg_mesh.upper_right = urc - recti_mesh = openmc.RectilinearMesh() - recti_mesh.x_grid = np.linspace(llc[0], urc[0], 17) - recti_mesh.y_grid = np.linspace(llc[1], urc[1], 17) - recti_mesh.z_grid = np.linspace(llc[2], urc[2], 17) + filters.append(openmc.MeshFilter(reg_mesh)) - # Create filters - filters = [openmc.MeshFilter(reg_mesh), - openmc.MeshFilter(recti_mesh)] - for f in filters: - f.translation = translation + recti_mesh = openmc.RectilinearMesh() + recti_mesh.x_grid = np.linspace(llc[0], urc[0], mesh_dims[0]) + recti_mesh.y_grid = np.linspace(llc[1], urc[1], mesh_dims[1]) + recti_mesh.z_grid = np.linspace(llc[2], urc[2], mesh_dims[2]) + + filters.append(openmc.MeshFilter(recti_mesh)) + + llc -= translation + urc -= translation + + # translated meshes + translated_reg_mesh = openmc.RegularMesh() + translated_reg_mesh.dimension = mesh_dims + translated_reg_mesh.lower_left = llc + translated_reg_mesh.upper_right = urc + + filters.append(openmc.MeshFilter(translated_reg_mesh)) + filters[-1].translation = translation + + translated_recti_mesh = openmc.RectilinearMesh() + translated_recti_mesh.x_grid = np.linspace(llc[0], urc[0], mesh_dims[0]) + translated_recti_mesh.y_grid = np.linspace(llc[1], urc[1], mesh_dims[1]) + translated_recti_mesh.z_grid = np.linspace(llc[2], urc[2], mesh_dims[2]) + + filters.append(openmc.MeshFilter(translated_recti_mesh)) + filters[-1].translation = translation # Create tallies for f in filters: @@ -61,12 +84,11 @@ def model(request): tally.scores = ['total'] model.tallies.append(tally) - input_name = 'input_dat_' + '_'.join(map(str, translation)) + '.dat' - return model, input_name + return model def test_filter_mesh_translations(model): - harness = HashedPyAPITestHarness('statepoint.5.h5', *model) + harness = PyAPITestHarness('statepoint.5.h5', model) harness.main()