From dbbe12525f2b0c396212ba5258f5d513fcaf1a55 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Thu, 13 Sep 2018 02:30:37 +0200 Subject: [PATCH] Change output format --- source/lac/trilinos_tpetra_vector.cc | 6 ++-- .../trilinos/tpetra_vector_03.mpirun=2.output | 16 +++------- .../trilinos/tpetra_vector_03.mpirun=4.output | 32 +++++-------------- 3 files changed, 14 insertions(+), 40 deletions(-) diff --git a/source/lac/trilinos_tpetra_vector.cc b/source/lac/trilinos_tpetra_vector.cc index 0a52aa1972..5e3c00b53a 100644 --- a/source/lac/trilinos_tpetra_vector.cc +++ b/source/lac/trilinos_tpetra_vector.cc @@ -588,12 +588,10 @@ namespace LinearAlgebra if (across) for (unsigned int i = 0; i < local_length; ++i) - out << i << "->" << vector->getMap()->getGlobalElement(i) << ": " - << vector_1d(i) << std::endl; - // out << val[i] << ' '; + out << vector_1d(i) << ' '; else for (unsigned int i = 0; i < local_length; ++i) - out << val[i] << std::endl; + out << vector_1d(i) << std::endl; out << std::endl; // restore the representation diff --git a/tests/trilinos/tpetra_vector_03.mpirun=2.output b/tests/trilinos/tpetra_vector_03.mpirun=2.output index 5d5f9c0afb..638319c2f1 100644 --- a/tests/trilinos/tpetra_vector_03.mpirun=2.output +++ b/tests/trilinos/tpetra_vector_03.mpirun=2.output @@ -1,17 +1,13 @@ DEAL:0::Tpetra first import add: -0->0: 2.000e+00 -1->1: 1.000e+02 - +2.000e+00 1.000e+02 IndexSet: {[0,2]} [0]: 1.000e+00 [1]: 1.000e+02 [2]: 1.000e+01 DEAL:0::Tpetra second import add: -0->0: 4.000e+00 -1->1: 2.000e+02 - +4.000e+00 2.000e+02 IndexSet: {[0,2]} [0]: 2.000e+00 @@ -37,17 +33,13 @@ IndexSet: {[0,2]} [2]: 1.000e+02 DEAL:1::Tpetra first import add: -0->2: 1.000e+01 -1->3: 1.010e+02 - +1.000e+01 1.010e+02 IndexSet: {0, 3} [0]: 1.000e+00 [3]: 1.010e+02 DEAL:1::Tpetra second import add: -0->2: 3.000e+01 -1->3: 2.010e+02 - +3.000e+01 2.010e+02 IndexSet: {0, 3} [0]: 2.000e+00 diff --git a/tests/trilinos/tpetra_vector_03.mpirun=4.output b/tests/trilinos/tpetra_vector_03.mpirun=4.output index bb8d36da88..f70ed13b09 100644 --- a/tests/trilinos/tpetra_vector_03.mpirun=4.output +++ b/tests/trilinos/tpetra_vector_03.mpirun=4.output @@ -1,17 +1,13 @@ DEAL:0::Tpetra first import add: -0->0: 4.000e+00 -1->1: 1.000e+02 - +4.000e+00 1.000e+02 IndexSet: {[0,2]} [0]: 1.000e+00 [1]: 1.000e+02 [2]: 1.000e+01 DEAL:0::Tpetra second import add: -0->0: 8.000e+00 -1->1: 2.000e+02 - +8.000e+00 2.000e+02 IndexSet: {[0,2]} [0]: 2.000e+00 @@ -37,18 +33,14 @@ IndexSet: {[0,2]} [2]: 1.000e+02 DEAL:1::Tpetra first import add: -0->2: 1.000e+01 -1->3: 1.010e+02 - +1.000e+01 1.010e+02 IndexSet: {0, [3,4]} [0]: 1.000e+00 [3]: 1.010e+02 [4]: 1.100e+01 DEAL:1::Tpetra second import add: -0->2: 3.000e+01 -1->3: 2.010e+02 - +3.000e+01 2.010e+02 IndexSet: {0, [3,4]} [0]: 2.000e+00 @@ -75,18 +67,14 @@ IndexSet: {0, [3,4]} DEAL:2::Tpetra first import add: -0->4: 1.100e+01 -1->5: 1.020e+02 - +1.100e+01 1.020e+02 IndexSet: {0, [5,6]} [0]: 1.000e+00 [5]: 1.020e+02 [6]: 1.200e+01 DEAL:2::Tpetra second import add: -0->4: 3.200e+01 -1->5: 2.020e+02 - +3.200e+01 2.020e+02 IndexSet: {0, [5,6]} [0]: 2.000e+00 @@ -113,17 +101,13 @@ IndexSet: {0, [5,6]} DEAL:3::Tpetra first import add: -0->6: 1.200e+01 -1->7: 1.030e+02 - +1.200e+01 1.030e+02 IndexSet: {0, 7} [0]: 1.000e+00 [7]: 1.030e+02 DEAL:3::Tpetra second import add: -0->6: 3.400e+01 -1->7: 2.030e+02 - +3.400e+01 2.030e+02 IndexSet: {0, 7} [0]: 2.000e+00 -- 2.39.5