diff --git a/data/Artemis export - Geometry RPBC_setup_05_14102016_105117.uff b/data/Artemis export - Geometry RPBC_setup_05_14102016_105117.uff index 70a3a82..38c5cfd 100644 --- a/data/Artemis export - Geometry RPBC_setup_05_14102016_105117.uff +++ b/data/Artemis export - Geometry RPBC_setup_05_14102016_105117.uff @@ -3,7 +3,7 @@ 16 0 0 0 0.00000E+00 0.00000E+00 0.00000E+00 17 0 0 0 1.53000E+00 0.00000E+00 0.00000E+00 18 0 0 0 0.00000E+00 3.84000E+00 0.00000E+00 - 19 0 0 0 1.53000E+00 3.84000E+00 0.00000E+00 + 19 0 0 0 -1.53000E+00 3.84000E+00 0.00000E+00 20 0 0 0 0.00000E+00 0.00000E+00 1.83000E+00 21 0 0 0 1.53000E+00 0.00000E+00 1.83000E+00 22 0 0 0 0.00000E+00 3.84000E+00 1.83000E+00 diff --git a/pyuff/datasets/dataset_15.py b/pyuff/datasets/dataset_15.py index 3c6c643..1f50908 100644 --- a/pyuff/datasets/dataset_15.py +++ b/pyuff/datasets/dataset_15.py @@ -30,7 +30,7 @@ def get_structure_15(raw=False): print(out) FORMATS = [ - ['10.0f', '10.0f', '10.0f', '10.0f', '13.5f', '13.5f', '13.5f'], + ['10.0f', '10.0f', '10.0f', '10.0f', '13.5E', '13.5E', '13.5E'], ] def _write15(fh, dset): diff --git a/tests/test_15.py b/tests/test_15.py index d7164e8..dd95bc4 100644 --- a/tests/test_15.py +++ b/tests/test_15.py @@ -53,7 +53,7 @@ def test_read(): uff_ascii = pyuff.UFF('./data/Artemis export - Geometry RPBC_setup_05_14102016_105117.uff') a = uff_ascii.read_sets(0) np.testing.assert_array_equal(a['node_nums'][:4],[16.0, 17.0, 18.0, 19.0]) - x = [0.0, 1.53, 0.0, 1.53, 0.0, 1.53, 0.0, 1.53, 4.296, 5.616, 4.296] + x = [0.0, 1.53, 0.0,-1.53, 0.0, 1.53, 0.0, 1.53, 4.296, 5.616, 4.296] y = [0.0, 0.0, 3.84, 3.84, 0.0, 0.0, 3.84, 3.84, 0.382, 0.382, 1.102] z = [0.0, 0.0, 0.0, 0.0, 1.83, 1.83, 1.83, 1.83, 0.4] np.testing.assert_array_equal(a['x'][:len(x)],x)