OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#3630 Fix volume sum calculation to avoid multiplying by volume twice.

Browse Source
This commit is contained in:
Gaute Lindkvist
2018-11-06 13:14:13 +01:00
parent ef4b70d6e5
commit 50a0924f84
3 changed files with 43 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/ReservoirDataModel/RigCellGeometryTools.cpp
View File

@@ -45,8 +45,8 @@
/// |/ |/
/// 0---------1
///
/// While in ResInsight, this is the numbering. Thus 2<->3, 6<->7 from the paper.
/// Note the negative k!
/// While in ResInsight, this is the numbering. Thus we need to swap 2<->3, 6<->7 in the equations.
/// Note the negative k! This causes an additional set of 0<->4, 1<->5, etc. index swaps.
/// 7---------6
/// /| /| |-k
/// / | / | | /j
@@ -77,8 +77,9 @@ double RigCellGeometryTools::calculateCellVolume(const std::array<cvf::Vec3d, 8>
// 2 flops for summation + 1 for division = 3 flops
double volume = (det1 + det2 + det3) / 12.0;
CVF_ASSERT(volume > 0.0);
return volume;
// Assume 0 in volume for degenerate cells. 1 flop.
return std::max(0.0, volume); // Altogether 18 + 3*17 + 3 + 1 flops = 73 flops.
}
//--------------------------------------------------------------------------------------------------