OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed std::copy() statements to account for n != 1.

Browse Source 
However, there are more changes needed to make the program
support n != 1, this is just to reduce the surprise factor a little.
This commit is contained in:
Atgeirr Flø Rasmussen 2012-09-04 13:00:51 +02:00
parent 846f2a534e
commit e25512a646
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/pvt_test.cpp
View File

@ -112,29 +112,29 @@ int main(int argc, char** argv)
double A[max_np*max_np*n]; double A[max_np*max_np*n];
double dA[max_np*max_np*n]; double dA[max_np*max_np*n];
props.matrix(n, p, z, cells, A, dA); props.matrix(n, p, z, cells, A, dA);
std::copy(A, A + np*np, std::ostream_iterator<double>(aos, " ")); std::copy(A, A + np*np*n, std::ostream_iterator<double>(aos, " "));
std::copy(dA, dA + np*np, std::ostream_iterator<double>(aos, " ")); std::copy(dA, dA + np*np*n, std::ostream_iterator<double>(aos, " "));
aos << std::endl; aos << std::endl;
double mu[max_np]; double mu[max_np];
//double dmu[max_np];//not implemented //double dmu[max_np];//not implemented
props.viscosity(n, p, z, cells, mu, 0); props.viscosity(n, p, z, cells, mu, 0);
std::copy(mu, mu + np, std::ostream_iterator<double>(muos, " ")); std::copy(mu, mu + np*n, std::ostream_iterator<double>(muos, " "));
//std::copy(dmu, dmu + np, std::ostream_iterator<double>(muos, " ")); //std::copy(dmu, dmu + np*n, std::ostream_iterator<double>(muos, " "));
aos << std::endl; aos << std::endl;
double b[max_np]; double b[max_np];
double dbdp[max_np]; double dbdp[max_np];
pvt.dBdp(n, p, z, b, dbdp); pvt.dBdp(n, p, z, b, dbdp);
std::copy(b, b + np, std::ostream_iterator<double>(bos, " ")); std::copy(b, b + np*n, std::ostream_iterator<double>(bos, " "));
std::copy(dbdp, dbdp + np, std::ostream_iterator<double>(bos, " ")); std::copy(dbdp, dbdp + np*n, std::ostream_iterator<double>(bos, " "));
bos << std::endl; bos << std::endl;
double rs[max_np]; double rs[max_np];
double drs[max_np]; double drs[max_np];
//pvt.R(n, p, z, rs); //pvt.R(n, p, z, rs);
pvt.dRdp(n, p, z, rs,drs); pvt.dRdp(n, p, z, rs,drs);
std::copy(rs, rs + np, std::ostream_iterator<double>(rsos, " ")); std::copy(rs, rs + np*n, std::ostream_iterator<double>(rsos, " "));
std::copy(drs, drs + np, std::ostream_iterator<double>(rsos, " ")); std::copy(drs, drs + np*n, std::ostream_iterator<double>(rsos, " "));
rsos << std::endl; rsos << std::endl;
} }
} }