OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2024-12-29 10:21:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug selected well log file for source well (#10159)

Browse Source 
Did not use selected well log file in dialog for source well when generating depth adjusted las file - chose first las file available for source well.
This commit is contained in:
Jørgen Herje 2023-04-24 13:31:19 +02:00 committed by GitHub
parent 350db4d6a9
commit d7b2da35b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ApplicationLibCode/Commands/ExportCommands/RicCreateDepthAdjustedLasFilesFeature.cpp
View File

@ -74,6 +74,7 @@ void RicCreateDepthAdjustedLasFilesFeature::onActionTriggered( bool isChecked )
{
RimCase* selectedCase = featureUi.selectedCase();
RimWellPath* sourceWell = featureUi.sourceWell();
RimWellLogFile* soureWellLogFile = featureUi.wellLogFile();
std::vector<RimWellPath*> destinationWells = featureUi.destinationWells().ptrReferencedObjects();
std::vector<QString> selectedResultProperties = featureUi.selectedResultProperties();
QString exportFolder = featureUi.exportFolder();
@ -89,11 +90,21 @@ void RicCreateDepthAdjustedLasFilesFeature::onActionTriggered( bool isChecked )
if ( eclipseCase != nullptr )
{
createDepthAdjustedWellLogFileFromEclipseCase( eclipseCase, sourceWell, destinationWells, selectedResultProperties, exportFolder );
createDepthAdjustedWellLogFileFromEclipseCase( eclipseCase,
sourceWell,
soureWellLogFile,
destinationWells,
selectedResultProperties,
exportFolder );
}
else if ( geomCase != nullptr )
{
createDepthAdjustedWellLogFileFromGeoMechCase( geomCase, sourceWell, destinationWells, selectedResultProperties, exportFolder );
createDepthAdjustedWellLogFileFromGeoMechCase( geomCase,
sourceWell,
soureWellLogFile,
destinationWells,
selectedResultProperties,
exportFolder );
}
}
}
@ -112,6 +123,7 @@ void RicCreateDepthAdjustedLasFilesFeature::setupActionLook( QAction* actionToSe
//--------------------------------------------------------------------------------------------------
void RicCreateDepthAdjustedLasFilesFeature::createDepthAdjustedWellLogFileFromEclipseCase( RimEclipseCase* eclipseCase,
RimWellPath* sourceWell,
RimWellLogFile* soureWellLogFile,
const std::vector<RimWellPath*> destinationWells,
const std::vector<QString>& selectedResultProperties,
const QString& exportFolder )
@ -128,6 +140,7 @@ void RicCreateDepthAdjustedLasFilesFeature::createDepthAdjustedWellLogFileFromEc
const double rkbDiff = sourceWellExtractor->wellPathGeometry()->rkbDiff();
RicCreateDepthAdjustedLasFilesImpl::createDestinationWellsLasFiles( eclipseCase,
sourceWell,
soureWellLogFile,
destinationWells,
selectedResultProperties,
exportFolder,
@ -139,6 +152,7 @@ void RicCreateDepthAdjustedLasFilesFeature::createDepthAdjustedWellLogFileFromEc
//--------------------------------------------------------------------------------------------------
void RicCreateDepthAdjustedLasFilesFeature::createDepthAdjustedWellLogFileFromGeoMechCase( RimGeoMechCase* geoMechCase,
RimWellPath* sourceWell,
RimWellLogFile* soureWellLogFile,
const std::vector<RimWellPath*> destinationWells,
const std::vector<QString>& selectedResultProperties,
const QString& exportFolder )
@ -155,6 +169,7 @@ void RicCreateDepthAdjustedLasFilesFeature::createDepthAdjustedWellLogFileFromGe
const double rkbDiff = sourceWellExtractor->wellPathGeometry()->rkbDiff();
RicCreateDepthAdjustedLasFilesImpl::createDestinationWellsLasFiles( geoMechCase,
sourceWell,
soureWellLogFile,
destinationWells,
selectedResultProperties,
exportFolder,

3
ApplicationLibCode/Commands/ExportCommands/RicCreateDepthAdjustedLasFilesFeature.h
View File

@ -23,6 +23,7 @@
class RimEclipseCase;
class RimGeoMechCase;
class RimWellPath;
class RimWellLogFile;
//==================================================================================================
///
@ -42,12 +43,14 @@ protected:
private:
void createDepthAdjustedWellLogFileFromEclipseCase( RimEclipseCase* eclipseCase,
RimWellPath* sourceWell,
RimWellLogFile* soureWellLogFile,
const std::vector<RimWellPath*> destinationWells,
const std::vector<QString>& selectedResultProperties,
const QString& exportFolder );
void createDepthAdjustedWellLogFileFromGeoMechCase( RimGeoMechCase* geoMechCase,
RimWellPath* sourceWell,
RimWellLogFile* soureWellLogFile,
const std::vector<RimWellPath*> destinationWells,
const std::vector<QString>& selectedResultProperties,
const QString& exportFolder );

5
ApplicationLibCode/Commands/ExportCommands/RicCreateDepthAdjustedLasFilesImpl.cpp
View File

@ -114,12 +114,15 @@ LasDepthValueAndIndexPerKLayer
//--------------------------------------------------------------------------------------------------
void RicCreateDepthAdjustedLasFilesImpl::createDestinationWellsLasFiles( RimCase* selectedCase,
RimWellPath* sourceWell,
RimWellLogFile* soureWellLogFile,
const std::vector<RimWellPath*> destinationWells,
const std::vector<QString>& selectedResultProperties,
const QString& exportFolder,
double rkbDiff )
{
auto* sourceWellLogData = sourceWell->wellLogFiles()[0]->wellLogFileData();
if ( !selectedCase || !sourceWell || !soureWellLogFile || destinationWells.empty() ) return;
auto* sourceWellLogData = soureWellLogFile->wellLogFileData();
const auto defaultPropertyMap = createDefaultPropertyMap( selectedResultProperties, sourceWellLogData );
// NOTE: map createIndexKDepthDataMapFromCase is created using well extractor, while sourceWellLogData depth

2
ApplicationLibCode/Commands/ExportCommands/RicCreateDepthAdjustedLasFilesImpl.h
View File

@ -29,6 +29,7 @@ class RigWellLogFile;
class RimCase;
class RimEclipseCase;
class RimWellPath;
class RimWellLogFile;
//==================================================================================================
/// Object to hold Depth value and its original index in a LAS file vector categorized by K-layer.
@ -64,6 +65,7 @@ cvf::ref<RigResultAccessor> createIndexKResultAccessor( RimEclipseCase* selected
void createDestinationWellsLasFiles( RimCase* selectedCase,
RimWellPath* sourceWell,
RimWellLogFile* soureWellLogFile,
const std::vector<RimWellPath*> destinationWells,
const std::vector<QString>& selectedResultProperties,
const QString& exportFolder,