mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-14 09:33:56 -06:00
#1713 Using time step from view instead of that from export-setting when exporting connection factors for simWell-fracture
This commit is contained in:
parent
28c572b1fd
commit
5b34414977
@ -18,12 +18,15 @@
|
|||||||
|
|
||||||
#include "RicExportFractureCompletionsImpl.h"
|
#include "RicExportFractureCompletionsImpl.h"
|
||||||
|
|
||||||
|
#include "RiaLogging.h"
|
||||||
|
|
||||||
#include "RicExportCompletionDataSettingsUi.h"
|
#include "RicExportCompletionDataSettingsUi.h"
|
||||||
|
|
||||||
#include "RimEclipseCase.h"
|
#include "RimEclipseCase.h"
|
||||||
#include "RimFracture.h"
|
#include "RimFracture.h"
|
||||||
#include "RimWellPath.h"
|
#include "RimWellPath.h"
|
||||||
#include "RimFractureTemplate.h"
|
#include "RimFractureTemplate.h"
|
||||||
|
#include "RimEclipseView.h"
|
||||||
#include "RimEclipseWell.h"
|
#include "RimEclipseWell.h"
|
||||||
#include "RimSimWellFractureCollection.h"
|
#include "RimSimWellFractureCollection.h"
|
||||||
#include "RimStimPlanFractureTemplate.h"
|
#include "RimStimPlanFractureTemplate.h"
|
||||||
@ -42,7 +45,6 @@
|
|||||||
#include "RigWellPath.h"
|
#include "RigWellPath.h"
|
||||||
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include "RiaLogging.h"
|
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
@ -68,13 +70,18 @@ std::vector<RigCompletionData> RicExportFractureCompletionsImpl::generateCompdat
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
std::vector<RigCompletionData> RicExportFractureCompletionsImpl::generateCompdatValuesForSimWell(RimEclipseCase* eclipseCase,
|
std::vector<RigCompletionData> RicExportFractureCompletionsImpl::generateCompdatValuesForSimWell(RimEclipseCase* eclipseCase,
|
||||||
const RimEclipseWell* well,
|
const RimEclipseWell* well,
|
||||||
size_t timeStep,
|
|
||||||
QTextStream* outputStreamForIntermediateResultsText)
|
QTextStream* outputStreamForIntermediateResultsText)
|
||||||
{
|
{
|
||||||
std::vector<RigCompletionData> completionData;
|
std::vector<RigCompletionData> completionData;
|
||||||
|
|
||||||
std::vector< std::vector <cvf::Vec3d> > pipeBranchesCLCoords;
|
std::vector< std::vector <cvf::Vec3d> > pipeBranchesCLCoords;
|
||||||
std::vector< std::vector <RigWellResultPoint> > pipeBranchesCellIds;
|
std::vector< std::vector <RigWellResultPoint> > pipeBranchesCellIds;
|
||||||
|
|
||||||
|
RimEclipseView* view = nullptr;
|
||||||
|
well->firstAncestorOrThisOfTypeAsserted(view);
|
||||||
|
|
||||||
|
size_t timeStep = view->currentTimeStep();
|
||||||
|
|
||||||
well->calculateWellPipeDynamicCenterLine(timeStep, pipeBranchesCLCoords, pipeBranchesCellIds);
|
well->calculateWellPipeDynamicCenterLine(timeStep, pipeBranchesCLCoords, pipeBranchesCellIds);
|
||||||
|
|
||||||
for (size_t branchIndex = 0; branchIndex < pipeBranchesCLCoords.size(); ++branchIndex)
|
for (size_t branchIndex = 0; branchIndex < pipeBranchesCLCoords.size(); ++branchIndex)
|
||||||
|
@ -37,7 +37,6 @@ public:
|
|||||||
|
|
||||||
static std::vector<RigCompletionData> generateCompdatValuesForSimWell(RimEclipseCase* eclipseCase,
|
static std::vector<RigCompletionData> generateCompdatValuesForSimWell(RimEclipseCase* eclipseCase,
|
||||||
const RimEclipseWell* well,
|
const RimEclipseWell* well,
|
||||||
size_t timeStep,
|
|
||||||
QTextStream* outputStreamForIntermediateResultsText);
|
QTextStream* outputStreamForIntermediateResultsText);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -310,7 +310,9 @@ void RicWellPathExportCompletionDataFeature::exportCompletions(const std::vector
|
|||||||
|
|
||||||
for (auto simWell : simWells)
|
for (auto simWell : simWells)
|
||||||
{
|
{
|
||||||
std::vector<RigCompletionData> fractureCompletionData = RicExportFractureCompletionsImpl::generateCompdatValuesForSimWell(exportSettings.caseToApply(), simWell, exportSettings.timeStep(), &fractureTransmissibilityExportInformationStream);
|
std::vector<RigCompletionData> fractureCompletionData = RicExportFractureCompletionsImpl::generateCompdatValuesForSimWell(exportSettings.caseToApply(),
|
||||||
|
simWell,
|
||||||
|
&fractureTransmissibilityExportInformationStream);
|
||||||
appendCompletionData(&completionsPerEclipseCell, fractureCompletionData);
|
appendCompletionData(&completionsPerEclipseCell, fractureCompletionData);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user