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

clang-format : Set PenaltyBreakAssignment to 130

Browse Source
This commit is contained in:
Magne Sjaastad
2019-11-04 15:08:09 +01:00
parent 7c8cf60dba
commit 57cab2457e
105 changed files with 596 additions and 711 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ApplicationCode/UnitTests/ObservedDataParser-Test.cpp
View File

@@ -994,72 +994,72 @@ TEST( RifColumnBasedRsmspecParserTest, TestParsingOfDateString )
{
{
QString txt = "22.12.1900";
RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString(
txt );
RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df =
RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( txt );
EXPECT_EQ( RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat::DATE_DDMMYYYY_DOT_SEPARATED, df );
}
{
QString txt = "22-12-1900";
RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString(
txt );
RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df =
RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( txt );
EXPECT_EQ( RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat::DATE_DDMMYYYY_DASH_SEPARATED, df );
}
{
QString txt = "22/12/1900";
RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString(
txt );
RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df =
RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( txt );
EXPECT_EQ( RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat::DATE_DDMMYYYY_SLASH_SEPARATED, df );
}
{
QString txt = "1900.12.24";
RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString(
txt );
RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df =
RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( txt );
EXPECT_EQ( RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat::DATE_YYYYMMDD_DOT_SEPARATED, df );
}
{
QString txt = "1900-12-24";
RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString(
txt );
RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df =
RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( txt );
EXPECT_EQ( RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat::DATE_YYYYMMDD_DASH_SEPARATED, df );
}
{
QString txt = "1900/12/24";
RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString(
txt );
RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df =
RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( txt );
EXPECT_EQ( RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat::DATE_YYYYMMDD_SLASH_SEPARATED, df );
}
{
QString txt = "12/22/1900";
RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString(
txt );
RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df =
RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( txt );
EXPECT_EQ( RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat::DATE_MMDDYYYY_SLASH_SEPARATED, df );
}
{
QString txt = "22/12/1900";
RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString(
txt );
RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df =
RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( txt );
EXPECT_EQ( RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat::DATE_DDMMYYYY_SLASH_SEPARATED, df );
}
{
QString txt = "12/22/30";
RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString(
txt );
RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df =
RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( txt );
EXPECT_EQ( RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat::DATE_MMDDYY_SLASH_SEPARATED, df );
}

45
ApplicationCode/UnitTests/RiaCellDividingTools-Test.cpp
View File

@@ -49,15 +49,12 @@ TEST( RiaCellDividingTools, flowDistanceCubicMainCell_AreaPointInCenter )
double dist = RiaCellDividingTools::computeFlowDistance( mainCellCorners, point );
double expectedDist = ( ( cvf::Vec3d( 12.5, 12.5, 12.5 ) - point ).length() +
( cvf::Vec3d( 17.5, 12.5, 12.5 ) - point ).length() +
( cvf::Vec3d( 12.5, 17.5, 12.5 ) - point ).length() +
( cvf::Vec3d( 17.5, 17.5, 12.5 ) - point ).length() +
( cvf::Vec3d( 12.5, 12.5, 17.5 ) - point ).length() +
( cvf::Vec3d( 17.5, 12.5, 17.5 ) - point ).length() +
( cvf::Vec3d( 12.5, 17.5, 17.5 ) - point ).length() +
( cvf::Vec3d( 17.5, 17.5, 17.5 ) - point ).length() ) /
8;
double expectedDist =
( ( cvf::Vec3d( 12.5, 12.5, 12.5 ) - point ).length() + ( cvf::Vec3d( 17.5, 12.5, 12.5 ) - point ).length() +
( cvf::Vec3d( 12.5, 17.5, 12.5 ) - point ).length() + ( cvf::Vec3d( 17.5, 17.5, 12.5 ) - point ).length() +
( cvf::Vec3d( 12.5, 12.5, 17.5 ) - point ).length() + ( cvf::Vec3d( 17.5, 12.5, 17.5 ) - point ).length() +
( cvf::Vec3d( 12.5, 17.5, 17.5 ) - point ).length() + ( cvf::Vec3d( 17.5, 17.5, 17.5 ) - point ).length() ) /
8;
EXPECT_NEAR( expectedDist, dist, 1e-6 );
}
@@ -72,15 +69,12 @@ TEST( RiaCellDividingTools, flowDistanceCubicMainCell_AreaPointNearCorner )
double dist = RiaCellDividingTools::computeFlowDistance( mainCellCorners, point );
double expectedDist = ( ( cvf::Vec3d( 12.5, 12.5, 12.5 ) - point ).length() +
( cvf::Vec3d( 17.5, 12.5, 12.5 ) - point ).length() +
( cvf::Vec3d( 12.5, 17.5, 12.5 ) - point ).length() +
( cvf::Vec3d( 17.5, 17.5, 12.5 ) - point ).length() +
( cvf::Vec3d( 12.5, 12.5, 17.5 ) - point ).length() +
( cvf::Vec3d( 17.5, 12.5, 17.5 ) - point ).length() +
( cvf::Vec3d( 12.5, 17.5, 17.5 ) - point ).length() +
( cvf::Vec3d( 17.5, 17.5, 17.5 ) - point ).length() ) /
8;
double expectedDist =
( ( cvf::Vec3d( 12.5, 12.5, 12.5 ) - point ).length() + ( cvf::Vec3d( 17.5, 12.5, 12.5 ) - point ).length() +
( cvf::Vec3d( 12.5, 17.5, 12.5 ) - point ).length() + ( cvf::Vec3d( 17.5, 17.5, 12.5 ) - point ).length() +
( cvf::Vec3d( 12.5, 12.5, 17.5 ) - point ).length() + ( cvf::Vec3d( 17.5, 12.5, 17.5 ) - point ).length() +
( cvf::Vec3d( 12.5, 17.5, 17.5 ) - point ).length() + ( cvf::Vec3d( 17.5, 17.5, 17.5 ) - point ).length() ) /
8;
EXPECT_NEAR( expectedDist, dist, 1e-6 );
}
@@ -95,15 +89,12 @@ TEST( RiaCellDividingTools, flowDistanceHighMainCell_AreaPointNearLowerCorner )
double dist = RiaCellDividingTools::computeFlowDistance( mainCellCorners, point );
double expectedDist = ( ( cvf::Vec3d( 12.5, 12.5, 35 ) - point ).length() +
( cvf::Vec3d( 17.5, 12.5, 35 ) - point ).length() +
( cvf::Vec3d( 12.5, 17.5, 35 ) - point ).length() +
( cvf::Vec3d( 17.5, 17.5, 35 ) - point ).length() +
( cvf::Vec3d( 12.5, 12.5, 85 ) - point ).length() +
( cvf::Vec3d( 17.5, 12.5, 85 ) - point ).length() +
( cvf::Vec3d( 12.5, 17.5, 85 ) - point ).length() +
( cvf::Vec3d( 17.5, 17.5, 85 ) - point ).length() ) /
8;
double expectedDist =
( ( cvf::Vec3d( 12.5, 12.5, 35 ) - point ).length() + ( cvf::Vec3d( 17.5, 12.5, 35 ) - point ).length() +
( cvf::Vec3d( 12.5, 17.5, 35 ) - point ).length() + ( cvf::Vec3d( 17.5, 17.5, 35 ) - point ).length() +
( cvf::Vec3d( 12.5, 12.5, 85 ) - point ).length() + ( cvf::Vec3d( 17.5, 12.5, 85 ) - point ).length() +
( cvf::Vec3d( 12.5, 17.5, 85 ) - point ).length() + ( cvf::Vec3d( 17.5, 17.5, 85 ) - point ).length() ) /
8;
EXPECT_NEAR( expectedDist, dist, 1e-6 );
}

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

@@ -35,11 +35,8 @@ TEST( RiaSummaryCurveAnalyzer, WellCompletions )
addresses.push_back( adr );
}
{
RifEclipseSummaryAddress adr = RifEclipseSummaryAddress::wellCompletionAddress( "quantity_name",
wellNameB,
5,
4,
30 );
RifEclipseSummaryAddress adr =
RifEclipseSummaryAddress::wellCompletionAddress( "quantity_name", wellNameB, 5, 4, 30 );
addresses.push_back( adr );
}