mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
clang-format: Set column width to 140
* Set column width to 140 * Use c++20 * Remove redundant virtual
This commit is contained in:
@@ -84,9 +84,9 @@ cvf::ref<RigResultAccessor> RicCreateDepthAdjustedLasFilesImpl::createIndexKResu
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
LasDepthValueAndIndexPerKLayer RicCreateDepthAdjustedLasFilesImpl::createLasDepthIndexAndPercValuePerKLayerFromMap(
|
||||
const std::vector<double>& lasWellDepths,
|
||||
const std::map<int, IndexKDepthData>& indexKDepthDataMap )
|
||||
LasDepthValueAndIndexPerKLayer
|
||||
RicCreateDepthAdjustedLasFilesImpl::createLasDepthIndexAndPercValuePerKLayerFromMap( const std::vector<double>& lasWellDepths,
|
||||
const std::map<int, IndexKDepthData>& indexKDepthDataMap )
|
||||
{
|
||||
// Create container of depth value (in percent) and its original index in a LAS file vector
|
||||
// categorized by K-layer. Depth value as percentage value between MD top and MD bottom for K-layer.
|
||||
@@ -115,9 +115,9 @@ LasDepthValueAndIndexPerKLayer RicCreateDepthAdjustedLasFilesImpl::createLasDept
|
||||
void RicCreateDepthAdjustedLasFilesImpl::createDestinationWellsLasFiles( RimCase* selectedCase,
|
||||
RimWellPath* sourceWell,
|
||||
const std::vector<RimWellPath*> destinationWells,
|
||||
const std::vector<QString>& selectedResultProperties,
|
||||
const QString& exportFolder,
|
||||
double rkbDiff )
|
||||
const std::vector<QString>& selectedResultProperties,
|
||||
const QString& exportFolder,
|
||||
double rkbDiff )
|
||||
{
|
||||
auto* sourceWellLogData = sourceWell->wellLogFiles()[0]->wellLogFileData();
|
||||
const auto defaultPropertyMap = createDefaultPropertyMap( selectedResultProperties, sourceWellLogData );
|
||||
@@ -130,8 +130,7 @@ void RicCreateDepthAdjustedLasFilesImpl::createDestinationWellsLasFiles( RimCase
|
||||
createIndexKDepthDataMapFromCase( selectedCase, sourceWell ) );
|
||||
for ( RimWellPath* well : destinationWells )
|
||||
{
|
||||
const std::map<int, IndexKDepthData> destinationWellIndexKDepthsMap =
|
||||
createIndexKDepthDataMapFromCase( selectedCase, well );
|
||||
const std::map<int, IndexKDepthData> destinationWellIndexKDepthsMap = createIndexKDepthDataMapFromCase( selectedCase, well );
|
||||
|
||||
if ( destinationWellIndexKDepthsMap.empty() ) continue;
|
||||
|
||||
@@ -152,8 +151,7 @@ void RicCreateDepthAdjustedLasFilesImpl::createDestinationWellsLasFiles( RimCase
|
||||
}
|
||||
if ( sourceWellLogData->hasTvdRkbChannel() )
|
||||
{
|
||||
const double tvdRkbValue = depthPerc * ( depthData.tvdBottom - depthData.tvdTop ) +
|
||||
depthData.tvdTop + rkbDiff;
|
||||
const double tvdRkbValue = depthPerc * ( depthData.tvdBottom - depthData.tvdTop ) + depthData.tvdTop + rkbDiff;
|
||||
tvdRkbValues.push_back( tvdRkbValue );
|
||||
}
|
||||
|
||||
@@ -181,14 +179,14 @@ void RicCreateDepthAdjustedLasFilesImpl::createDestinationWellsLasFiles( RimCase
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RicCreateDepthAdjustedLasFilesImpl::createDestinationWellLasFile( const QString& wellName,
|
||||
const QString& caseDescription,
|
||||
const std::vector<double>& mdValues,
|
||||
const std::vector<double>& tvdMslValues,
|
||||
const std::vector<double>& tvdRkbValues,
|
||||
void RicCreateDepthAdjustedLasFilesImpl::createDestinationWellLasFile( const QString& wellName,
|
||||
const QString& caseDescription,
|
||||
const std::vector<double>& mdValues,
|
||||
const std::vector<double>& tvdMslValues,
|
||||
const std::vector<double>& tvdRkbValues,
|
||||
const std::map<QString, std::vector<double>>& propertyMap,
|
||||
const RigWellLogFile* sourceWellLogData,
|
||||
const QString& exportFolder )
|
||||
const RigWellLogFile* sourceWellLogData,
|
||||
const QString& exportFolder )
|
||||
{
|
||||
const auto depthUnitText = createDepthUnitText( sourceWellLogData->depthUnit() );
|
||||
const auto depthUnitComment = createDepthUnitComment( sourceWellLogData->depthUnit() );
|
||||
@@ -213,23 +211,15 @@ void RicCreateDepthAdjustedLasFilesImpl::createDestinationWellLasFile( const QSt
|
||||
// Add tvd msl values if existing
|
||||
if ( !tvdMslValues.empty() )
|
||||
{
|
||||
const auto unitText =
|
||||
sourceWellLogData->wellLogChannelUnitString( RiaDefines::propertyNameTvdMslDepth(), deptUnit ).toStdString();
|
||||
lasFile.AddLog( RiaDefines::propertyNameTvdMslDepth().toStdString(),
|
||||
unitText,
|
||||
"True vertical depth " + depthUnitComment,
|
||||
tvdMslValues );
|
||||
const auto unitText = sourceWellLogData->wellLogChannelUnitString( RiaDefines::propertyNameTvdMslDepth(), deptUnit ).toStdString();
|
||||
lasFile.AddLog( RiaDefines::propertyNameTvdMslDepth().toStdString(), unitText, "True vertical depth " + depthUnitComment, tvdMslValues );
|
||||
}
|
||||
|
||||
// Add tvd rkb values if existing
|
||||
if ( !tvdRkbValues.empty() )
|
||||
{
|
||||
const auto unitText =
|
||||
sourceWellLogData->wellLogChannelUnitString( RiaDefines::propertyNameTvdRkbDepth(), deptUnit ).toStdString();
|
||||
lasFile.AddLog( RiaDefines::propertyNameTvdRkbDepth().toStdString(),
|
||||
unitText,
|
||||
"True vertical depth (Rotary Kelly Bushing)",
|
||||
tvdRkbValues );
|
||||
const auto unitText = sourceWellLogData->wellLogChannelUnitString( RiaDefines::propertyNameTvdRkbDepth(), deptUnit ).toStdString();
|
||||
lasFile.AddLog( RiaDefines::propertyNameTvdRkbDepth().toStdString(), unitText, "True vertical depth (Rotary Kelly Bushing)", tvdRkbValues );
|
||||
}
|
||||
|
||||
// Add property values
|
||||
@@ -241,10 +231,7 @@ void RicCreateDepthAdjustedLasFilesImpl::createDestinationWellLasFile( const QSt
|
||||
|
||||
// Add comment to LAS file
|
||||
const std::vector<std::string> commentHeader = {
|
||||
QString( "Note: Generated depth adjusted LAS file for '%1', using '%2'" )
|
||||
.arg( wellName )
|
||||
.arg( sourceWellLogData->wellName() )
|
||||
.toStdString() };
|
||||
QString( "Note: Generated depth adjusted LAS file for '%1', using '%2'" ).arg( wellName ).arg( sourceWellLogData->wellName() ).toStdString() };
|
||||
|
||||
// Add property value to file name if single property
|
||||
QString propertyNameStr;
|
||||
@@ -260,8 +247,8 @@ void RicCreateDepthAdjustedLasFilesImpl::createDestinationWellLasFile( const QSt
|
||||
destinationWell = destinationWell.replace( QRegExp( "[\\s]+" ), "_" );
|
||||
|
||||
// Create full file path name
|
||||
QString fullPathName = exportFolder + "/" + destinationWell + "_Depth_Adjusted_Using_" + sourceWell + "_" +
|
||||
caseDescription + propertyNameStr + "-" + sourceWellLogData->date() + ".las";
|
||||
QString fullPathName = exportFolder + "/" + destinationWell + "_Depth_Adjusted_Using_" + sourceWell + "_" + caseDescription +
|
||||
propertyNameStr + "-" + sourceWellLogData->date() + ".las";
|
||||
lasFile.WriteToFile( fullPathName.toStdString(), commentHeader );
|
||||
}
|
||||
|
||||
@@ -270,9 +257,7 @@ void RicCreateDepthAdjustedLasFilesImpl::createDestinationWellLasFile( const QSt
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
std::string RicCreateDepthAdjustedLasFilesImpl::createDepthUnitText( RiaDefines::DepthUnitType depthUnitType )
|
||||
{
|
||||
return depthUnitType == RiaDefines::DepthUnitType::UNIT_METER
|
||||
? "M"
|
||||
: depthUnitType == RiaDefines::DepthUnitType::UNIT_FEET ? "FT" : "";
|
||||
return depthUnitType == RiaDefines::DepthUnitType::UNIT_METER ? "M" : depthUnitType == RiaDefines::DepthUnitType::UNIT_FEET ? "FT" : "";
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@@ -297,8 +282,7 @@ std::map<int, RicCreateDepthAdjustedLasFilesImpl::IndexKDepthData>
|
||||
RimWellLogPlotCollection* wellLogCollection = RimMainPlotCollection::current()->wellLogPlotCollection();
|
||||
if ( eclipseCase != nullptr )
|
||||
{
|
||||
cvf::ref<RigEclipseWellLogExtractor> wellExtractor =
|
||||
wellLogCollection->findOrCreateExtractor( wellPath, eclipseCase );
|
||||
cvf::ref<RigEclipseWellLogExtractor> wellExtractor = wellLogCollection->findOrCreateExtractor( wellPath, eclipseCase );
|
||||
if ( wellExtractor.isNull() )
|
||||
{
|
||||
RiaLogging::info( QString( "Could not create RigEclipseWellLogExtractor for %1" ).arg( wellPath->name() ) );
|
||||
@@ -338,9 +322,7 @@ std::map<int, RicCreateDepthAdjustedLasFilesImpl::IndexKDepthData>
|
||||
{
|
||||
std::vector<double> wellIndexKValues;
|
||||
wellExtractor->curveData( indexKResAcc.p(), &wellIndexKValues );
|
||||
return createIndexKDepthDataMapFromVectors( wellExtractor->cellIntersectionMDs(),
|
||||
wellExtractor->cellIntersectionTVDs(),
|
||||
wellIndexKValues );
|
||||
return createIndexKDepthDataMapFromVectors( wellExtractor->cellIntersectionMDs(), wellExtractor->cellIntersectionTVDs(), wellIndexKValues );
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@@ -354,9 +336,7 @@ std::map<int, RicCreateDepthAdjustedLasFilesImpl::IndexKDepthData>
|
||||
RigFemResultAddress indexKResAdr( RigFemResultPosEnum::RIG_ELEMENT_NODAL, "INDEX", "INDEX_K" );
|
||||
std::vector<double> wellIndexKValues;
|
||||
wellExtractor->curveData( indexKResAdr, timeStepIdx, frameIdx, &wellIndexKValues );
|
||||
return createIndexKDepthDataMapFromVectors( wellExtractor->cellIntersectionMDs(),
|
||||
wellExtractor->cellIntersectionTVDs(),
|
||||
wellIndexKValues );
|
||||
return createIndexKDepthDataMapFromVectors( wellExtractor->cellIntersectionMDs(), wellExtractor->cellIntersectionTVDs(), wellIndexKValues );
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@@ -412,9 +392,8 @@ std::map<QString, std::vector<double>>
|
||||
RicCreateDepthAdjustedLasFilesImpl::createDefaultPropertyMap( const std::vector<QString>& selectedProperties,
|
||||
const RigWellLogFile* wellLogFile )
|
||||
{
|
||||
const QStringList lasDepthNames = QStringList( { RiaDefines::propertyNameMeasuredDepth(),
|
||||
RiaDefines::propertyNameTvdMslDepth(),
|
||||
RiaDefines::propertyNameTvdRkbDepth() } );
|
||||
const QStringList lasDepthNames = QStringList(
|
||||
{ RiaDefines::propertyNameMeasuredDepth(), RiaDefines::propertyNameTvdMslDepth(), RiaDefines::propertyNameTvdRkbDepth() } );
|
||||
std::vector<QString> validPropertyNames;
|
||||
for ( const auto& propertyName : selectedProperties )
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user