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

Simplify formula with atan2().

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen
2014-12-01 14:38:08 +01:00
parent 35a8bd4791
commit 8af3b17c68
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
opm/core/grid/GridUtilities.cpp
View File

@@ -114,10 +114,8 @@ namespace Opm
const int cell2 = nb[cell][ii]; const int cell2 = nb[cell][ii];
const double v[2] = { grid.cell_centroids[2*cell2] - grid.cell_centroids[2*cell], const double v[2] = { grid.cell_centroids[2*cell2] - grid.cell_centroids[2*cell],
grid.cell_centroids[2*cell2 + 1] - grid.cell_centroids[2*cell + 1] }; grid.cell_centroids[2*cell2 + 1] - grid.cell_centroids[2*cell + 1] };
double angle = std::acos(v[0]/std::sqrt(v[0]*v[0] + v[1]*v[1])); // The formula below gives an angle in [0, 2*pi] with the positive x axis.
if (v[1] < 0.0) { const double angle = boost::math::double_constants::pi - std::atan2(v[1], -v[0]);
angle = 2*boost::math::double_constants::pi - angle;
}
angle_and_pos[ii] = std::make_pair(angle, ii); angle_and_pos[ii] = std::make_pair(angle, ii);
} }
original.assign(nb[cell].begin(), nb[cell].end()); original.assign(nb[cell].begin(), nb[cell].end());