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

Fix Linux build by removing use of Invoke and including some headers

Browse Source
This commit is contained in:
Gaute Lindkvist
2018-06-06 12:47:23 +02:00
parent d353a9fc44
commit 5b0a185549
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/ReservoirDataModel/RigGeoMechBoreHoleStressCalculator.cpp
View File

@@ -74,7 +74,7 @@ double RigGeoMechBoreHoleStressCalculator::solveBisection(double minPw, double m
for (int i = 0; i <= N; ++i)
{
double pw = minPw + (maxPw - minPw) * i / static_cast<double>(N);
double f_pw = std::invoke(fn, this, pw, &theta);
double f_pw = (this->*fn)(pw, &theta);
if (f_pw >= 0.0 && f_pw < smallestPositiveValue.second)
{
smallestPositiveValue = std::make_pair(pw, f_pw);
@@ -97,15 +97,15 @@ double RigGeoMechBoreHoleStressCalculator::solveBisection(double minPw, double m
return largestNegativeValue.first;
}
double minPwFuncVal = std::invoke(fn, this, largestNegativeValue.first, &theta);
double maxPwFuncVal = std::invoke(fn, this, smallestPositiveValue.first, &theta);
double minPwFuncVal = (this->*fn)(largestNegativeValue.first, &theta);
double maxPwFuncVal = (this->*fn)(smallestPositiveValue.first, &theta);
double range = maxPw - minPw;
int i = 0;
for (; i <= N && range > m_porePressure * epsilon; ++i)
{
double midPw = (minPw + maxPw) * 0.5;
double midPwFuncVal = std::invoke(fn, this, midPw, &theta);
double midPwFuncVal = (this->*fn)(midPw, &theta);
if (midPwFuncVal * minPwFuncVal < 0.0)
{
maxPw = midPw;
@@ -140,16 +140,16 @@ double RigGeoMechBoreHoleStressCalculator::solveSecant(MemberFunc fn, double* th
double theta = 0.0;
double x_0 = 0.0;
double f_x0 = std::invoke(fn, this, x_0, &theta);
double f_x0 = (this->*fn)(x_0, &theta);
double x_1 = m_porePressure;
double f_x1 = std::invoke(fn, this, x_1, &theta);
double f_x1 = (this->*fn)(x_1, &theta);
double x = 0.0;
double f_x = 0.0;
int i = 0;
for (; i < N && std::abs(f_x1 - f_x0) > epsilon; ++i)
{
x = x_1 - f_x1 * (x_1 - x_0) / (f_x1 - f_x0);
f_x = std::invoke(fn, this, x, &theta);
f_x = (this->*fn)(x, &theta);
if (std::abs(f_x) < epsilon * m_porePressure) break;
// Update iteration variables

1
ApplicationCode/ReservoirDataModel/RigGeoMechWellLogExtractor.cpp
View File

@@ -22,6 +22,7 @@
//==================================================================================================
#include "RigGeoMechWellLogExtractor.h"
#include "RigFemTypes.h"
#include "RigGeoMechBoreHoleStressCalculator.h"
#include "RigFemPart.h"
#include "RigFemPartCollection.h"

4
ApplicationCode/ReservoirDataModel/RigGeoMechWellLogExtractor.h
View File

@@ -21,6 +21,8 @@
#include "RigWellLogExtractor.h"
#include "RigFemResultPosEnum.h"
#include "cafTensor3.h"
#include "cvfBase.h"
@@ -31,8 +33,6 @@
#include <vector>
enum RigElementType;
enum RigFemResultPosEnum;
class RigFemResultAddress;
class RigGeoMechCaseData;
class RigWellPath;