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

Change return type from tuple to array for getCellCenter().

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen
2015-11-24 14:25:37 +01:00
parent 33302f6edb
commit d87e20578c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp
View File

@@ -619,22 +619,22 @@ namespace Opm {
return ecl_grid_get_cell_thickness1( c_ptr() , static_cast<int>(globalIndex));
}
std::tuple<double,double,double> EclipseGrid::getCellCenter(size_t globalIndex) const {
std::array<double, 3> EclipseGrid::getCellCenter(size_t globalIndex) const {
assertGlobalIndex( globalIndex );
{
double x,y,z;
ecl_grid_get_xyz1( c_ptr() , static_cast<int>(globalIndex) , &x , &y , &z);
return std::tuple<double,double,double> {x,y,z};
return std::array<double, 3>{{x,y,z}};
}
}
std::tuple<double,double,double> EclipseGrid::getCellCenter(size_t i,size_t j, size_t k) const {
std::array<double, 3> EclipseGrid::getCellCenter(size_t i,size_t j, size_t k) const {
assertIJK(i,j,k);
{
double x,y,z;
ecl_grid_get_xyz3( c_ptr() , static_cast<int>(i),static_cast<int>(j),static_cast<int>(k), &x , &y , &z);
return std::tuple<double,double,double> {x,y,z};
return std::array<double, 3>{{x,y,z}};
}
}

4
opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp
View File

@@ -91,8 +91,8 @@ namespace Opm {
size_t getGlobalIndex(size_t i, size_t j, size_t k) const;
void assertGlobalIndex(size_t globalIndex) const;
void assertIJK(size_t i , size_t j , size_t k) const;
std::tuple<double,double,double> getCellCenter(size_t i,size_t j, size_t k) const;
std::tuple<double,double,double> getCellCenter(size_t globalIndex) const;
std::array<double, 3> getCellCenter(size_t i,size_t j, size_t k) const;
std::array<double, 3> getCellCenter(size_t globalIndex) const;
double getCellVolume(size_t globalIndex) const;
double getCellVolume(size_t i , size_t j , size_t k) const;
double getCellThicknes(size_t globalIndex) const;