OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#5101 clang-format: Adjusted penalties

Browse Source 
Use lower absolute values to improve control of behavior
This commit is contained in:
Magne Sjaastad
2020-02-12 11:43:15 +01:00
parent 10f0abc9b5
commit c82df63e10
710 changed files with 3167 additions and 4721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/UnitTests/FixedWidthDataParser-Test.cpp
View File

@@ -72,7 +72,8 @@ TEST( FixedWidthDataParser, ColumnData )
//--------------------------------------------------------------------------------------------------
TEST( FixedWidthDataParser, DetectFixedWidth )
{
QString data = R"(1
QString data =
R"(1
-------------------------------------------------------------------------------------------------------------------------------
SUMMARY OF RUN NORNE_ATW2013_RFTPLT_V3 ECLIPSE 2016.2 DATESTAMP 13-DEC-2016
-------------------------------------------------------------------------------------------------------------------------------
@@ -245,7 +246,8 @@ TEST( FixedWidthDataParser, VaryingTimeStepCount )
//--------------------------------------------------------------------------------------------------
TEST( FixedWidthDataParser, HandlingOfStepType )
{
QString data = R"(1
QString data =
R"(1
-------------------------------------------------------------------------------------------------------------------------------
SUMMARY OF RUN NORNE_ATW2013_RFTPLT_V3 ECLIPSE 2016.2 DATESTAMP 13-DEC-2016 USER dtb MACHINE stj-lcb01-01-03
-------------------------------------------------------------------------------------------------------------------------------
@@ -313,7 +315,8 @@ TEST( FixedWidthDataParser, HandlingOfStepType )
//--------------------------------------------------------------------------------------------------
TEST( FixedWidthDataParser, ParsingOfHeaderWithCompletions )
{
QString data = R"(1
QString data =
R"(1
-------------------------------------------------------------------------------------------------------------------------------
SUMMARY OF RUN NORNE_ATW2013_RFTPLT_V3 ECLIPSE 2016.2 DATESTAMP 13-DEC-2016 USER dtb MACHINE stj-lcb01-01-03
-------------------------------------------------------------------------------------------------------------------------------

8
ApplicationCode/UnitTests/HDF5FileReader-Test.cpp
View File

@@ -68,8 +68,8 @@ TEST( DISABLED_HDFTests, BasicFileRead )
}
{
H5::Group GridFunction_00002 = file.openGroup(
"Timestep_00001/GridParts/GridPart_00000/GridFunctions/GridFunction_00002" );
H5::Group GridFunction_00002 =
file.openGroup( "Timestep_00001/GridParts/GridPart_00000/GridFunctions/GridFunction_00002" );
H5::Attribute attr = GridFunction_00002.openAttribute( "limits_max" );
double limits_max = 0.0;
@@ -82,8 +82,8 @@ TEST( DISABLED_HDFTests, BasicFileRead )
}
{
H5::Group GridFunction_00002 = file.openGroup(
"Timestep_00001/GridParts/GridPart_00000/GridFunctions/GridFunction_00002" );
H5::Group GridFunction_00002 =
file.openGroup( "Timestep_00001/GridParts/GridPart_00000/GridFunctions/GridFunction_00002" );
H5::DataSet dataset = H5::DataSet( GridFunction_00002.openDataSet( "values" ) );
hsize_t dims[2];

15
ApplicationCode/UnitTests/RiaSummaryCurveAnalyzer-Test.cpp
View File

@@ -12,26 +12,31 @@ TEST( RiaSummaryCurveAnalyzer, WellCompletions )
// Well A
std::string wellNameA = "well_name_a";
{
RifEclipseSummaryAddress adr = RifEclipseSummaryAddress::wellCompletionAddress( "quantity_name", wellNameA, 1, 2, 3 );
RifEclipseSummaryAddress adr =
RifEclipseSummaryAddress::wellCompletionAddress( "quantity_name", wellNameA, 1, 2, 3 );
addresses.push_back( adr );
}
{
RifEclipseSummaryAddress adr = RifEclipseSummaryAddress::wellCompletionAddress( "quantity_name", wellNameA, 1, 2, 3 );
RifEclipseSummaryAddress adr =
RifEclipseSummaryAddress::wellCompletionAddress( "quantity_name", wellNameA, 1, 2, 3 );
addresses.push_back( adr );
}
{
RifEclipseSummaryAddress adr = RifEclipseSummaryAddress::wellCompletionAddress( "quantity_name", wellNameA, 5, 2, 3 );
RifEclipseSummaryAddress adr =
RifEclipseSummaryAddress::wellCompletionAddress( "quantity_name", wellNameA, 5, 2, 3 );
addresses.push_back( adr );
}
// Well B
std::string wellNameB = "well_name_b";
{
RifEclipseSummaryAddress adr = RifEclipseSummaryAddress::wellCompletionAddress( "quantity_name", wellNameB, 5, 2, 3 );
RifEclipseSummaryAddress adr =
RifEclipseSummaryAddress::wellCompletionAddress( "quantity_name", wellNameB, 5, 2, 3 );
addresses.push_back( adr );
}
{
RifEclipseSummaryAddress adr = RifEclipseSummaryAddress::wellCompletionAddress( "quantity_name", wellNameB, 5, 4, 3 );
RifEclipseSummaryAddress adr =
RifEclipseSummaryAddress::wellCompletionAddress( "quantity_name", wellNameB, 5, 4, 3 );
addresses.push_back( adr );
}
{

8
ApplicationCode/UnitTests/RicElementPropertyTableReader-Test.cpp
View File

@@ -14,8 +14,8 @@ static const QString TEST_DATA_DIRECTORY = QString( "%1/RifElementPropertyTableR
//--------------------------------------------------------------------------------------------------
TEST( RicElementPropertyTableReaderTest, BasicUsage )
{
RifElementPropertyMetadata metadata = RifElementPropertyTableReader::readMetadata( TEST_DATA_DIRECTORY +
"ELASTIC_TABLE.inp" );
RifElementPropertyMetadata metadata =
RifElementPropertyTableReader::readMetadata( TEST_DATA_DIRECTORY + "ELASTIC_TABLE.inp" );
RifElementPropertyTable table;
RifElementPropertyTableReader::readData( &metadata, &table );
@@ -39,8 +39,8 @@ TEST( RicElementPropertyTableReaderTest, ParseFailed )
{
try
{
RifElementPropertyMetadata metadata = RifElementPropertyTableReader::readMetadata( TEST_DATA_DIRECTORY +
"ELASTIC_TABLE_error.inp" );
RifElementPropertyMetadata metadata =
RifElementPropertyTableReader::readMetadata( TEST_DATA_DIRECTORY + "ELASTIC_TABLE_error.inp" );
RifElementPropertyTable table;
RifElementPropertyTableReader::readData( &metadata, &table );

10
ApplicationCode/UnitTests/RifActiveCellsReader-Test.cpp
View File

@@ -51,9 +51,9 @@ TEST( RifActiveCellsReaderTest, BasicTest10k )
QString filename( "TEST10K_FLT_LGR_NNC.EGRID" );
QString filePath = baseFolder.absoluteFilePath( filename );
ecl_file_type* gridFile = ecl_file_open( RiaStringEncodingTools::toNativeEncoded( filePath ).data(),
ECL_FILE_CLOSE_STREAM );
activeCellsFromActnum = RifActiveCellsReader::activeCellsFromActnumKeyword( gridFile );
ecl_file_type* gridFile =
ecl_file_open( RiaStringEncodingTools::toNativeEncoded( filePath ).data(), ECL_FILE_CLOSE_STREAM );
activeCellsFromActnum = RifActiveCellsReader::activeCellsFromActnumKeyword( gridFile );
EXPECT_EQ( (size_t)2, activeCellsFromActnum.size() );
ecl_file_close( gridFile );
}
@@ -62,8 +62,8 @@ TEST( RifActiveCellsReaderTest, BasicTest10k )
QString filename( "TEST10K_FLT_LGR_NNC.INIT" );
QString filePath = baseFolder.absoluteFilePath( filename );
ecl_file_type* initFile = ecl_file_open( RiaStringEncodingTools::toNativeEncoded( filePath ).data(),
ECL_FILE_CLOSE_STREAM );
ecl_file_type* initFile =
ecl_file_open( RiaStringEncodingTools::toNativeEncoded( filePath ).data(), ECL_FILE_CLOSE_STREAM );
activeCellsFromPorv = RifActiveCellsReader::activeCellsFromPorvKeyword( initFile, false );
EXPECT_EQ( 2, (int)activeCellsFromPorv.size() );

3
ApplicationCode/UnitTests/RifCaseRealizationParametersReader-Test.cpp
View File

@@ -8,7 +8,8 @@
#include <QString>
#include <numeric>
static const QString CASE_REAL_TEST_DATA_DIRECTORY = QString( "%1/RifCaseRealizationParametersReader/" ).arg( TEST_DATA_DIR );
static const QString CASE_REAL_TEST_DATA_DIRECTORY =
QString( "%1/RifCaseRealizationParametersReader/" ).arg( TEST_DATA_DIR );
//--------------------------------------------------------------------------------------------------
///

8
ApplicationCode/UnitTests/RifElementPropertyTableReader-Test.cpp
View File

@@ -15,8 +15,8 @@ static const QString ELEM_PROP_TEST_DATA_DIRECTORY = QString( "%1/RifElementProp
//--------------------------------------------------------------------------------------------------
TEST( RicElementPropertyTableReaderTest, BasicUsage )
{
RifElementPropertyMetadata metadata = RifElementPropertyTableReader::readMetadata( ELEM_PROP_TEST_DATA_DIRECTORY +
"ELASTIC_TABLE.inp" );
RifElementPropertyMetadata metadata =
RifElementPropertyTableReader::readMetadata( ELEM_PROP_TEST_DATA_DIRECTORY + "ELASTIC_TABLE.inp" );
RifElementPropertyTable table;
RifElementPropertyTableReader::readData( &metadata, &table );
@@ -40,8 +40,8 @@ TEST( RicElementPropertyTableReaderTest, ParseFailed )
{
try
{
RifElementPropertyMetadata metadata = RifElementPropertyTableReader::readMetadata(
ELEM_PROP_TEST_DATA_DIRECTORY + "ELASTIC_TABLE_error.inp" );
RifElementPropertyMetadata metadata =
RifElementPropertyTableReader::readMetadata( ELEM_PROP_TEST_DATA_DIRECTORY + "ELASTIC_TABLE_error.inp" );
RifElementPropertyTable table;
RifElementPropertyTableReader::readData( &metadata, &table );

3
ApplicationCode/UnitTests/RifReaderEclipseOutput-Test.cpp
View File

@@ -203,7 +203,8 @@ TEST( RigReservoirTest, Test10k_ReadThenWriteToECL )
QString dataFilePath = dataDir.absoluteFilePath("TEST10K_FLT_LGR_NNC_OUT_FROM_RES.VARS");
QStringList allStaticResults = resultCase->eclipseCaseData()->results(MATRIX_MODEL)->resultNames(RiaDefines::STATIC_NATIVE);
QStringList allStaticResults =
resultCase->eclipseCaseData()->results(MATRIX_MODEL)->resultNames(RiaDefines::STATIC_NATIVE);
std::vector<QString> keywords;
for (QString keyword : allStaticResults)

18
ApplicationCode/UnitTests/RifReaderEclipseSummary-Test.cpp
View File

@@ -82,7 +82,8 @@ RifReaderEclipseSummary); eclSummary->open(headerFile, dataFiles);
RifEclipseSummaryTools::dumpMetaData(eclSummary.get());
// Create a vector of summary addresses based on type, item name and variable name, and compare the resulting
// Create a vector of summary addresses based on type, item name and variable name, and compare the
resulting
// resultAddressString to the original string
std::vector<RifEclipseSummaryAddress> addresses = eclSummary->allResultAddresses();
@@ -199,7 +200,8 @@ RifReaderEclipseSummary); eclSummary->open(headerFile, dataFiles);
//--------------------------------------------------------------------------------------------------
TEST(RifEclipseSummaryTest, BasicReadKeywordTest)
{
std::unique_ptr<RifReaderEclipseSummary> eclSummary = std::unique_ptr<RifReaderEclipseSummary>(new RifReaderEclipseSummary);
std::unique_ptr<RifReaderEclipseSummary> eclSummary = std::unique_ptr<RifReaderEclipseSummary>(new
RifReaderEclipseSummary);
@@ -232,7 +234,8 @@ TEST(RifEclipseSummaryTest, BasicReadKeywordTest)
//--------------------------------------------------------------------------------------------------
TEST(RifEclipseSummaryTest, DISABLE_BasicReadKeywordTest)
{
std::unique_ptr<RifReaderEclipseSummary> eclSummary = std::unique_ptr<RifReaderEclipseSummary>(new RifReaderEclipseSummary);
std::unique_ptr<RifReaderEclipseSummary> eclSummary = std::unique_ptr<RifReaderEclipseSummary>(new
RifReaderEclipseSummary);
@@ -286,7 +289,8 @@ TEST(RifEclipseSummaryTest, DISABLE_BasicReadKeywordTest)
//--------------------------------------------------------------------------------------------------
TEST(RifEclipseSummaryTest, BasicReadDataTest)
{
std::unique_ptr<RifReaderEclipseSummary> eclSummary = std::unique_ptr<RifReaderEclipseSummary>(new RifReaderEclipseSummary);
std::unique_ptr<RifReaderEclipseSummary> eclSummary = std::unique_ptr<RifReaderEclipseSummary>(new
RifReaderEclipseSummary);
@@ -692,7 +696,8 @@ YEARS
TEST(RifEclipseSummaryTest, DISABLED_BasicTestSetCurrentFolder)
{
/ *
std::unique_ptr<RifReaderEclipseSummary> eclSummary = std::unique_ptr<RifReaderEclipseSummary>(new RifReaderEclipseSummary);
std::unique_ptr<RifReaderEclipseSummary> eclSummary = std::unique_ptr<RifReaderEclipseSummary>(new
RifReaderEclipseSummary);
@@ -723,7 +728,8 @@ TEST(RifEclipseSummaryTest, DISABLED_BasicTestSetCurrentFolder)
TEST(RifEclipseSummaryTest, DISABLED_BasicTest)
{
/ *
std::unique_ptr<RifReaderEclipseSummary> eclSummary = std::unique_ptr<RifReaderEclipseSummary>(new RifReaderEclipseSummary);
std::unique_ptr<RifReaderEclipseSummary> eclSummary = std::unique_ptr<RifReaderEclipseSummary>(new
RifReaderEclipseSummary);

10
ApplicationCode/UnitTests/RifWellMeasurementReader-Test.cpp
View File

@@ -175,9 +175,8 @@ TEST( RifWellMeasurementReaderTest, ReadEmptyWellNameThrows )
QStringList filePaths;
filePaths.append( file.fileName() );
ASSERT_TRUE(
readingThrowsException( filePaths,
QString( "Unexpected empty 'Well Name' on line 2: %1" ).arg( file.fileName() ) ) );
ASSERT_TRUE( readingThrowsException( filePaths,
QString( "Unexpected empty 'Well Name' on line 2: %1" ).arg( file.fileName() ) ) );
}
//--------------------------------------------------------------------------------------------------
@@ -217,9 +216,8 @@ TEST( RifWellMeasurementReaderTest, ReadInvalidQualityThrows )
QStringList filePaths;
filePaths.append( file.fileName() );
ASSERT_TRUE(
readingThrowsException( filePaths,
QString( "Invalid number for 'Quality' on line 1: %1" ).arg( file.fileName() ) ) );
ASSERT_TRUE( readingThrowsException( filePaths,
QString( "Invalid number for 'Quality' on line 1: %1" ).arg( file.fileName() ) ) );
}
//--------------------------------------------------------------------------------------------------

5
ApplicationCode/UnitTests/RifcCommandCore-Test.cpp
View File

@@ -318,9 +318,8 @@ TEST( RicfCommands, WriteCommand )
QTextStream inputStream( &commandString );
RicfMessages errors;
auto objects = RicfCommandFileReader::readCommands( inputStream,
caf::PdmDefaultObjectFactory::instance(),
&errors );
auto objects =
RicfCommandFileReader::readCommands( inputStream, caf::PdmDefaultObjectFactory::instance(), &errors );
EXPECT_EQ( (size_t)1, objects.size() );
TestCommand1* myObj = dynamic_cast<TestCommand1*>( objects.front() );

17
ApplicationCode/UnitTests/RigCellGeometryTools-Test.cpp
View File

@@ -114,10 +114,7 @@ TEST( RigCellGeometryTools, calculateCellVolumeTest2 )
cvf::BoundingBox overlapBoundingBox;
std::array<cvf::Vec3d, 8> overlapVertices;
RigCellGeometryTools::estimateHexOverlapWithBoundingBox( cornerVertices,
innerBBox,
&overlapVertices,
&overlapBoundingBox );
RigCellGeometryTools::estimateHexOverlapWithBoundingBox( cornerVertices, innerBBox, &overlapVertices, &overlapBoundingBox );
EXPECT_DOUBLE_EQ( expectedOverlap, RigCellGeometryTools::calculateCellVolume( overlapVertices ) );
cvf::BoundingBox smallerInnerBBox( cvf::Vec3d( 25.0, 25.0, -10.0 ), cvf::Vec3d( 75.0, 75.0, 25.0 ) );
@@ -128,10 +125,7 @@ TEST( RigCellGeometryTools, calculateCellVolumeTest2 )
EXPECT_DOUBLE_EQ( 50 * 50 * 25, RigCellGeometryTools::calculateCellVolume( overlapVertices ) );
cvf::BoundingBox smallerBBox( cvf::Vec3d( 50.0, 50.0, 0.0 ), cvf::Vec3d( 100.0, 100.0, 100.0 ) );
RigCellGeometryTools::estimateHexOverlapWithBoundingBox( cornerVertices,
smallerBBox,
&overlapVertices,
&overlapBoundingBox );
RigCellGeometryTools::estimateHexOverlapWithBoundingBox( cornerVertices, smallerBBox, &overlapVertices, &overlapBoundingBox );
double tipVolume = 50 * 50 * 50 * 0.5;
EXPECT_DOUBLE_EQ( tipVolume, RigCellGeometryTools::calculateCellVolume( overlapVertices ) );
@@ -321,9 +315,7 @@ TEST( RigCellGeometryTools, polylinePolygonIntersectionTest )
{
std::vector<std::vector<cvf::Vec3d>> clippedLines =
RigCellGeometryTools::clipPolylineByPolygon( polyLine,
polygonExample,
RigCellGeometryTools::INTERPOLATE_LINE_Z );
RigCellGeometryTools::clipPolylineByPolygon( polyLine, polygonExample, RigCellGeometryTools::INTERPOLATE_LINE_Z );
EXPECT_EQ( (size_t)1, clippedLines.size() );
EXPECT_EQ( (size_t)3, clippedLines.front().size() );
@@ -460,7 +452,8 @@ TEST( RigWellPathStimplanIntersector, intersection )
{
cvf::Mat4d fractureXf = cvf::Mat4d::IDENTITY;
// std::vector<cvf::Vec3f> fracturePolygon ={ {0.0f, 0.0f, 0.0f}, {5.0f, 10.0f, 0.0f}, {10.0f, 0.0f, 0.0f} };
// std::vector<cvf::Vec3f> fracturePolygon ={ {0.0f, 0.0f, 0.0f}, {5.0f, 10.0f, 0.0f}, {10.0f, 0.0f,
// 0.0f} };
double perforationLength = 10;
double wellRadius = 1.5;
std::vector<std::vector<cvf::Vec3d>> stpCellPolygons = {

10
ApplicationCode/UnitTests/RigHexIntersectionTools-Test.cpp
View File

@@ -42,15 +42,13 @@ TEST( RigHexIntersectionTools, planeHexCellIntersectionTest )
cvf::Plane fracturePlane;
fracturePlane.setFromPointAndNormal( cvf::Vec3d( 0.5, 0.5, 0.5 ), cvf::Vec3d( 1, 0, 0 ) );
isCellIntersected = RigHexIntersectionTools::planeHexCellIntersection( hexCorners,
fracturePlane,
intersectionLineSegments );
isCellIntersected =
RigHexIntersectionTools::planeHexCellIntersection( hexCorners, fracturePlane, intersectionLineSegments );
EXPECT_TRUE( isCellIntersected );
fracturePlane.setFromPointAndNormal( cvf::Vec3d( 1.5, 1.5, 1.5 ), cvf::Vec3d( 1, 0, 0 ) );
isCellIntersected = RigHexIntersectionTools::planeHexCellIntersection( hexCorners,
fracturePlane,
intersectionLineSegments );
isCellIntersected =
RigHexIntersectionTools::planeHexCellIntersection( hexCorners, fracturePlane, intersectionLineSegments );
EXPECT_FALSE( isCellIntersected );
}

15
ApplicationCode/UnitTests/RigWellPathGeometryTools-Test.cpp
View File

@@ -79,9 +79,8 @@ TEST( RigWellPathGeometryTools, QuadraticPath )
fullTvdValues.push_back( quadraticFunction( md ) );
}
std::vector<double> estimatedFullMDValues = RigWellPathGeometryTools::interpolateMdFromTvd( mdValues,
tvdValues,
fullTvdValues );
std::vector<double> estimatedFullMDValues =
RigWellPathGeometryTools::interpolateMdFromTvd( mdValues, tvdValues, fullTvdValues );
EXPECT_EQ( estimatedFullMDValues.size(), fullMDValues.size() );
for ( size_t i = 0; i < estimatedFullMDValues.size(); ++i )
{
@@ -112,9 +111,8 @@ TEST( RigWellPathGeometryTools, CubicPath )
fullTvdValues.push_back( cubicFunction( md ) );
}
std::vector<double> estimatedFullMDValues = RigWellPathGeometryTools::interpolateMdFromTvd( mdValues,
tvdValues,
fullTvdValues );
std::vector<double> estimatedFullMDValues =
RigWellPathGeometryTools::interpolateMdFromTvd( mdValues, tvdValues, fullTvdValues );
EXPECT_EQ( estimatedFullMDValues.size(), fullMDValues.size() );
for ( size_t i = 0; i < estimatedFullMDValues.size(); ++i )
{
@@ -140,9 +138,8 @@ TEST( RigWellPathGeometryTools, CubicPathPoorSampling )
fullTvdValues.push_back( cubicFunction( md ) );
}
std::vector<double> estimatedFullMDValues = RigWellPathGeometryTools::interpolateMdFromTvd( mdValues,
tvdValues,
fullTvdValues );
std::vector<double> estimatedFullMDValues =
RigWellPathGeometryTools::interpolateMdFromTvd( mdValues, tvdValues, fullTvdValues );
EXPECT_EQ( estimatedFullMDValues.size(), fullMDValues.size() );
for ( size_t i = 0; i < estimatedFullMDValues.size(); ++i )
{