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

#3944 clang-tidy : Apply changes on geomech and ssihub

Browse Source
This commit is contained in:
Magne Sjaastad
2019-01-10 22:12:11 +01:00
parent d460d3d77d
commit cee966a6d1
17 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/GeoMech/GeoMechDataModel/RigFemNativeStatCalc.h
View File

@@ -35,16 +35,16 @@ class RigFemNativeStatCalc : public RigStatisticsCalculator
public:
RigFemNativeStatCalc(RigFemPartResultsCollection* femResultCollection, const RigFemResultAddress& resVarAddr);
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:
RigFemPartResultsCollection* m_resultsData;

12
ApplicationCode/GeoMech/GeoMechDataModel/RigFemNativeVisibleCellsStatCalc.h
View File

@@ -41,12 +41,12 @@ public:
const RigFemResultAddress& 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();
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;
private:
RigGeoMechCaseData* m_caseData;

2
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPart.h
View File

@@ -47,7 +47,7 @@ class RigFemPart : public cvf::Object
{
public:
RigFemPart();
virtual ~RigFemPart();
~RigFemPart() override;
int elementPartId() const { return m_elementPartId; }
void setElementPartId(int partId) { m_elementPartId = partId; }

2
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartCollection.h
View File

@@ -27,7 +27,7 @@ class RigFemPartCollection: public cvf::Object
{
public:
RigFemPartCollection();
~RigFemPartCollection();
~RigFemPartCollection() override;
void addFemPart(RigFemPart* part);
RigFemPart* part(size_t index);

4
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartGrid.h
View File

@@ -28,7 +28,7 @@ class RigFemPartGrid : public cvf::StructGridInterface
{
public:
explicit RigFemPartGrid(const RigFemPart* femPart);
virtual ~RigFemPartGrid();
~RigFemPartGrid() override;
bool ijkFromCellIndex(size_t cellIndex, size_t* i, size_t* j, size_t* k) const override;
size_t cellIndexFromIJK(size_t i, size_t j, size_t k) const override;
@@ -59,7 +59,7 @@ private: // Unused, Not implemented
bool cellIJKFromCoordinate(const cvf::Vec3d& coord, size_t* i, size_t* j, size_t* k) const override;
virtual void cellCornerVertices(size_t cellIndex, cvf::Vec3d vertices[8]) const;
void cellCornerVertices(size_t cellIndex, cvf::Vec3d vertices[8]) const override;
cvf::Vec3d cellCentroid(size_t cellIndex) const override;
void cellMinMaxCordinates(size_t cellIndex, cvf::Vec3d* minCoordinate, cvf::Vec3d* maxCoordinate) const override;
size_t gridPointIndexFromIJK(size_t i, size_t j, size_t k) const override;

2
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResults.h
View File

@@ -35,7 +35,7 @@ class RigFemPartResults : public cvf::Object
{
public:
RigFemPartResults();
~RigFemPartResults();
~RigFemPartResults() override;
void initResultSteps(const std::vector<std::string>& stepNames);

2
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.h
View File

@@ -51,7 +51,7 @@ public:
static const std::string FIELD_NAME_COMPACTION;
RigFemPartResultsCollection(RifGeoMechReaderInterface* readerInterface, RifElementPropertyReader* elementPropertyReader, const RigFemPartCollection * femPartCollection);
~RigFemPartResultsCollection();
~RigFemPartResultsCollection() override;
void setActiveFormationNames(RigFormationNames* activeFormationNames);
RigFormationNames* activeFormationNames();

2
ApplicationCode/GeoMech/GeoMechDataModel/RigFemScalarResultFrames.h
View File

@@ -29,7 +29,7 @@ class RigFemScalarResultFrames: public cvf::Object
{
public:
explicit RigFemScalarResultFrames(int frameCount);
virtual ~RigFemScalarResultFrames();
~RigFemScalarResultFrames() override;
void enableAsSingleFrameResult();

2
ApplicationCode/GeoMech/GeoMechDataModel/RigGeoMechCaseData.h
View File

@@ -37,7 +37,7 @@ class RigGeoMechCaseData: public cvf::Object
{
public:
explicit RigGeoMechCaseData(const std::string& fileName);
~RigGeoMechCaseData();
~RigGeoMechCaseData() override;
bool open(std::string* errorMessage);
bool readTimeSteps(std::string* errorMessage, std::vector<std::string>* stepNames);

4
ApplicationCode/GeoMech/GeoMechDataModel/RimGeoMechGeometrySelectionItem.h
View File

@@ -36,11 +36,11 @@ class RimGeoMechGeometrySelectionItem : public RimGeometrySelectionItem
CAF_PDM_HEADER_INIT;
public:
RimGeoMechGeometrySelectionItem();
virtual ~RimGeoMechGeometrySelectionItem() override;
~RimGeoMechGeometrySelectionItem() override;
void setFromSelectionItem(const RiuGeoMechSelectionItem* selectionItem);
virtual QString geometrySelectionText() const override;
QString geometrySelectionText() const override;
RimGeoMechCase* geoMechCase() const;
public:

2
ApplicationCode/GeoMech/OdbReader/RifGeoMechReaderInterface.h
View File

@@ -39,7 +39,7 @@ class RifGeoMechReaderInterface : public cvf::Object
{
public:
RifGeoMechReaderInterface();
virtual ~RifGeoMechReaderInterface();
~RifGeoMechReaderInterface() override;
virtual bool openFile(const std::string& fileName, std::string* errorMessage) = 0;
virtual bool isOpen() const = 0;

32
ApplicationCode/GeoMech/OdbReader/RifOdbReader.h
View File

@@ -39,27 +39,27 @@ class RifOdbReader : public RifGeoMechReaderInterface
{
public:
RifOdbReader();
virtual ~RifOdbReader();
~RifOdbReader() override;
virtual bool openFile(const std::string& fileName, std::string* errorMessage);
virtual bool isOpen() const;
virtual bool readFemParts(RigFemPartCollection* geoMechCase);
virtual std::vector<std::string> allStepNames() const override;
virtual std::vector<std::string> filteredStepNames() const override;
virtual std::vector<double> frameTimes(int stepIndex) const override;
bool openFile(const std::string& fileName, std::string* errorMessage) override;
bool isOpen() const override;
bool readFemParts(RigFemPartCollection* geoMechCase) override;
std::vector<std::string> allStepNames() const override;
std::vector<std::string> filteredStepNames() const override;
std::vector<double> frameTimes(int stepIndex) const override;
virtual std::vector<std::string> elementSetNames(int partIndex);
virtual std::vector<size_t> elementSet(int partIndex, int setIndex);
std::vector<std::string> elementSetNames(int partIndex) override;
std::vector<size_t> elementSet(int partIndex, int setIndex) override;
virtual std::map<std::string, std::vector<std::string> > scalarNodeFieldAndComponentNames();
virtual std::map<std::string, std::vector<std::string> > scalarElementNodeFieldAndComponentNames();
virtual std::map<std::string, std::vector<std::string> > scalarIntegrationPointFieldAndComponentNames();
std::map<std::string, std::vector<std::string> > scalarNodeFieldAndComponentNames() override;
std::map<std::string, std::vector<std::string> > scalarElementNodeFieldAndComponentNames() override;
std::map<std::string, std::vector<std::string> > scalarIntegrationPointFieldAndComponentNames() override;
virtual void readDisplacements(int partIndex, int stepIndex, int frameIndex, std::vector<cvf::Vec3f>* displacements);
void readDisplacements(int partIndex, int stepIndex, int frameIndex, std::vector<cvf::Vec3f>* displacements) override;
virtual void readNodeField(const std::string& fieldName, int partIndex, int stepIndex, int frameIndex, std::vector<std::vector<float>*>* resultValues);
virtual void readElementNodeField(const std::string& fieldName, int partIndex, int stepIndex, int frameIndex, std::vector<std::vector<float>*>* resultValues);
virtual void readIntegrationPointField(const std::string& fieldName, int partIndex, int stepIndex, int frameIndex, std::vector<std::vector<float>*>* resultValues);
void readNodeField(const std::string& fieldName, int partIndex, int stepIndex, int frameIndex, std::vector<std::vector<float>*>* resultValues) override;
void readElementNodeField(const std::string& fieldName, int partIndex, int stepIndex, int frameIndex, std::vector<std::vector<float>*>* resultValues) override;
void readIntegrationPointField(const std::string& fieldName, int partIndex, int stepIndex, int frameIndex, std::vector<std::vector<float>*>* resultValues) override;
private:
enum ResultPosition