mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Merge branch 'dev' into dev-deeper
This commit is contained in:
@@ -131,7 +131,7 @@ std::vector<RigCompletionData>
|
||||
{
|
||||
// No change in transmissibility for main bore
|
||||
auto transmissibilityAndPermeability =
|
||||
RicWellPathExportCompletionDataFeatureImpl::calculateTransmissibilityAndKh(
|
||||
RicWellPathExportCompletionDataFeatureImpl::calculateTransmissibilityData(
|
||||
settings.caseToApply,
|
||||
wellPath,
|
||||
wellBorePart.lengthsInCell,
|
||||
@@ -140,13 +140,13 @@ std::vector<RigCompletionData>
|
||||
globalCellIndex,
|
||||
settings.useLateralNTG);
|
||||
|
||||
transmissibility = transmissibilityAndPermeability.first;
|
||||
transmissibility = transmissibilityAndPermeability.connectionFactor();
|
||||
}
|
||||
else
|
||||
{
|
||||
// Adjust transmissibility for fishbone laterals
|
||||
auto transmissibilityAndPermeability =
|
||||
RicWellPathExportCompletionDataFeatureImpl::calculateTransmissibilityAndKh(
|
||||
RicWellPathExportCompletionDataFeatureImpl::calculateTransmissibilityData(
|
||||
settings.caseToApply,
|
||||
wellPath,
|
||||
wellBorePart.lengthsInCell,
|
||||
@@ -157,7 +157,7 @@ std::vector<RigCompletionData>
|
||||
numberOfLaterals,
|
||||
mainBoreDirection);
|
||||
|
||||
transmissibility = transmissibilityAndPermeability.first;
|
||||
transmissibility = transmissibilityAndPermeability.connectionFactor();
|
||||
}
|
||||
|
||||
CellDirection direction = RicWellPathExportCompletionDataFeatureImpl::calculateCellMainDirection(
|
||||
|
||||
@@ -1260,7 +1260,7 @@ void RicWellPathExportCompletionDataFeatureImpl::exportWelspecsToFile(RimEclipse
|
||||
std::set<const RimWellPath*> wellPathSet;
|
||||
|
||||
// Build list of unique RimWellPath
|
||||
for (const auto completion : completions)
|
||||
for (const auto& completion : completions)
|
||||
{
|
||||
const auto wellPath = findWellPathFromExportName(completion.wellName());
|
||||
if (wellPath)
|
||||
@@ -1272,13 +1272,13 @@ void RicWellPathExportCompletionDataFeatureImpl::exportWelspecsToFile(RimEclipse
|
||||
// Export
|
||||
for (const auto wellPath : wellPathSet)
|
||||
{
|
||||
auto rimCcompletions = wellPath->completions();
|
||||
cvf::Vec2i ijIntersection = wellPathUpperGridIntersectionIJ(gridCase, wellPath);
|
||||
auto rimCcompletions = wellPath->completions();
|
||||
auto ijIntersection = wellPathUpperGridIntersectionIJ(gridCase, wellPath);
|
||||
|
||||
formatter.add(rimCcompletions->wellNameForExport())
|
||||
.add(rimCcompletions->wellGroupNameForExport())
|
||||
.addOneBasedCellIndex(ijIntersection.x())
|
||||
.addOneBasedCellIndex(ijIntersection.y())
|
||||
.addOneBasedCellIndex(ijIntersection.second.x())
|
||||
.addOneBasedCellIndex(ijIntersection.second.y())
|
||||
.add(rimCcompletions->referenceDepthForExport())
|
||||
.add(rimCcompletions->wellTypeNameForExport())
|
||||
.rowCompleted();
|
||||
@@ -1311,32 +1311,44 @@ void RicWellPathExportCompletionDataFeatureImpl::exportWelspeclToFile(
|
||||
formatter.keyword("WELSPECL");
|
||||
formatter.header(header);
|
||||
|
||||
std::map<QString, std::set<const RimWellPath*>> wellPathMap;
|
||||
std::map<const RimWellPath*, std::set<QString>> wellPathToLgrNameMap;
|
||||
|
||||
// Build list of unique RimWellPath for each LGR
|
||||
for (const auto completionsForLgr : completions)
|
||||
for (const auto& completionsForLgr : completions)
|
||||
{
|
||||
wellPathMap.insert(std::make_pair(completionsForLgr.first, std::set<const RimWellPath*>()));
|
||||
|
||||
for (const auto completion : completionsForLgr.second)
|
||||
for (const auto& completion : completionsForLgr.second)
|
||||
{
|
||||
const auto wellPath = findWellPathFromExportName(completion.wellName());
|
||||
if (wellPath)
|
||||
{
|
||||
wellPathMap[completionsForLgr.first].insert(wellPath);
|
||||
}
|
||||
auto item = wellPathToLgrNameMap.find(wellPath);
|
||||
wellPathToLgrNameMap[wellPath].insert(completionsForLgr.first);
|
||||
}
|
||||
}
|
||||
|
||||
for (const auto wellPathsForLgr : wellPathMap)
|
||||
for (const auto& wellPathsForLgr : wellPathToLgrNameMap)
|
||||
{
|
||||
QString lgrName = wellPathsForLgr.first;
|
||||
const RimWellPath* wellPath = wellPathsForLgr.first;
|
||||
|
||||
// Export
|
||||
for (const auto wellPath : wellPathsForLgr.second)
|
||||
std::tuple<double, cvf::Vec2i, QString> itemWithLowestMD =
|
||||
std::make_tuple(std::numeric_limits<double>::max(), cvf::Vec2i(), "");
|
||||
|
||||
// Find first LGR-intersection along the well path
|
||||
|
||||
for (const auto& lgrName : wellPathsForLgr.second)
|
||||
{
|
||||
auto rimCompletions = wellPath->completions();
|
||||
cvf::Vec2i ijIntersection = wellPathUpperGridIntersectionIJ(gridCase, wellPath, lgrName);
|
||||
auto ijIntersection = wellPathUpperGridIntersectionIJ(gridCase, wellPath, lgrName);
|
||||
if (ijIntersection.first < std::get<0>(itemWithLowestMD))
|
||||
{
|
||||
itemWithLowestMD = std::make_tuple(ijIntersection.first, ijIntersection.second, lgrName);
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
double measuredDepth = 0.0;
|
||||
cvf::Vec2i ijIntersection;
|
||||
QString lgrName;
|
||||
|
||||
std::tie(measuredDepth, ijIntersection, lgrName) = itemWithLowestMD;
|
||||
|
||||
auto rimCompletions = wellPath->completions();
|
||||
|
||||
formatter.add(rimCompletions->wellNameForExport())
|
||||
.add(rimCompletions->wellGroupNameForExport())
|
||||
@@ -1348,7 +1360,6 @@ void RicWellPathExportCompletionDataFeatureImpl::exportWelspeclToFile(
|
||||
.rowCompleted();
|
||||
}
|
||||
}
|
||||
|
||||
formatter.tableCompleted();
|
||||
}
|
||||
|
||||
@@ -1682,30 +1693,32 @@ std::vector<RigCompletionData> RicWellPathExportCompletionDataFeatureImpl::gener
|
||||
double dFactor = RigCompletionData::defaultValue();
|
||||
|
||||
{
|
||||
auto transmissibilityAndKh = calculateTransmissibilityAndKh(settings.caseToApply,
|
||||
wellPath,
|
||||
cell.intersectionLengthsInCellCS,
|
||||
interval->skinFactor(),
|
||||
interval->diameter(unitSystem) / 2,
|
||||
cell.globCellIndex,
|
||||
settings.useLateralNTG);
|
||||
auto transmissibilityData = calculateTransmissibilityData(settings.caseToApply,
|
||||
wellPath,
|
||||
cell.intersectionLengthsInCellCS,
|
||||
interval->skinFactor(),
|
||||
interval->diameter(unitSystem) / 2,
|
||||
cell.globCellIndex,
|
||||
settings.useLateralNTG);
|
||||
|
||||
transmissibility = transmissibilityAndKh.first;
|
||||
transmissibility = transmissibilityData.connectionFactor();
|
||||
|
||||
if (nonDarcyParameters->nonDarcyFlowType() == RimNonDarcyPerforationParameters::NON_DARCY_USER_DEFINED)
|
||||
{
|
||||
kh = transmissibilityAndKh.second;
|
||||
kh = transmissibilityData.kh();
|
||||
dFactor = nonDarcyParameters->userDefinedDFactor();
|
||||
}
|
||||
else if (nonDarcyParameters->nonDarcyFlowType() == RimNonDarcyPerforationParameters::NON_DARCY_COMPUTED)
|
||||
{
|
||||
kh = transmissibilityAndKh.second;
|
||||
kh = transmissibilityData.kh();
|
||||
|
||||
const double effectiveH = transmissibilityData.effectiveH();
|
||||
|
||||
const double effectivePermeability =
|
||||
kh * nonDarcyParameters->gridPermeabilityScalingFactor() / cell.intersectionLengthsInCellCS.length();
|
||||
nonDarcyParameters->gridPermeabilityScalingFactor() * transmissibilityData.effectiveK();
|
||||
|
||||
dFactor = calculateDFactor(settings.caseToApply,
|
||||
cell.intersectionLengthsInCellCS,
|
||||
effectiveH,
|
||||
cell.globCellIndex,
|
||||
wellPath->perforationIntervalCollection()->nonDarcyParameters(),
|
||||
effectivePermeability);
|
||||
@@ -2318,16 +2331,16 @@ CellDirection RicWellPathExportCompletionDataFeatureImpl::calculateCellMainDirec
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
std::pair<double, double>
|
||||
RicWellPathExportCompletionDataFeatureImpl::calculateTransmissibilityAndKh(RimEclipseCase* eclipseCase,
|
||||
const RimWellPath* wellPath,
|
||||
const cvf::Vec3d& internalCellLengths,
|
||||
double skinFactor,
|
||||
double wellRadius,
|
||||
size_t globalCellIndex,
|
||||
bool useLateralNTG,
|
||||
size_t volumeScaleConstant,
|
||||
CellDirection directionForVolumeScaling)
|
||||
TransmissibilityData
|
||||
RicWellPathExportCompletionDataFeatureImpl::calculateTransmissibilityData(RimEclipseCase* eclipseCase,
|
||||
const RimWellPath* wellPath,
|
||||
const cvf::Vec3d& internalCellLengths,
|
||||
double skinFactor,
|
||||
double wellRadius,
|
||||
size_t globalCellIndex,
|
||||
bool useLateralNTG,
|
||||
size_t volumeScaleConstant,
|
||||
CellDirection directionForVolumeScaling)
|
||||
{
|
||||
RigEclipseCaseData* eclipseCaseData = eclipseCase->eclipseCaseData();
|
||||
|
||||
@@ -2354,7 +2367,7 @@ std::pair<double, double>
|
||||
if (dxAccessObject.isNull() || dyAccessObject.isNull() || dzAccessObject.isNull() || permxAccessObject.isNull() ||
|
||||
permyAccessObject.isNull() || permzAccessObject.isNull())
|
||||
{
|
||||
return std::make_pair(std::numeric_limits<double>::infinity(), std::numeric_limits<double>::infinity());
|
||||
return TransmissibilityData();
|
||||
}
|
||||
|
||||
double ntg = 1.0;
|
||||
@@ -2379,7 +2392,10 @@ std::pair<double, double>
|
||||
double permy = permyAccessObject->cellScalarGlobIdx(globalCellIndex);
|
||||
double permz = permzAccessObject->cellScalarGlobIdx(globalCellIndex);
|
||||
|
||||
const double totalKh = RigTransmissibilityEquations::totalPermeability(permx, permy, permz, internalCellLengths, latNtg, ntg);
|
||||
const double totalKh = RigTransmissibilityEquations::totalKh(permx, permy, permz, internalCellLengths, latNtg, ntg);
|
||||
|
||||
const double effectiveK = RigTransmissibilityEquations::effectiveK(permx, permy, permz, internalCellLengths, latNtg, ntg);
|
||||
const double effectiveH = RigTransmissibilityEquations::effectiveH(internalCellLengths, latNtg, ntg);
|
||||
|
||||
double darcy = RiaEclipseUnitTools::darcysConstant(wellPath->unitSystem());
|
||||
|
||||
@@ -2399,14 +2415,16 @@ std::pair<double, double>
|
||||
|
||||
const double totalConnectionFactor = RigTransmissibilityEquations::totalConnectionFactor(transx, transy, transz);
|
||||
|
||||
return std::make_pair(totalConnectionFactor, totalKh);
|
||||
TransmissibilityData trData;
|
||||
trData.setData(effectiveH, effectiveK, totalConnectionFactor, totalKh);
|
||||
return trData;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
double RicWellPathExportCompletionDataFeatureImpl::calculateDFactor(RimEclipseCase* eclipseCase,
|
||||
const cvf::Vec3d& internalCellLengths,
|
||||
double effectiveH,
|
||||
size_t globalCellIndex,
|
||||
const RimNonDarcyPerforationParameters* nonDarcyParameters,
|
||||
const double effectivePermeability)
|
||||
@@ -2443,7 +2461,7 @@ double RicWellPathExportCompletionDataFeatureImpl::calculateDFactor(RimEclipseCa
|
||||
return EQ::dFactor(alpha,
|
||||
betaFactor,
|
||||
effectivePermeability,
|
||||
internalCellLengths.length(),
|
||||
effectiveH,
|
||||
nonDarcyParameters->wellRadius(),
|
||||
nonDarcyParameters->relativeGasDensity(),
|
||||
nonDarcyParameters->gasViscosity());
|
||||
@@ -2522,9 +2540,10 @@ double RicWellPathExportCompletionDataFeatureImpl::calculateTransmissibilityAsEc
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
cvf::Vec2i RicWellPathExportCompletionDataFeatureImpl::wellPathUpperGridIntersectionIJ(const RimEclipseCase* gridCase,
|
||||
const RimWellPath* wellPath,
|
||||
const QString& gridName)
|
||||
std::pair<double, cvf::Vec2i>
|
||||
RicWellPathExportCompletionDataFeatureImpl::wellPathUpperGridIntersectionIJ(const RimEclipseCase* gridCase,
|
||||
const RimWellPath* wellPath,
|
||||
const QString& gridName)
|
||||
{
|
||||
const RigEclipseCaseData* caseData = gridCase->eclipseCaseData();
|
||||
const RigMainGrid* mainGrid = caseData->mainGrid();
|
||||
@@ -2555,11 +2574,11 @@ cvf::Vec2i RicWellPathExportCompletionDataFeatureImpl::wellPathUpperGridIntersec
|
||||
size_t i, j, k;
|
||||
if (grid->ijkFromCellIndex(gridLocalCellIndex, &i, &j, &k))
|
||||
{
|
||||
return cvf::Vec2i((int)i, (int)j);
|
||||
return std::make_pair(intersection.startMD, cvf::Vec2i((int)i, (int)j));
|
||||
}
|
||||
}
|
||||
}
|
||||
return cvf::Vec2i();
|
||||
return std::make_pair(cvf::UNDEFINED_DOUBLE, cvf::Vec2i());
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
@@ -28,6 +28,7 @@
|
||||
|
||||
#include "cvfBase.h"
|
||||
#include "cvfVector3.h"
|
||||
#include "cvfVector2.h"
|
||||
|
||||
#include <vector>
|
||||
#include <memory>
|
||||
@@ -51,6 +52,59 @@ class SubSegmentIntersectionInfo;
|
||||
//==================================================================================================
|
||||
typedef std::shared_ptr<QFile> QFilePtr;
|
||||
|
||||
class TransmissibilityData
|
||||
{
|
||||
public:
|
||||
TransmissibilityData()
|
||||
: m_isValid(false)
|
||||
, m_effectiveH(0.0)
|
||||
, m_effectiveK(0.0)
|
||||
, m_connectionFactor(0.0)
|
||||
, m_kh(0.0)
|
||||
{
|
||||
}
|
||||
|
||||
bool isValid() const
|
||||
{
|
||||
return m_isValid;
|
||||
}
|
||||
|
||||
void setData(double effectiveH, double effectiveK, double connectionFactor, double kh)
|
||||
{
|
||||
m_isValid = true;
|
||||
|
||||
m_effectiveH = effectiveH;
|
||||
m_effectiveK = effectiveK;
|
||||
m_connectionFactor = connectionFactor;
|
||||
m_kh = kh;
|
||||
}
|
||||
|
||||
double effectiveH() const
|
||||
{
|
||||
return m_effectiveH;
|
||||
}
|
||||
|
||||
double effectiveK() const
|
||||
{
|
||||
return m_effectiveK;
|
||||
}
|
||||
double connectionFactor() const
|
||||
{
|
||||
return m_connectionFactor;
|
||||
}
|
||||
double kh() const
|
||||
{
|
||||
return m_kh;
|
||||
}
|
||||
|
||||
private:
|
||||
bool m_isValid;
|
||||
double m_effectiveH;
|
||||
double m_effectiveK;
|
||||
double m_connectionFactor;
|
||||
double m_kh;
|
||||
};
|
||||
|
||||
//==================================================================================================
|
||||
///
|
||||
//==================================================================================================
|
||||
@@ -82,8 +136,8 @@ public:
|
||||
size_t globalCellIndex,
|
||||
const cvf::Vec3d& lengthsInCell);
|
||||
|
||||
static std::pair<double, double>
|
||||
calculateTransmissibilityAndKh(RimEclipseCase* eclipseCase,
|
||||
static TransmissibilityData
|
||||
calculateTransmissibilityData(RimEclipseCase* eclipseCase,
|
||||
const RimWellPath* wellPath,
|
||||
const cvf::Vec3d& internalCellLengths,
|
||||
double skinFactor,
|
||||
@@ -94,7 +148,7 @@ public:
|
||||
CellDirection directionForVolumeScaling = CellDirection::DIR_I);
|
||||
|
||||
static double calculateDFactor(RimEclipseCase* eclipseCase,
|
||||
const cvf::Vec3d& internalCellLengths,
|
||||
double effectiveH,
|
||||
size_t globalCellIndex,
|
||||
const RimNonDarcyPerforationParameters* nonDarcyParameters,
|
||||
const double effectivePermeability);
|
||||
@@ -215,7 +269,9 @@ private:
|
||||
static void appendCompletionData(std::map<size_t, std::vector<RigCompletionData>>* completionData,
|
||||
const std::vector<RigCompletionData>& data);
|
||||
|
||||
static cvf::Vec2i wellPathUpperGridIntersectionIJ(const RimEclipseCase* gridCase, const RimWellPath* wellPath, const QString& gridName = "");
|
||||
static std::pair<double, cvf::Vec2i> wellPathUpperGridIntersectionIJ(const RimEclipseCase* gridCase,
|
||||
const RimWellPath* wellPath,
|
||||
const QString& gridName = "");
|
||||
|
||||
static void exportWellSegments(RimEclipseCase* eclipseCase,
|
||||
QFilePtr exportFile,
|
||||
|
||||
Reference in New Issue
Block a user