From a5a127b78721ee1a559b278397afbc6bbb026149 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Tue, 27 Oct 2020 16:46:08 +0100 Subject: [PATCH] new tests+ updated results --- .../tests/reference/Result/12grains6x7x8.geom | 61 ------------------- .../tests/reference/Result/12grains6x7x8.vtr | 30 +++++++++ .../Result/6grains6x7x8_single_phase.geom | 61 ------------------- .../Result/6grains6x7x8_single_phase.vtr | 30 +++++++++ python/tests/test_Result.py | 5 ++ 5 files changed, 65 insertions(+), 122 deletions(-) delete mode 100644 python/tests/reference/Result/12grains6x7x8.geom create mode 100644 python/tests/reference/Result/12grains6x7x8.vtr delete mode 100644 python/tests/reference/Result/6grains6x7x8_single_phase.geom create mode 100644 python/tests/reference/Result/6grains6x7x8_single_phase.vtr diff --git a/python/tests/reference/Result/12grains6x7x8.geom b/python/tests/reference/Result/12grains6x7x8.geom deleted file mode 100644 index 4e6836bb8..000000000 --- a/python/tests/reference/Result/12grains6x7x8.geom +++ /dev/null @@ -1,61 +0,0 @@ -4 header -grid a 6 b 7 c 8 -size x 0.75 y 0.875 z 1.0 -origin x 0.0 y 0.0 z 0.0 -homogenization 1 - 9 3 3 10 9 9 - 9 1 1 1 9 9 - 9 11 1 1 7 9 - 7 11 11 7 7 7 - 7 11 11 7 7 7 -12 3 3 10 7 12 -12 3 3 10 10 12 -12 3 3 1 9 9 - 9 1 1 1 9 9 - 9 1 1 1 7 7 - 7 1 1 7 7 7 -12 12 3 7 7 7 -12 3 3 3 12 12 -12 3 3 3 12 12 -12 3 3 1 1 12 - 9 1 1 1 1 9 - 6 1 1 1 8 8 - 7 6 8 8 8 8 -12 12 8 8 8 12 -12 3 3 3 12 12 -12 3 3 3 12 12 - 5 6 6 6 1 12 - 6 6 6 6 8 8 - 6 6 6 8 8 8 - 8 6 8 8 8 8 -12 5 8 8 8 8 -12 5 5 8 8 12 - 5 5 5 3 12 12 - 5 5 6 6 6 5 - 6 6 6 6 6 6 - 6 6 6 6 8 8 - 4 4 6 8 8 8 - 4 4 2 2 2 8 - 5 5 5 2 2 2 - 5 5 5 5 2 5 - 5 5 5 10 10 5 - 6 6 6 6 10 4 - 4 4 11 11 2 4 - 4 4 11 2 2 4 - 4 4 2 2 2 2 - 5 5 5 2 2 2 - 5 5 5 10 10 5 - 5 5 10 10 10 9 - 4 11 11 11 10 9 - 4 4 11 11 11 4 - 4 4 11 11 2 4 - 4 4 2 2 2 2 - 5 5 2 2 2 2 - 5 5 10 10 10 10 - 9 10 10 10 10 9 - 9 11 11 10 9 9 - 4 11 11 11 9 9 - 4 11 11 11 7 7 - 4 4 11 2 7 7 -12 10 10 10 10 7 - 9 10 10 10 10 9 diff --git a/python/tests/reference/Result/12grains6x7x8.vtr b/python/tests/reference/Result/12grains6x7x8.vtr new file mode 100644 index 000000000..02ba9d4e6 --- /dev/null +++ b/python/tests/reference/Result/12grains6x7x8.vtr @@ -0,0 +1,30 @@ + + + + + + AQAAAACAAAARAAAAGQAAAA==eF7LyM/NT0/Ny6xKLMnMz1MwZAAAPsIGPQ== + + + + + + + + AQAAAACAAACACgAA2wAAAA==eF6tlssOgkAQBNcHiPj//2uM25eOZc8oc6kYagzdISzbeM/ZeJ/cgDTk7x/c16zm6fduXAOr/mOS8rqXfDH5mqP6pKHcVY9yJN/ziv5/R/k+8lI/GnnLV2uMm1G5tefXnZ6j6v3bD/nXyQWokU8e5a96tJc8z9H1aY88MfWZek3Xf6XnuBhTr+6fgPKpH9oj3/eS5+/bap/yPafo54buJ/mek3zqJeXu+tRP8vycp15E8tNe6rPaf7fPrk/9eO6q598/1GO1/67v53V6nul8T3n9Oy758p47Sgdl + + + + + AQAAAACAAAA4AAAAHAAAAA==eF5jYEAGB+wh9AUofQNKP4DST6D0C3sAisIGjw== + + + AQAAAACAAABAAAAAHwAAAA==eF5jYEAGB+wh9AUofQNKP4DST6D0Cyj9xh4AwVEHug== + + + AQAAAACAAABIAAAAIgAAAA==eF5jYEAGB+wh9AUofQNKP4DST6D0Cyj9Bkp/sAcAAU8I6Q== + + + + + diff --git a/python/tests/reference/Result/6grains6x7x8_single_phase.geom b/python/tests/reference/Result/6grains6x7x8_single_phase.geom deleted file mode 100644 index 14cae0973..000000000 --- a/python/tests/reference/Result/6grains6x7x8_single_phase.geom +++ /dev/null @@ -1,61 +0,0 @@ -4 header -grid a 6 b 7 c 8 -size x 0.75 y 0.875 z 1.0 -origin x 0.0 y 0.0 z 0.0 -homogenization 1 -3 3 3 4 3 3 -3 1 1 1 3 3 -3 5 1 1 1 3 -1 5 5 1 1 1 -1 5 5 1 1 1 -6 3 3 4 1 6 -6 3 3 4 4 6 -6 3 3 1 3 3 -3 1 1 1 3 3 -3 1 1 1 1 1 -1 1 1 1 1 1 -6 6 3 1 1 1 -6 3 3 3 6 6 -6 3 3 3 6 6 -6 3 3 1 1 6 -3 1 1 1 1 3 -6 1 1 1 2 2 -1 6 2 2 2 2 -6 6 2 2 2 6 -6 3 3 3 6 6 -6 3 3 3 6 6 -5 6 6 6 1 6 -6 6 6 6 2 2 -6 6 6 2 2 2 -2 6 2 2 2 2 -6 5 2 2 2 2 -6 5 5 2 2 6 -5 5 5 3 6 6 -5 5 6 6 6 5 -6 6 6 6 6 6 -6 6 6 6 2 2 -4 4 6 2 2 2 -4 4 2 2 2 2 -5 5 5 2 2 2 -5 5 5 5 2 5 -5 5 5 4 4 5 -6 6 6 6 4 4 -4 4 5 5 2 4 -4 4 5 2 2 4 -4 4 2 2 2 2 -5 5 5 2 2 2 -5 5 5 4 4 5 -5 5 4 4 4 3 -4 5 5 5 4 3 -4 4 5 5 5 4 -4 4 5 5 2 4 -4 4 2 2 2 2 -5 5 2 2 2 2 -5 5 4 4 4 4 -3 4 4 4 4 3 -3 5 5 4 3 3 -4 5 5 5 3 3 -4 5 5 5 1 1 -4 4 5 2 1 1 -6 4 4 4 4 1 -3 4 4 4 4 3 diff --git a/python/tests/reference/Result/6grains6x7x8_single_phase.vtr b/python/tests/reference/Result/6grains6x7x8_single_phase.vtr new file mode 100644 index 000000000..9a7b7dd7d --- /dev/null +++ b/python/tests/reference/Result/6grains6x7x8_single_phase.vtr @@ -0,0 +1,30 @@ + + + + + + AQAAAACAAAARAAAAGQAAAA==eF7LyM/NT0/Ny6xKLMnMz1MwZAAAPsIGPQ== + + + + + + + + AQAAAACAAACACgAAwAAAAA==eF69lcsOwjAQA6GU//9lDsUSGjHyBgq+WGpm09jqY7sc2uA3uR43Gb+/YV/FfXd405S/P93ykmt8vPHRWX3+SpbDZHnj3O8snpqeN+L9TFd4lDmu05ljyn3bj/F5P2yfyNZbnilnc1MuOVZ5mzMu3vpsvbb1T5057Ltk/ZBvfVo/qzznGsdzTvvknO3D8zS+9fjvPlsu4/ifn87bf7DNNf7sPlf59rxYbuPircdp/6s81Z5navoeRav9PACxsANv + + + + + AQAAAACAAAA4AAAAHAAAAA==eF5jYEAGB+wh9AUofQNKP4DST6D0C3sAisIGjw== + + + AQAAAACAAABAAAAAHwAAAA==eF5jYEAGB+wh9AUofQNKP4DST6D0Cyj9xh4AwVEHug== + + + AQAAAACAAABIAAAAIgAAAA==eF5jYEAGB+wh9AUofQNKP4DST6D0Cyj9Bkp/sAcAAU8I6Q== + + + + + diff --git a/python/tests/test_Result.py b/python/tests/test_Result.py index 68b72badf..5ef17cd26 100644 --- a/python/tests/test_Result.py +++ b/python/tests/test_Result.py @@ -341,6 +341,11 @@ class TestResult: os.chdir(tmp_path) default.save_vtk(output) + @pytest.mark.parametrize('mode',['point','cell']) + def test_vtk_mode(self,tmp_path,single_phase,mode): + os.chdir(tmp_path) + single_phase.save_vtk(mode=mode) + def test_XDMF(self,tmp_path,single_phase): os.chdir(tmp_path) single_phase.save_XDMF()