From cbb8ccecc3cf937d837f298e9422b2604e1b5ca7 Mon Sep 17 00:00:00 2001 From: jeremiah-corrado Date: Mon, 24 Jul 2023 11:47:29 -0500 Subject: [PATCH 1/3] update mpi tests for new %? precision behavior Signed-off-by: jeremiah-corrado --- test/unstable/test.txt | 2 ++ test/users/npadmana/mpi/test_mpi.good | 32 +++++++++++++-------------- 2 files changed, 18 insertions(+), 16 deletions(-) create mode 100644 test/unstable/test.txt diff --git a/test/unstable/test.txt b/test/unstable/test.txt new file mode 100644 index 000000000000..1844db5110db --- /dev/null +++ b/test/unstable/test.txt @@ -0,0 +1,2 @@ +hello world from writeln +hello world from writeln again diff --git a/test/users/npadmana/mpi/test_mpi.good b/test/users/npadmana/mpi/test_mpi.good index 5277a5bcd275..f111aa85dbd7 100644 --- a/test/users/npadmana/mpi/test_mpi.good +++ b/test/users/npadmana/mpi/test_mpi.good @@ -21,22 +21,22 @@ RING : Rank 0 recieved 3 from the left, and 1 from the right RING : Rank 1 recieved 0 from the left, and 2 from the right RING : Rank 2 recieved 1 from the left, and 3 from the right RING : Rank 3 recieved 2 from the left, and 0 from the right -SCATTER1 : Rank 0 :0.000000e+00 1.000000e+00 2.000000e+00 3.000000e+00 -SCATTER1 : Rank 1 :4.000000e+00 5.000000e+00 6.000000e+00 7.000000e+00 -SCATTER1 : Rank 2 :8.000000e+00 9.000000e+00 1.000000e+01 1.100000e+01 -SCATTER1 : Rank 3 :1.200000e+01 1.300000e+01 1.400000e+01 1.500000e+01 -SCATTER2 : Rank 0 :1.000000e+00 2.000000e+00 3.000000e+00 4.000000e+00 -SCATTER2 : Rank 1 :5.000000e+00 6.000000e+00 7.000000e+00 8.000000e+00 -SCATTER2 : Rank 2 :9.000000e+00 1.000000e+01 1.100000e+01 1.200000e+01 -SCATTER2 : Rank 3 :1.300000e+01 1.400000e+01 1.500000e+01 1.600000e+01 -SCATTER3 : Rank 0 :1.000000e+00 5.000000e+00 9.000000e+00 1.300000e+01 -SCATTER3 : Rank 1 :2.000000e+00 6.000000e+00 1.000000e+01 1.400000e+01 -SCATTER3 : Rank 2 :3.000000e+00 7.000000e+00 1.100000e+01 1.500000e+01 -SCATTER3 : Rank 3 :4.000000e+00 8.000000e+00 1.200000e+01 1.600000e+01 -SCATTER4 : Rank 0 :6.000000e+00 7.000000e+00 1.300000e+01 1.400000e+01 -SCATTER4 : Rank 1 :6.000000e+00 7.000000e+00 1.300000e+01 1.400000e+01 -SCATTER4 : Rank 2 :6.000000e+00 7.000000e+00 1.300000e+01 1.400000e+01 -SCATTER4 : Rank 3 :6.000000e+00 7.000000e+00 1.300000e+01 1.400000e+01 +SCATTER1 : Rank 0 :0.0 1.0 2.0 3.0 +SCATTER1 : Rank 1 :4.0 5.0 6.0 7.0 +SCATTER1 : Rank 2 :8.0 9.0 10.0 11.0 +SCATTER1 : Rank 3 :12.0 13.0 14.0 15.0 +SCATTER2 : Rank 0 :1.0 2.0 3.0 4.0 +SCATTER2 : Rank 1 :5.0 6.0 7.0 8.0 +SCATTER2 : Rank 2 :9.0 10.0 11.0 12.0 +SCATTER2 : Rank 3 :13.0 14.0 15.0 16.0 +SCATTER3 : Rank 0 :1.0 5.0 9.0 13.0 +SCATTER3 : Rank 1 :2.0 6.0 10.0 14.0 +SCATTER3 : Rank 2 :3.0 7.0 11.0 15.0 +SCATTER3 : Rank 3 :4.0 8.0 12.0 16.0 +SCATTER4 : Rank 0 :6.0 7.0 13.0 14.0 +SCATTER4 : Rank 1 :6.0 7.0 13.0 14.0 +SCATTER4 : Rank 2 :6.0 7.0 13.0 14.0 +SCATTER4 : Rank 3 :6.0 7.0 13.0 14.0 TYPE : Rank : 0 : (x = 3.0, y = -3.0, z = 3.0, vel = 0.25, n = 3, typ = 1) TYPE : Rank : 1 : (x = 3.0, y = -3.0, z = 3.0, vel = 0.25, n = 3, typ = 1) TYPE : Rank : 2 : (x = 3.0, y = -3.0, z = 3.0, vel = 0.25, n = 3, typ = 1) From 3b1340b4e859b4164e1c423035e0abe778d8fc70 Mon Sep 17 00:00:00 2001 From: jeremiah-corrado Date: Mon, 24 Jul 2023 12:06:59 -0500 Subject: [PATCH 2/3] update %? format to show .0 for whole-number reals Signed-off-by: jeremiah-corrado --- runtime/src/qio/qio_formatted.c | 1 + 1 file changed, 1 insertion(+) diff --git a/runtime/src/qio/qio_formatted.c b/runtime/src/qio/qio_formatted.c index 6bd13d548a0d..19d34ce9b4ff 100644 --- a/runtime/src/qio/qio_formatted.c +++ b/runtime/src/qio/qio_formatted.c @@ -5071,6 +5071,7 @@ qioerr qio_conv_parse(c_string fmt, style_out->pad_char = ' '; style_out->realfmt = 0; style_out->string_format = QIO_STRING_FORMAT_WORD; + style_out->showpointzero = 1; if (precision != WIDTH_NOT_SET || width != WIDTH_NOT_SET ) { QIO_GET_CONSTANT_ERROR(err, EINVAL, "'%?' does not support width or precision arguments"); From fb42e7885bd3e20b6ad6ccefc9d26c72f5b9243f Mon Sep 17 00:00:00 2001 From: jeremiah-corrado Date: Mon, 24 Jul 2023 12:12:25 -0500 Subject: [PATCH 3/3] remove accidentally commited test file Signed-off-by: jeremiah-corrado --- test/unstable/test.txt | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 test/unstable/test.txt diff --git a/test/unstable/test.txt b/test/unstable/test.txt deleted file mode 100644 index 1844db5110db..000000000000 --- a/test/unstable/test.txt +++ /dev/null @@ -1,2 +0,0 @@ -hello world from writeln -hello world from writeln again