mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-25 14:40:26 -05:00
Magne Sjaastad
1c4c304064
Remove 95 cvf include lines that the including file does not use. Found by extracting the symbols declared by every VizFwk header, including symbols they re-export, and flagging includes where none of those symbols appear anywhere in the file. Each removal is verified by a full build. Most of them are cvfVector3.h and cvfObject.h, left behind as the files they were once needed by changed. pch.h is left untouched. It includes cvfObject.h and cvfVector3.h on purpose, so that the files using the precompiled header do not have to. Note that a clean build after removing an include does not prove the include was unnecessary, only that the declarations still arrive some other way. That path can differ between platforms and with RESINSIGHT_ENABLE_UNITY_BUILD, so this needs a CI round on Linux as well.
196 lines
11 KiB
C++
196 lines
11 KiB
C++
/////////////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// Copyright (C) 2023- Equinor ASA
|
|
//
|
|
// ResInsight is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
|
|
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
// FITNESS FOR A PARTICULAR PURPOSE.
|
|
//
|
|
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
|
|
// for more details.
|
|
//
|
|
/////////////////////////////////////////////////////////////////////////////////
|
|
|
|
#include "gtest/gtest.h"
|
|
|
|
#include "RiaDefines.h"
|
|
|
|
#include "Well/RigWellLogCurveData.h"
|
|
|
|
#include <vector>
|
|
|
|
#include <iostream>
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
TEST( RigWellLogCurveData, createAndAddInterpolatedSegmentValueAndDepths_first )
|
|
{
|
|
// Input data
|
|
const std::map<RiaDefines::DepthType, std::vector<double>> originalDepths =
|
|
{ { RiaDefines::DepthType::MEASURED_DEPTH, { 0.0, 20.0, 40.0 } },
|
|
{ RiaDefines::DepthType::TRUE_VERTICAL_DEPTH, { 0.0, 30.0, 60.0 } },
|
|
{ RiaDefines::DepthType::PSEUDO_LENGTH, { 0.0, 40.0, 80.0 } } };
|
|
const std::vector<double> propertyValues = { 0.0, 100.0, 150.0 };
|
|
const double eps = 1e-6;
|
|
|
|
// Output data
|
|
const auto resamplingDepthType = RiaDefines::DepthType::MEASURED_DEPTH;
|
|
std::vector<double> resampledValues;
|
|
std::map<RiaDefines::DepthType, std::vector<double>> resampledDepths;
|
|
|
|
// Target data (resampling with MEASURED_DEPTH)
|
|
const double targetDepthValue = 10.0; // Halfway between index 0 and 1 for MEASURED_DEPTH in originalDepths
|
|
const size_t firstIndex = 0;
|
|
const size_t secondIndex = firstIndex + 1;
|
|
|
|
// Call the function under test
|
|
RigWellLogCurveData::createAndAddInterpolatedSegmentValueAndDepths( resampledValues,
|
|
resampledDepths,
|
|
resamplingDepthType,
|
|
targetDepthValue,
|
|
firstIndex,
|
|
secondIndex,
|
|
originalDepths,
|
|
propertyValues,
|
|
eps );
|
|
|
|
// Check the results
|
|
ASSERT_EQ( resampledValues.size(), size_t( 1 ) );
|
|
ASSERT_DOUBLE_EQ( resampledValues[0], 50.0 );
|
|
|
|
ASSERT_EQ( resampledDepths.size(), size_t( 3 ) );
|
|
|
|
ASSERT_EQ( resampledDepths[RiaDefines::DepthType::MEASURED_DEPTH].size(), size_t( 1 ) );
|
|
ASSERT_DOUBLE_EQ( resampledDepths[RiaDefines::DepthType::MEASURED_DEPTH][0], 10.0 );
|
|
|
|
ASSERT_EQ( resampledDepths[RiaDefines::DepthType::TRUE_VERTICAL_DEPTH].size(), size_t( 1 ) );
|
|
ASSERT_DOUBLE_EQ( resampledDepths[RiaDefines::DepthType::TRUE_VERTICAL_DEPTH][0], 15.0 );
|
|
|
|
ASSERT_EQ( resampledDepths[RiaDefines::DepthType::PSEUDO_LENGTH].size(), size_t( 1 ) );
|
|
ASSERT_DOUBLE_EQ( resampledDepths[RiaDefines::DepthType::PSEUDO_LENGTH][0], 20.0 );
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
TEST( RigWellLogCurveData, createAndAddInterpolatedSegmentValueAndDepths_second )
|
|
{
|
|
// Input data
|
|
const std::map<RiaDefines::DepthType, std::vector<double>> originalDepths =
|
|
{ { RiaDefines::DepthType::MEASURED_DEPTH, { 0.0, 20.0, 40.0 } },
|
|
{ RiaDefines::DepthType::TRUE_VERTICAL_DEPTH, { 0.0, 30.0, 60.0 } },
|
|
{ RiaDefines::DepthType::PSEUDO_LENGTH, { 0.0, 40.0, 80.0 } } };
|
|
const std::vector<double> propertyValues = { 0.0, 100.0, 150.0 };
|
|
const double eps = 1e-6;
|
|
|
|
// Output data
|
|
const auto resamplingDepthType = RiaDefines::DepthType::MEASURED_DEPTH;
|
|
std::vector<double> resampledValues;
|
|
std::map<RiaDefines::DepthType, std::vector<double>> resampledDepths;
|
|
|
|
// Target data (resampling with MEASURED_DEPTH)
|
|
const double firstTargetDepthValue = 10.0; // Halfway between first and second index for MEASURED_DEPTH in originalDepths
|
|
const double secondTargetDepthValue = 30.0; // Halfway between second and third index for MEASURED_DEPTH in originalDepths
|
|
const size_t firstIndex = 0;
|
|
const size_t secondIndex = 1;
|
|
const size_t thirdIndex = 2;
|
|
|
|
// Call the function under test with interpolating between first and second index
|
|
RigWellLogCurveData::createAndAddInterpolatedSegmentValueAndDepths( resampledValues,
|
|
resampledDepths,
|
|
resamplingDepthType,
|
|
firstTargetDepthValue,
|
|
firstIndex,
|
|
secondIndex,
|
|
originalDepths,
|
|
propertyValues,
|
|
eps );
|
|
|
|
// Call the function under test with interpolating between second and third index
|
|
RigWellLogCurveData::createAndAddInterpolatedSegmentValueAndDepths( resampledValues,
|
|
resampledDepths,
|
|
resamplingDepthType,
|
|
secondTargetDepthValue,
|
|
secondIndex,
|
|
thirdIndex,
|
|
originalDepths,
|
|
propertyValues,
|
|
eps );
|
|
|
|
// Check the results
|
|
ASSERT_EQ( resampledValues.size(), size_t( 2 ) );
|
|
ASSERT_DOUBLE_EQ( resampledValues[0], 50.0 );
|
|
ASSERT_DOUBLE_EQ( resampledValues[1], 125.0 );
|
|
|
|
ASSERT_EQ( resampledDepths.size(), size_t( 3 ) );
|
|
|
|
ASSERT_EQ( resampledDepths[RiaDefines::DepthType::MEASURED_DEPTH].size(), size_t( 2 ) );
|
|
ASSERT_DOUBLE_EQ( resampledDepths[RiaDefines::DepthType::MEASURED_DEPTH][0], 10.0 );
|
|
ASSERT_DOUBLE_EQ( resampledDepths[RiaDefines::DepthType::MEASURED_DEPTH][1], 30.0 );
|
|
|
|
ASSERT_EQ( resampledDepths[RiaDefines::DepthType::TRUE_VERTICAL_DEPTH].size(), size_t( 2 ) );
|
|
ASSERT_DOUBLE_EQ( resampledDepths[RiaDefines::DepthType::TRUE_VERTICAL_DEPTH][0], 15.0 );
|
|
ASSERT_DOUBLE_EQ( resampledDepths[RiaDefines::DepthType::TRUE_VERTICAL_DEPTH][1], 45.0 );
|
|
|
|
ASSERT_EQ( resampledDepths[RiaDefines::DepthType::PSEUDO_LENGTH].size(), size_t( 2 ) );
|
|
ASSERT_DOUBLE_EQ( resampledDepths[RiaDefines::DepthType::PSEUDO_LENGTH][0], 20.0 );
|
|
ASSERT_DOUBLE_EQ( resampledDepths[RiaDefines::DepthType::PSEUDO_LENGTH][1], 60.0 );
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
TEST( RigWellLogCurveData, CreateResampledValuesAndDepthsTest )
|
|
{
|
|
// Input data
|
|
RiaDefines::DepthType resamplingDepthType = RiaDefines::DepthType::MEASURED_DEPTH;
|
|
const std::vector<double> targetDepths = { 0.0, 5.0, 10.0, 15.0 };
|
|
const std::map<RiaDefines::DepthType, std::vector<double>> originalDepths =
|
|
{ { RiaDefines::DepthType::MEASURED_DEPTH, { 0.0, 10.0, 20.0 } },
|
|
{ RiaDefines::DepthType::TRUE_VERTICAL_DEPTH, { 0.0, 20.0, 40.0 } },
|
|
{ RiaDefines::DepthType::PSEUDO_LENGTH, { 0.0, 30.0, 60.0 } } };
|
|
const std::vector<double> propertyValues = { 0.0, 100.0, 200.0 };
|
|
|
|
// Call the function under test
|
|
auto result = RigWellLogCurveData::createResampledValuesAndDepths( resamplingDepthType, targetDepths, originalDepths, propertyValues );
|
|
|
|
// Check the results
|
|
std::vector<double>& resampledPropertyValues = result.first;
|
|
std::map<RiaDefines::DepthType, std::vector<double>>& resampledDepths = result.second;
|
|
const auto expectedSize = targetDepths.size();
|
|
|
|
ASSERT_EQ( resampledDepths.size(), originalDepths.size() );
|
|
ASSERT_EQ( resampledDepths[RiaDefines::DepthType::MEASURED_DEPTH].size(), expectedSize );
|
|
ASSERT_EQ( resampledDepths[RiaDefines::DepthType::TRUE_VERTICAL_DEPTH].size(), expectedSize );
|
|
ASSERT_EQ( resampledDepths[RiaDefines::DepthType::PSEUDO_LENGTH].size(), expectedSize );
|
|
|
|
ASSERT_EQ( resampledPropertyValues.size(), expectedSize );
|
|
|
|
// Example assertions for the specific values
|
|
ASSERT_DOUBLE_EQ( resampledPropertyValues[0], 0.0 );
|
|
ASSERT_DOUBLE_EQ( resampledPropertyValues[1], 50.0 );
|
|
ASSERT_DOUBLE_EQ( resampledPropertyValues[2], 100.0 );
|
|
ASSERT_DOUBLE_EQ( resampledPropertyValues[3], 150.0 );
|
|
|
|
ASSERT_DOUBLE_EQ( resampledDepths[RiaDefines::DepthType::MEASURED_DEPTH][0], 0.0 );
|
|
ASSERT_DOUBLE_EQ( resampledDepths[RiaDefines::DepthType::MEASURED_DEPTH][1], 5.0 );
|
|
ASSERT_DOUBLE_EQ( resampledDepths[RiaDefines::DepthType::MEASURED_DEPTH][2], 10.0 );
|
|
ASSERT_DOUBLE_EQ( resampledDepths[RiaDefines::DepthType::MEASURED_DEPTH][3], 15.0 );
|
|
|
|
ASSERT_DOUBLE_EQ( resampledDepths[RiaDefines::DepthType::TRUE_VERTICAL_DEPTH][0], 0.0 );
|
|
ASSERT_DOUBLE_EQ( resampledDepths[RiaDefines::DepthType::TRUE_VERTICAL_DEPTH][1], 10.0 );
|
|
ASSERT_DOUBLE_EQ( resampledDepths[RiaDefines::DepthType::TRUE_VERTICAL_DEPTH][2], 20.0 );
|
|
ASSERT_DOUBLE_EQ( resampledDepths[RiaDefines::DepthType::TRUE_VERTICAL_DEPTH][3], 30.0 );
|
|
|
|
ASSERT_DOUBLE_EQ( resampledDepths[RiaDefines::DepthType::PSEUDO_LENGTH][0], 0.0 );
|
|
ASSERT_DOUBLE_EQ( resampledDepths[RiaDefines::DepthType::PSEUDO_LENGTH][1], 15.0 );
|
|
ASSERT_DOUBLE_EQ( resampledDepths[RiaDefines::DepthType::PSEUDO_LENGTH][2], 30.0 );
|
|
ASSERT_DOUBLE_EQ( resampledDepths[RiaDefines::DepthType::PSEUDO_LENGTH][3], 45.0 );
|
|
}
|