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-tidy : Remove redundant 'virtual' and add 'override'

Browse Source
This commit is contained in:
Magne Sjaastad
2018-10-18 19:45:57 +02:00
parent c8285602b1
commit 6346ed012c
599 changed files with 2056 additions and 2056 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ReservoirDataModel/Completions/RigVirtualPerforationTransmissibilities.h
View File

@@ -54,7 +54,7 @@ class RigVirtualPerforationTransmissibilities : public cvf::Object
{
public:
RigVirtualPerforationTransmissibilities();
~RigVirtualPerforationTransmissibilities();
~RigVirtualPerforationTransmissibilities() override;
void setCompletionDataForWellPath(const RimWellPath* wellPath, const std::vector<std::vector<RigCompletionData>>& completionsPerTimeStep);

8
ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessor.h
View File

@@ -33,11 +33,11 @@ class RigActiveCellsResultAccessor : public RigResultAccessor
public:
RigActiveCellsResultAccessor(const RigGridBase* grid, const std::vector<double>* reservoirResultValues, const RigActiveCellInfo* activeCellInfo);
virtual double cellScalar(size_t gridLocalCellIndex) const;
virtual double cellFaceScalar(size_t gridLocalCellIndex, cvf::StructGridInterface::FaceType faceId) const;
double cellScalar(size_t gridLocalCellIndex) const override;
double cellFaceScalar(size_t gridLocalCellIndex, cvf::StructGridInterface::FaceType faceId) const override;
virtual double cellScalarGlobIdx(size_t globCellIndex) const;
virtual double cellFaceScalarGlobIdx(size_t globCellIndex, cvf::StructGridInterface::FaceType faceId) const;
double cellScalarGlobIdx(size_t globCellIndex) const override;
double cellFaceScalarGlobIdx(size_t globCellIndex, cvf::StructGridInterface::FaceType faceId) const override;
private:
const RigActiveCellInfo* m_activeCellInfo;

8
ApplicationCode/ReservoirDataModel/RigAllGridCellsResultAccessor.h
View File

@@ -32,10 +32,10 @@ class RigAllGridCellsResultAccessor : public RigResultAccessor
public:
RigAllGridCellsResultAccessor(const RigGridBase* grid, const std::vector<double>* reservoirResultValues);
virtual double cellScalar(size_t gridLocalCellIndex) const;
virtual double cellFaceScalar(size_t gridLocalCellIndex, cvf::StructGridInterface::FaceType faceId) const;
virtual double cellScalarGlobIdx(size_t globCellIndex) const;
virtual double cellFaceScalarGlobIdx(size_t globCellIndex, cvf::StructGridInterface::FaceType faceId) const;
double cellScalar(size_t gridLocalCellIndex) const override;
double cellFaceScalar(size_t gridLocalCellIndex, cvf::StructGridInterface::FaceType faceId) const override;
double cellScalarGlobIdx(size_t globCellIndex) const override;
double cellFaceScalarGlobIdx(size_t globCellIndex, cvf::StructGridInterface::FaceType faceId) const override;
private:
const RigGridBase* m_grid;

8
ApplicationCode/ReservoirDataModel/RigCellEdgeResultAccessor.h
View File

@@ -34,11 +34,11 @@ public:
void setDataAccessObjectForFace(cvf::StructGridInterface::FaceType faceId, RigResultAccessor* resultAccessObject);
virtual double cellScalar(size_t gridLocalCellIndex) const;
virtual double cellFaceScalar(size_t gridLocalCellIndex, cvf::StructGridInterface::FaceType faceId) const;
double cellScalar(size_t gridLocalCellIndex) const override;
double cellFaceScalar(size_t gridLocalCellIndex, cvf::StructGridInterface::FaceType faceId) const override;
virtual double cellScalarGlobIdx(size_t globCellIndex) const;
virtual double cellFaceScalarGlobIdx(size_t globCellIndex, cvf::StructGridInterface::FaceType faceId) const;
double cellScalarGlobIdx(size_t globCellIndex) const override;
double cellFaceScalarGlobIdx(size_t globCellIndex, cvf::StructGridInterface::FaceType faceId) const override;
private:
std::array<cvf::ref<RigResultAccessor>, 6> m_resultAccessObjects;

8
ApplicationCode/ReservoirDataModel/RigCombMultResultAccessor.h
View File

@@ -42,10 +42,10 @@ public:
RigResultAccessor* multZPosAccessor,
RigResultAccessor* multZNegAccessor);
virtual double cellScalar(size_t gridLocalCellIndex) const;
virtual double cellFaceScalar(size_t gridLocalCellIndex, cvf::StructGridInterface::FaceType faceId) const;
virtual double cellScalarGlobIdx(size_t globCellIndex) const;
virtual double cellFaceScalarGlobIdx(size_t globCellIndex, cvf::StructGridInterface::FaceType faceId) const;
double cellScalar(size_t gridLocalCellIndex) const override;
double cellFaceScalar(size_t gridLocalCellIndex, cvf::StructGridInterface::FaceType faceId) const override;
double cellScalarGlobIdx(size_t globCellIndex) const override;
double cellFaceScalarGlobIdx(size_t globCellIndex, cvf::StructGridInterface::FaceType faceId) const override;
private:
double nativeMultScalar(size_t gridLocalCellIndex, cvf::StructGridInterface::FaceType faceId) const;

8
ApplicationCode/ReservoirDataModel/RigCombTransResultAccessor.h
View File

@@ -38,10 +38,10 @@ public:
RigResultAccessor* yTransAccessor,
RigResultAccessor* zTransAccessor);
virtual double cellScalar(size_t gridLocalCellIndex) const;
virtual double cellFaceScalar(size_t gridLocalCellIndex, cvf::StructGridInterface::FaceType faceId) const;
virtual double cellScalarGlobIdx(size_t globCellIndex) const;
virtual double cellFaceScalarGlobIdx(size_t globCellIndex, cvf::StructGridInterface::FaceType faceId) const;
double cellScalar(size_t gridLocalCellIndex) const override;
double cellFaceScalar(size_t gridLocalCellIndex, cvf::StructGridInterface::FaceType faceId) const override;
double cellScalarGlobIdx(size_t globCellIndex) const override;
double cellFaceScalarGlobIdx(size_t globCellIndex, cvf::StructGridInterface::FaceType faceId) const override;
private:
double neighborCellTran(size_t gridLocalCellIndex, cvf::StructGridInterface::FaceType faceId, const RigResultAccessor* transAccessor) const;

2
ApplicationCode/ReservoirDataModel/RigEclipseCaseData.h
View File

@@ -58,7 +58,7 @@ class RigEclipseCaseData : public cvf::Object
{
public:
explicit RigEclipseCaseData(RimEclipseCase* ownerCase);
~RigEclipseCaseData();
~RigEclipseCaseData() override;
RimEclipseCase* ownerCase() const { return m_ownerCase; }

12
ApplicationCode/ReservoirDataModel/RigEclipseMultiPropertyStatCalc.h
View File

@@ -41,16 +41,16 @@ public:
void addStatisticsCalculator(RigStatisticsCalculator* statisticsCalculator);
void addNativeStatisticsCalculator(RigCaseCellResultsData* cellResultsData, size_t scalarResultIndices);
virtual void minMaxCellScalarValues(size_t timeStepIndex, double& min, double& max);
virtual void posNegClosestToZero(size_t timeStepIndex, double& pos, double& neg);
void minMaxCellScalarValues(size_t timeStepIndex, double& min, double& max) override;
void posNegClosestToZero(size_t timeStepIndex, double& pos, double& neg) override;
virtual void valueSumAndSampleCount(size_t timeStepIndex, double& valueSum, size_t& sampleCount);
void valueSumAndSampleCount(size_t timeStepIndex, double& valueSum, size_t& sampleCount) override;
virtual void addDataToHistogramCalculator(size_t timeStepIndex, RigHistogramCalculator& histogramCalculator);
void addDataToHistogramCalculator(size_t timeStepIndex, RigHistogramCalculator& histogramCalculator) override;
virtual void uniqueValues(size_t timeStepIndex, std::set<int>& values);
void uniqueValues(size_t timeStepIndex, std::set<int>& values) override;
virtual size_t timeStepCount();
size_t timeStepCount() override;
private:
std::vector<RigStatisticsCalculator*> m_nativeStatisticsCalculators;

14
ApplicationCode/ReservoirDataModel/RigEclipseNativeStatCalc.h
View File

@@ -35,13 +35,13 @@ class RigEclipseNativeStatCalc : public RigStatisticsCalculator
public:
RigEclipseNativeStatCalc(RigCaseCellResultsData* cellResultsData, size_t scalarResultIndex);
virtual void minMaxCellScalarValues(size_t timeStepIndex, double& min, double& max);
virtual void posNegClosestToZero(size_t timeStepIndex, double& pos, double& neg);
virtual void valueSumAndSampleCount(size_t timeStepIndex, double& valueSum, size_t& sampleCount);
virtual void addDataToHistogramCalculator(size_t timeStepIndex, RigHistogramCalculator& histogramCalculator);
virtual void uniqueValues(size_t timeStepIndex, std::set<int>& values);
virtual size_t timeStepCount();
virtual void mobileVolumeWeightedMean(size_t timeStepIndex, double& mean);
void minMaxCellScalarValues(size_t timeStepIndex, double& min, double& max) override;
void posNegClosestToZero(size_t timeStepIndex, double& pos, double& neg) override;
void valueSumAndSampleCount(size_t timeStepIndex, double& valueSum, size_t& sampleCount) override;
void addDataToHistogramCalculator(size_t timeStepIndex, RigHistogramCalculator& histogramCalculator) override;
void uniqueValues(size_t timeStepIndex, std::set<int>& values) override;
size_t timeStepCount() override;
void mobileVolumeWeightedMean(size_t timeStepIndex, double& mean) override;
private:
RigCaseCellResultsData* m_resultsData;

14
ApplicationCode/ReservoirDataModel/RigEclipseNativeVisibleCellsStatCalc.h
View File

@@ -39,13 +39,13 @@ public:
size_t scalarResultIndex,
const cvf::UByteArray* cellVisibilities);
virtual void minMaxCellScalarValues(size_t timeStepIndex, double& min, double& max);
virtual void posNegClosestToZero(size_t timeStepIndex, double& pos, double& neg);
virtual void valueSumAndSampleCount(size_t timeStepIndex, double& valueSum, size_t& sampleCount);
virtual void addDataToHistogramCalculator(size_t timeStepIndex, RigHistogramCalculator& histogramCalculator);
virtual void uniqueValues(size_t timeStepIndex, std::set<int>& values);
virtual size_t timeStepCount();
virtual void mobileVolumeWeightedMean(size_t timeStepIndex, double &result);
void minMaxCellScalarValues(size_t timeStepIndex, double& min, double& max) override;
void posNegClosestToZero(size_t timeStepIndex, double& pos, double& neg) override;
void valueSumAndSampleCount(size_t timeStepIndex, double& valueSum, size_t& sampleCount) override;
void addDataToHistogramCalculator(size_t timeStepIndex, RigHistogramCalculator& histogramCalculator) override;
void uniqueValues(size_t timeStepIndex, std::set<int>& values) override;
size_t timeStepCount() override;
void mobileVolumeWeightedMean(size_t timeStepIndex, double &result) override;
private:

2
ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.h
View File

@@ -44,7 +44,7 @@ public:
private:
void calculateIntersection();
std::vector<size_t> findCloseCellIndices(const cvf::BoundingBox& bb);
virtual cvf::Vec3d calculateLengthInCell(size_t cellIndex,
cvf::Vec3d calculateLengthInCell(size_t cellIndex,
const cvf::Vec3d& startPoint,
const cvf::Vec3d& endPoint) const override;

2
ApplicationCode/ReservoirDataModel/RigFlowDiagResultFrames.h
View File

@@ -26,7 +26,7 @@ class RigFlowDiagResultFrames: public cvf::Object
{
public:
explicit RigFlowDiagResultFrames(size_t frameCount);
virtual ~RigFlowDiagResultFrames();
~RigFlowDiagResultFrames() override;
const
std::vector<double>& frameData(size_t frameIndex) const;

2
ApplicationCode/ReservoirDataModel/RigFlowDiagResults.h
View File

@@ -54,7 +54,7 @@ public:
typedef caf::AppEnum<CellFilter> CellFilterEnum;
public:
RigFlowDiagResults(RimFlowDiagSolution* flowSolution, size_t timeStepCount);
virtual ~RigFlowDiagResults();
~RigFlowDiagResults() override;
const std::vector<double>* resultValues(const RigFlowDiagResultAddress& resVarAddr, size_t timeStepIndex);
size_t timeStepCount() { return m_timeStepCount; }

2
ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.h
View File

@@ -107,7 +107,7 @@ public:
public:
explicit RigFlowDiagSolverInterface(RimEclipseResultCase * eclipseCase);
virtual ~RigFlowDiagSolverInterface();
~RigFlowDiagSolverInterface() override;
RigFlowDiagTimeStepResult calculate(size_t timeStepIdx,
RigFlowDiagResultAddress::PhaseSelection phaseSelection,

14
ApplicationCode/ReservoirDataModel/RigFlowDiagStatCalc.h
View File

@@ -34,13 +34,13 @@ class RigFlowDiagStatCalc : public RigStatisticsCalculator
public:
RigFlowDiagStatCalc(RigFlowDiagResults* flowDiagResults, const RigFlowDiagResultAddress& resVarAddr);
virtual void minMaxCellScalarValues(size_t timeStepIndex, double& min, double& max);
virtual void posNegClosestToZero(size_t timeStepIndex, double& pos, double& neg);
virtual void valueSumAndSampleCount(size_t timeStepIndex, double& valueSum, size_t& sampleCount);
virtual void addDataToHistogramCalculator(size_t timeStepIndex, RigHistogramCalculator& histogramCalculator);
virtual void uniqueValues(size_t timeStepIndex, std::set<int>& values);
virtual size_t timeStepCount();
virtual void mobileVolumeWeightedMean(size_t timeStepIndex, double& mean);
void minMaxCellScalarValues(size_t timeStepIndex, double& min, double& max) override;
void posNegClosestToZero(size_t timeStepIndex, double& pos, double& neg) override;
void valueSumAndSampleCount(size_t timeStepIndex, double& valueSum, size_t& sampleCount) override;
void addDataToHistogramCalculator(size_t timeStepIndex, RigHistogramCalculator& histogramCalculator) override;
void uniqueValues(size_t timeStepIndex, std::set<int>& values) override;
size_t timeStepCount() override;
void mobileVolumeWeightedMean(size_t timeStepIndex, double& mean) override;
private:
RigFlowDiagResults* m_resultsData;

14
ApplicationCode/ReservoirDataModel/RigFlowDiagVisibleCellsStatCalc.h
View File

@@ -39,13 +39,13 @@ public:
const RigFlowDiagResultAddress& resVarAddr,
const cvf::UByteArray* cellVisibilities);
virtual void minMaxCellScalarValues(size_t timeStepIndex, double& min, double& max);
virtual void posNegClosestToZero(size_t timeStepIndex, double& pos, double& neg);
virtual void valueSumAndSampleCount(size_t timeStepIndex, double& valueSum, size_t& sampleCount);
virtual void addDataToHistogramCalculator(size_t timeStepIndex, RigHistogramCalculator& histogramCalculator);
virtual void uniqueValues(size_t timeStepIndex, std::set<int>& values);
virtual size_t timeStepCount();
virtual void mobileVolumeWeightedMean(size_t timeStepIndex, double &result);
void minMaxCellScalarValues(size_t timeStepIndex, double& min, double& max) override;
void posNegClosestToZero(size_t timeStepIndex, double& pos, double& neg) override;
void valueSumAndSampleCount(size_t timeStepIndex, double& valueSum, size_t& sampleCount) override;
void addDataToHistogramCalculator(size_t timeStepIndex, RigHistogramCalculator& histogramCalculator) override;
void uniqueValues(size_t timeStepIndex, std::set<int>& values) override;
size_t timeStepCount() override;
void mobileVolumeWeightedMean(size_t timeStepIndex, double &result) override;
private:
RigFlowDiagResults* m_resultsData;

2
ApplicationCode/ReservoirDataModel/RigFormationNames.h
View File

@@ -28,7 +28,7 @@ class RigFormationNames: public cvf::Object
{
public:
RigFormationNames();
~RigFormationNames();
~RigFormationNames() override;
int formationIndexFromKLayerIdx(size_t Kidx)
{

2
ApplicationCode/ReservoirDataModel/RigGeoMechWellLogExtractor.h
View File

@@ -81,7 +81,7 @@ private:
size_t gridResultIndexFace(size_t elementIdx, cvf::StructGridInterface::FaceType cellFace, int faceLocalNodeIdx) const;
void calculateIntersection();
std::vector<size_t> findCloseCells(const cvf::BoundingBox& bb);
virtual cvf::Vec3d calculateLengthInCell(size_t cellIndex,
cvf::Vec3d calculateLengthInCell(size_t cellIndex,
const cvf::Vec3d& startPoint,
const cvf::Vec3d& endPoint) const override;
cvf::Vec3d calculateWellPathTangent(int64_t intersectionIdx, WellPathTangentCalculation calculationType) const;

2
ApplicationCode/ReservoirDataModel/RigGridBase.h
View File

@@ -42,7 +42,7 @@ class RigGridBase : public cvf::StructGridInterface
{
public:
explicit RigGridBase(RigMainGrid* mainGrid);
virtual ~RigGridBase();
~RigGridBase() override;
void setGridPointDimensions(const cvf::Vec3st& gridDimensions) { m_gridPointDimensions = gridDimensions;}
cvf::Vec3st gridPointDimensions() { return m_gridPointDimensions; }

2
ApplicationCode/ReservoirDataModel/RigLocalGrid.h
View File

@@ -23,7 +23,7 @@ class RigLocalGrid : public RigGridBase
{
public:
explicit RigLocalGrid(RigMainGrid* mainGrid);
virtual ~RigLocalGrid();
~RigLocalGrid() override;
RigGridBase * parentGrid() const { return m_parentGrid; }
void setParentGrid(RigGridBase * parentGrid) { m_parentGrid = parentGrid; }

4
ApplicationCode/ReservoirDataModel/RigMainGrid.h
View File

@@ -42,7 +42,7 @@ class RigMainGrid : public RigGridBase
{
public:
RigMainGrid();
virtual ~RigMainGrid();
~RigMainGrid() override;
public:
std::vector<cvf::Vec3d>& nodes() {return m_nodes;}
@@ -78,7 +78,7 @@ public:
void initAllSubGridsParentGridPointer();
// Overrides
virtual cvf::Vec3d displayModelOffset() const;
cvf::Vec3d displayModelOffset() const override;
void setDisplayModelOffset(cvf::Vec3d offset);
void setFlipAxis(bool flipXAxis, bool flipYAxis);

2
ApplicationCode/ReservoirDataModel/RigObservedData.h
View File

@@ -27,7 +27,7 @@ class RigObservedData: public cvf::Object
{
public:
explicit RigObservedData(const QString& observedDataFileName );
~RigObservedData();
~RigObservedData() override;
void openOrReloadCase(const QString& observedDataFileName);

8
ApplicationCode/ReservoirDataModel/RigResultAccessor.h
View File

@@ -44,8 +44,8 @@ public:
class RigHugeValResultAccessor : public RigResultAccessor
{
public:
virtual double cellScalar(size_t gridLocalCellIndex) const;
virtual double cellFaceScalar(size_t gridLocalCellIndex, cvf::StructGridInterface::FaceType faceId) const;
virtual double cellScalarGlobIdx(size_t globCellIndex) const;
virtual double cellFaceScalarGlobIdx(size_t globCellIndex, cvf::StructGridInterface::FaceType faceId) const;
double cellScalar(size_t gridLocalCellIndex) const override;
double cellFaceScalar(size_t gridLocalCellIndex, cvf::StructGridInterface::FaceType faceId) const override;
double cellScalarGlobIdx(size_t globCellIndex) const override;
double cellFaceScalarGlobIdx(size_t globCellIndex, cvf::StructGridInterface::FaceType faceId) const override;
};

4
ApplicationCode/ReservoirDataModel/RigResultModifier.h
View File

@@ -46,7 +46,7 @@ public:
{
}
virtual void setCellScalar(size_t gridLocalCellIndex, double scalarValue)
void setCellScalar(size_t gridLocalCellIndex, double scalarValue) override
{
size_t reservoirCellIndex = m_grid->reservoirCellIndex(gridLocalCellIndex);
CVF_TIGHT_ASSERT(reservoirCellIndex < m_reservoirResultValues->size());
@@ -75,7 +75,7 @@ public:
{
}
virtual void setCellScalar(size_t gridLocalCellIndex, double scalarValue)
void setCellScalar(size_t gridLocalCellIndex, double scalarValue) override
{
size_t reservoirCellIndex = m_grid->reservoirCellIndex(gridLocalCellIndex);
size_t resultValueIndex = m_activeCellInfo->cellResultIndex(reservoirCellIndex);

2
ApplicationCode/ReservoirDataModel/RigStimPlanFractureDefinition.h
View File

@@ -59,7 +59,7 @@ public:
static const double THRESHOLD_VALUE;
RigStimPlanFractureDefinition();
~RigStimPlanFractureDefinition();
~RigStimPlanFractureDefinition() override;
RiaEclipseUnitTools::UnitSystem unitSet() const;
size_t xCount() const;

2
ApplicationCode/ReservoirDataModel/RigWellLogCurveData.h
View File

@@ -35,7 +35,7 @@ class RigWellLogCurveData : public cvf::Object
{
public:
RigWellLogCurveData();
virtual ~RigWellLogCurveData();
~RigWellLogCurveData() override;
void setValuesAndMD(const std::vector<double>& xValues,
const std::vector<double>& measuredDepths,

2
ApplicationCode/ReservoirDataModel/RigWellLogExtractor.h
View File

@@ -57,7 +57,7 @@ class RigWellLogExtractor : public cvf::Object
{
public:
RigWellLogExtractor(const RigWellPath* wellpath, const std::string& wellCaseErrorMsgName);
virtual ~RigWellLogExtractor();
~RigWellLogExtractor() override;
const std::vector<double>& cellIntersectionMDs();
const std::vector<double>& cellIntersectionTVDs();

2
ApplicationCode/ReservoirDataModel/RigWellLogFile.h
View File

@@ -41,7 +41,7 @@ class RigWellLogFile : public cvf::Object
{
public:
RigWellLogFile();
virtual ~RigWellLogFile();
~RigWellLogFile() override;
bool open(const QString& fileName, QString* errorMessage);

2
ApplicationCode/ReservoirDataModel/cvfGeometryTools.h
View File

@@ -188,7 +188,7 @@ class FanEarClipTesselator : public EarClipTesselator
public:
FanEarClipTesselator();
virtual bool calculateTriangles(std::vector<size_t>* triangles);
bool calculateTriangles(std::vector<size_t>* triangles) override;
private:
bool isTriangleValid( size_t u, size_t v, size_t w);
size_t m_centerNodeIndex;