OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-11-02 20:30:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Janitor : Avoid using .. when referencing include files

Browse Source
This commit is contained in:
Magne Sjaastad committed 2019-10-30 09:12:13 +01:00
1 parent 350a812634
commit 18c52b0e18
10 files changed
+86 -79
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationCode/Application/Tools/RiaWellNameComparer.cpp
+6 -3
View File
@@ -17,9 +17,12 @@
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RiaWellNameComparer.h" #include "RiaWellNameComparer.h"
#include "../../ProjectDataModel/RimProject.h"
#include "../../ProjectDataModel/RimWellPath.h" #include "RiaApplication.h"
#include "../RiaApplication.h"
#include "RimProject.h"
#include "RimWellPath.h"
#include <regex> #include <regex>
//================================================================================================== //==================================================================================================
ApplicationCode/CommandFileInterface/RicfExportProperty.cpp
+1 -1
View File
@@ -21,7 +21,7 @@
#include "RiaApplication.h" #include "RiaApplication.h"
#include "RiaLogging.h" #include "RiaLogging.h"
#include "../Commands/ExportCommands/RicEclipseCellResultToFileImpl.h" #include "ExportCommands/RicEclipseCellResultToFileImpl.h"
#include "RicfApplicationTools.h" #include "RicfApplicationTools.h"
#include "RicfCommandFileExecutor.h" #include "RicfCommandFileExecutor.h"
ApplicationCode/CommandFileInterface/RicfExportPropertyInViews.cpp
+1 -1
View File
@@ -18,7 +18,7 @@
#include "RicfExportProperty.h" #include "RicfExportProperty.h"
#include "../Commands/ExportCommands/RicEclipseCellResultToFileImpl.h" #include "ExportCommands/RicEclipseCellResultToFileImpl.h"
#include "RiaApplication.h" #include "RiaApplication.h"
#include "RiaLogging.h" #include "RiaLogging.h"
ApplicationCode/Commands/AnnotationCommands/RicTextAnnotation3dEditor.cpp
+1 -1
View File
@@ -18,7 +18,7 @@
#include "RicTextAnnotation3dEditor.h" #include "RicTextAnnotation3dEditor.h"
#include "../WellPathCommands/PointTangentManipulator/RicPointTangentManipulator.h" #include "WellPathCommands/PointTangentManipulator/RicPointTangentManipulator.h"
#include "Rim3dView.h" #include "Rim3dView.h"
#include "RimCase.h" #include "RimCase.h"
ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp
+63 -63
View File
@@ -25,7 +25,7 @@
#include "RiaPreferences.h" #include "RiaPreferences.h"
#include "RiaWeightedMeanCalculator.h" #include "RiaWeightedMeanCalculator.h"
#include "../ExportCommands/RicExportLgrFeature.h" #include "ExportCommands/RicExportLgrFeature.h"
#include "RicExportCompletionDataSettingsUi.h" #include "RicExportCompletionDataSettingsUi.h"
#include "RicExportFeatureImpl.h" #include "RicExportFeatureImpl.h"
#include "RicExportFractureCompletionsImpl.h" #include "RicExportFractureCompletionsImpl.h"
@@ -646,7 +646,7 @@ std::map<QString, std::vector<RigCompletionData>>
auto it = completions.find( gridName ); auto it = completions.find( gridName );
if ( it == completions.end() ) if ( it == completions.end() )
{ {
completions.insert( std::pair<QString, std::vector<RigCompletionData>>( gridName, {completion} ) ); completions.insert( std::pair<QString, std::vector<RigCompletionData>>( gridName, { completion } ) );
} }
else else
{ {
@@ -722,19 +722,19 @@ void RicWellPathExportCompletionDataFeatureImpl::exportWelspecsToFile( RimEclips
RifTextDataTableFormatter formatter( stream ); RifTextDataTableFormatter formatter( stream );
formatter.setColumnSpacing( 2 ); formatter.setColumnSpacing( 2 );
std::vector<RifTextDataTableColumn> header = {RifTextDataTableColumn( "Well" ), std::vector<RifTextDataTableColumn> header = { RifTextDataTableColumn( "Well" ),
RifTextDataTableColumn( "Grp" ), RifTextDataTableColumn( "Grp" ),
RifTextDataTableColumn( "I" ), RifTextDataTableColumn( "I" ),
RifTextDataTableColumn( "J" ), RifTextDataTableColumn( "J" ),
RifTextDataTableColumn( "RefDepth" ), RifTextDataTableColumn( "RefDepth" ),
RifTextDataTableColumn( "Type" ), RifTextDataTableColumn( "Type" ),
RifTextDataTableColumn( "DrainRad" ), RifTextDataTableColumn( "DrainRad" ),
RifTextDataTableColumn( "GasInEq" ), RifTextDataTableColumn( "GasInEq" ),
RifTextDataTableColumn( "AutoShut" ), RifTextDataTableColumn( "AutoShut" ),
RifTextDataTableColumn( "XFlow" ), RifTextDataTableColumn( "XFlow" ),
RifTextDataTableColumn( "FluidPVT" ), RifTextDataTableColumn( "FluidPVT" ),
RifTextDataTableColumn( "HydSDens" ), RifTextDataTableColumn( "HydSDens" ),
RifTextDataTableColumn( "FluidInPlReg" )}; RifTextDataTableColumn( "FluidInPlReg" ) };
formatter.keyword( "WELSPECS" ); formatter.keyword( "WELSPECS" );
formatter.header( header ); formatter.header( header );
@@ -787,20 +787,20 @@ void RicWellPathExportCompletionDataFeatureImpl::exportWelspeclToFile(
RifTextDataTableFormatter formatter( stream ); RifTextDataTableFormatter formatter( stream );
formatter.setColumnSpacing( 2 ); formatter.setColumnSpacing( 2 );
std::vector<RifTextDataTableColumn> header = {RifTextDataTableColumn( "Well" ), std::vector<RifTextDataTableColumn> header = { RifTextDataTableColumn( "Well" ),
RifTextDataTableColumn( "Grp" ), RifTextDataTableColumn( "Grp" ),
RifTextDataTableColumn( "LGR" ), RifTextDataTableColumn( "LGR" ),
RifTextDataTableColumn( "I" ), RifTextDataTableColumn( "I" ),
RifTextDataTableColumn( "J" ), RifTextDataTableColumn( "J" ),
RifTextDataTableColumn( "RefDepth" ), RifTextDataTableColumn( "RefDepth" ),
RifTextDataTableColumn( "Type" ), RifTextDataTableColumn( "Type" ),
RifTextDataTableColumn( "DrainRad" ), RifTextDataTableColumn( "DrainRad" ),
RifTextDataTableColumn( "GasInEq" ), RifTextDataTableColumn( "GasInEq" ),
RifTextDataTableColumn( "AutoShut" ), RifTextDataTableColumn( "AutoShut" ),
RifTextDataTableColumn( "XFlow" ), RifTextDataTableColumn( "XFlow" ),
RifTextDataTableColumn( "FluidPVT" ), RifTextDataTableColumn( "FluidPVT" ),
RifTextDataTableColumn( "HydSDens" ), RifTextDataTableColumn( "HydSDens" ),
RifTextDataTableColumn( "FluidInPlReg" )}; RifTextDataTableColumn( "FluidInPlReg" ) };
formatter.keyword( "WELSPECL" ); formatter.keyword( "WELSPECL" );
formatter.header( header ); formatter.header( header );
@@ -965,45 +965,45 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompdatTableUsingFormatte
if ( gridName.isEmpty() ) if ( gridName.isEmpty() )
{ {
header = header =
{RifTextDataTableColumn( "Well" ), { RifTextDataTableColumn( "Well" ),
RifTextDataTableColumn( "I" ), RifTextDataTableColumn( "I" ),
RifTextDataTableColumn( "J" ), RifTextDataTableColumn( "J" ),
RifTextDataTableColumn( "K1" ), RifTextDataTableColumn( "K1" ),
RifTextDataTableColumn( "K2" ), RifTextDataTableColumn( "K2" ),
RifTextDataTableColumn( "Status" ), RifTextDataTableColumn( "Status" ),
RifTextDataTableColumn( "SAT" ), RifTextDataTableColumn( "SAT" ),
RifTextDataTableColumn( "TR", RifTextDataTableColumn( "TR",
RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ), RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ),
RifTextDataTableColumn( "DIAM" ), RifTextDataTableColumn( "DIAM" ),
RifTextDataTableColumn( "KH", RifTextDataTableColumn( "KH",
RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ), RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ),
RifTextDataTableColumn( "S" ), RifTextDataTableColumn( "S" ),
RifTextDataTableColumn( "Df", RifTextDataTableColumn( "Df",
RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ), RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ),
RifTextDataTableColumn( "DIR" )}; RifTextDataTableColumn( "DIR" ) };
formatter.keyword( "COMPDAT" ); formatter.keyword( "COMPDAT" );
} }
else else
{ {
header = header =
{RifTextDataTableColumn( "Well" ), { RifTextDataTableColumn( "Well" ),
RifTextDataTableColumn( "LgrName" ), RifTextDataTableColumn( "LgrName" ),
RifTextDataTableColumn( "I" ), RifTextDataTableColumn( "I" ),
RifTextDataTableColumn( "J" ), RifTextDataTableColumn( "J" ),
RifTextDataTableColumn( "K1" ), RifTextDataTableColumn( "K1" ),
RifTextDataTableColumn( "K2" ), RifTextDataTableColumn( "K2" ),
RifTextDataTableColumn( "Status" ), RifTextDataTableColumn( "Status" ),
RifTextDataTableColumn( "SAT" ), RifTextDataTableColumn( "SAT" ),
RifTextDataTableColumn( "TR", RifTextDataTableColumn( "TR",
RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ), RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ),
RifTextDataTableColumn( "DIAM" ), RifTextDataTableColumn( "DIAM" ),
RifTextDataTableColumn( "KH", RifTextDataTableColumn( "KH",
RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ), RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ),
RifTextDataTableColumn( "S" ), RifTextDataTableColumn( "S" ),
RifTextDataTableColumn( "Df", RifTextDataTableColumn( "Df",
RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ), RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ),
RifTextDataTableColumn( "DIR" )}; RifTextDataTableColumn( "DIR" ) };
formatter.keyword( "COMPDATL" ); formatter.keyword( "COMPDATL" );
} }
@@ -1270,7 +1270,7 @@ void RicWellPathExportCompletionDataFeatureImpl::appendCompletionData(
{ {
completionData->insert( completionData->insert(
std::pair<size_t, std::vector<RigCompletionData>>( completion.completionDataGridCell().globalCellIndex(), std::pair<size_t, std::vector<RigCompletionData>>( completion.completionDataGridCell().globalCellIndex(),
std::vector<RigCompletionData>{completion} ) ); std::vector<RigCompletionData>{ completion } ) );
} }
} }
} }
ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCurveCalculationFeature.cpp
+5 -4
View File
@@ -18,21 +18,22 @@
#include "RicEditSummaryCurveCalculationFeature.h" #include "RicEditSummaryCurveCalculationFeature.h"
#include "RiaApplication.h"
#include "RicShowSummaryCurveCalculatorFeature.h" #include "RicShowSummaryCurveCalculatorFeature.h"
#include "RicSummaryCurveCalculator.h" #include "RicSummaryCurveCalculator.h"
#include "RicSummaryCurveCalculatorDialog.h" #include "RicSummaryCurveCalculatorDialog.h"
#include "RifEclipseSummaryAddress.h"
#include "RimCalculatedSummaryCurveReader.h" #include "RimCalculatedSummaryCurveReader.h"
#include "RimProject.h"
#include "RimSummaryCalculation.h" #include "RimSummaryCalculation.h"
#include "RimSummaryCalculationCollection.h" #include "RimSummaryCalculationCollection.h"
#include "RimSummaryCase.h" #include "RimSummaryCase.h"
#include "RimSummaryCurve.h" #include "RimSummaryCurve.h"
#include "RimSummaryPlot.h" #include "RimSummaryPlot.h"
#include "../../Application/RiaApplication.h"
#include "../../FileInterface/RifEclipseSummaryAddress.h"
#include "../../ProjectDataModel/RimProject.h"
#include "cafPdmObject.h" #include "cafPdmObject.h"
#include "cafSelectionManager.h" #include "cafSelectionManager.h"
#include "cafSelectionManagerTools.h" #include "cafSelectionManagerTools.h"
ApplicationCode/Commands/WellPathCommands/RicShowWellPlanFeature.cpp
+5 -2
View File
@@ -17,12 +17,15 @@
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RicShowWellPlanFeature.h" #include "RicShowWellPlanFeature.h"
#include "../ApplicationCommands/RicShowPlotDataFeature.h"
#include "ApplicationCommands/RicShowPlotDataFeature.h"
#include "RimModeledWellPath.h" #include "RimModeledWellPath.h"
#include "RiuTextDialog.h"
#include "cafSelectionManagerTools.h" #include "cafSelectionManagerTools.h"
#include "RiuTextDialog.h"
#include <QAction> #include <QAction>
CAF_CMD_SOURCE_INIT( RicShowWellPlanFeature, "RicShowWellPlanFeature" ); CAF_CMD_SOURCE_INIT( RicShowWellPlanFeature, "RicShowWellPlanFeature" );
ApplicationCode/FileInterface/RifCsvUserData.h
+1 -1
View File
@@ -20,7 +20,7 @@
#include "RifSummaryReaderInterface.h" #include "RifSummaryReaderInterface.h"
#include "../Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.h" #include "SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.h"
#include <map> #include <map>
#include <memory> #include <memory>
ApplicationCode/FileInterface/RifCsvUserDataParser.cpp
+2 -2
View File
@@ -28,7 +28,7 @@
#include "RiaStdStringTools.h" #include "RiaStdStringTools.h"
#include "RiaTextStringTools.h" #include "RiaTextStringTools.h"
#include "../Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.h" #include "SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.h"
#include "cvfAssert.h" #include "cvfAssert.h"
@@ -63,7 +63,7 @@ enum class CsvLineBasedColumnType
ERROR_VALUE, ERROR_VALUE,
COMMENTS COMMENTS
}; };
const std::vector<QString> CSV_LINE_BASED_COL_NAMES = {"DATE", "VECTOR", "VALUE", "ERROR", "COMMENTS"}; const std::vector<QString> CSV_LINE_BASED_COL_NAMES = { "DATE", "VECTOR", "VALUE", "ERROR", "COMMENTS" };
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
ApplicationCode/ProjectDataModel/Summary/RimCsvUserData.h
+1 -1
View File
@@ -20,7 +20,7 @@
#include "RimObservedSummaryData.h" #include "RimObservedSummaryData.h"
#include "../../Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.h" #include "SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.h"
#include "cafPdmChildField.h" #include "cafPdmChildField.h"
#include "cafPdmField.h" #include "cafPdmField.h"