From e25512a646852f67469ea95b51d70d64bc21fe2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= Date: Tue, 4 Sep 2012 13:00:51 +0200 Subject: [PATCH] Changed std::copy() statements to account for n != 1. However, there are more changes needed to make the program support n != 1, this is just to reduce the surprise factor a little. --- tests/pvt_test.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/pvt_test.cpp b/tests/pvt_test.cpp index a986eb93..a175885a 100644 --- a/tests/pvt_test.cpp +++ b/tests/pvt_test.cpp @@ -112,29 +112,29 @@ int main(int argc, char** argv) double A[max_np*max_np*n]; double dA[max_np*max_np*n]; props.matrix(n, p, z, cells, A, dA); - std::copy(A, A + np*np, std::ostream_iterator(aos, " ")); - std::copy(dA, dA + np*np, std::ostream_iterator(aos, " ")); + std::copy(A, A + np*np*n, std::ostream_iterator(aos, " ")); + std::copy(dA, dA + np*np*n, std::ostream_iterator(aos, " ")); aos << std::endl; double mu[max_np]; //double dmu[max_np];//not implemented props.viscosity(n, p, z, cells, mu, 0); - std::copy(mu, mu + np, std::ostream_iterator(muos, " ")); - //std::copy(dmu, dmu + np, std::ostream_iterator(muos, " ")); + std::copy(mu, mu + np*n, std::ostream_iterator(muos, " ")); + //std::copy(dmu, dmu + np*n, std::ostream_iterator(muos, " ")); aos << std::endl; double b[max_np]; double dbdp[max_np]; pvt.dBdp(n, p, z, b, dbdp); - std::copy(b, b + np, std::ostream_iterator(bos, " ")); - std::copy(dbdp, dbdp + np, std::ostream_iterator(bos, " ")); + std::copy(b, b + np*n, std::ostream_iterator(bos, " ")); + std::copy(dbdp, dbdp + np*n, std::ostream_iterator(bos, " ")); bos << std::endl; double rs[max_np]; double drs[max_np]; //pvt.R(n, p, z, rs); pvt.dRdp(n, p, z, rs,drs); - std::copy(rs, rs + np, std::ostream_iterator(rsos, " ")); - std::copy(drs, drs + np, std::ostream_iterator(rsos, " ")); + std::copy(rs, rs + np*n, std::ostream_iterator(rsos, " ")); + std::copy(drs, drs + np*n, std::ostream_iterator(rsos, " ")); rsos << std::endl; } }