mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-12 16:32:12 -05:00
#3944 clang-tidy : Apply changes on geomech and ssihub
This commit is contained in:
Magne Sjaastad committed
1 parent
d460d3d77d
commit
cee966a6d1
17 files changed
+62
-62
No files matched your search
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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; }
|
||||
|
||||
@@ -27,7 +27,7 @@ class RigFemPartCollection: public cvf::Object
|
||||
{
|
||||
public:
|
||||
RigFemPartCollection();
|
||||
~RigFemPartCollection();
|
||||
~RigFemPartCollection() override;
|
||||
|
||||
void addFemPart(RigFemPart* part);
|
||||
RigFemPart* part(size_t index);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -35,7 +35,7 @@ class RigFemPartResults : public cvf::Object
|
||||
{
|
||||
public:
|
||||
RigFemPartResults();
|
||||
~RigFemPartResults();
|
||||
~RigFemPartResults() override;
|
||||
|
||||
void initResultSteps(const std::vector<std::string>& stepNames);
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -29,7 +29,7 @@ class RigFemScalarResultFrames: public cvf::Object
|
||||
{
|
||||
public:
|
||||
explicit RigFemScalarResultFrames(int frameCount);
|
||||
virtual ~RigFemScalarResultFrames();
|
||||
~RigFemScalarResultFrames() override;
|
||||
|
||||
void enableAsSingleFrameResult();
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -32,7 +32,7 @@ class RimOilFieldEntry : public caf::PdmObject
|
||||
|
||||
public:
|
||||
RimOilFieldEntry();
|
||||
~RimOilFieldEntry();
|
||||
~RimOilFieldEntry() override;
|
||||
|
||||
|
||||
caf::PdmField<QString> name;
|
||||
@@ -45,10 +45,10 @@ public:
|
||||
RimWellPathEntry* find(const QString& name, RimWellPathEntry::WellTypeEnum wellPathType);
|
||||
|
||||
|
||||
virtual caf::PdmFieldHandle* userDescriptionField();
|
||||
virtual caf::PdmFieldHandle* objectToggleField();
|
||||
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
|
||||
virtual void initAfterRead();
|
||||
caf::PdmFieldHandle* userDescriptionField() override;
|
||||
caf::PdmFieldHandle* objectToggleField() override;
|
||||
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
|
||||
void initAfterRead() override;
|
||||
|
||||
//private:
|
||||
void updateEnabledState();
|
||||
|
||||
@@ -31,12 +31,12 @@ class RimOilRegionEntry : public caf::PdmObject
|
||||
|
||||
public:
|
||||
RimOilRegionEntry();
|
||||
~RimOilRegionEntry();
|
||||
~RimOilRegionEntry() override;
|
||||
|
||||
virtual caf::PdmFieldHandle* userDescriptionField();
|
||||
virtual caf::PdmFieldHandle* objectToggleField();
|
||||
caf::PdmFieldHandle* userDescriptionField() override;
|
||||
caf::PdmFieldHandle* objectToggleField() override;
|
||||
|
||||
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
|
||||
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
|
||||
|
||||
void updateState();
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@ public:
|
||||
|
||||
public:
|
||||
RimWellPathImport();
|
||||
~RimWellPathImport();
|
||||
~RimWellPathImport() override;
|
||||
|
||||
caf::PdmField<bool> wellTypeSurvey;
|
||||
caf::PdmField<bool> wellTypePlans;
|
||||
@@ -56,9 +56,9 @@ public:
|
||||
|
||||
void updateRegions(const QStringList& regions, const QStringList& fields, const QStringList& edmIds);
|
||||
|
||||
virtual void initAfterRead();
|
||||
virtual void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue );
|
||||
virtual void defineObjectEditorAttribute( QString uiConfigName, caf::PdmUiEditorAttribute * attribute );
|
||||
void initAfterRead() override;
|
||||
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
|
||||
void defineObjectEditorAttribute( QString uiConfigName, caf::PdmUiEditorAttribute * attribute ) override;
|
||||
|
||||
void updateFieldVisibility();
|
||||
|
||||
|
||||
@@ -44,8 +44,8 @@ public:
|
||||
static RimWellPathEntry* createWellPathEntry(const QString& name, const QString& surveyType, const QString& requestUrl, const QString& absolutePath, WellTypeEnum wellType);
|
||||
|
||||
|
||||
virtual caf::PdmFieldHandle* userDescriptionField();
|
||||
virtual caf::PdmFieldHandle* objectToggleField();
|
||||
caf::PdmFieldHandle* userDescriptionField() override;
|
||||
caf::PdmFieldHandle* objectToggleField() override;
|
||||
|
||||
caf::PdmField<QString> name;
|
||||
caf::PdmField<bool> selected;
|
||||
|
||||
@@ -59,7 +59,7 @@ class AuthenticationPage : public QWizardPage
|
||||
public:
|
||||
AuthenticationPage(const QString& webServiceAddress, QWidget *parent = nullptr);
|
||||
|
||||
virtual void initializePage();
|
||||
void initializePage() override;
|
||||
};
|
||||
|
||||
|
||||
@@ -72,9 +72,9 @@ class FieldSelectionPage : public QWizardPage
|
||||
|
||||
public:
|
||||
FieldSelectionPage(RimWellPathImport* wellPathImport, QWidget* parent = nullptr);
|
||||
~FieldSelectionPage();
|
||||
~FieldSelectionPage() override;
|
||||
|
||||
virtual void initializePage();
|
||||
void initializePage() override;
|
||||
|
||||
private:
|
||||
caf::PdmUiPropertyView* m_propertyView;
|
||||
@@ -90,7 +90,7 @@ class ObjectGroupWithHeaders : public caf::PdmObjectCollection
|
||||
public:
|
||||
ObjectGroupWithHeaders() {};
|
||||
|
||||
virtual void defineObjectEditorAttribute(QString uiConfigName, caf::PdmUiEditorAttribute * attribute);
|
||||
void defineObjectEditorAttribute(QString uiConfigName, caf::PdmUiEditorAttribute * attribute) override;
|
||||
};
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@@ -128,9 +128,9 @@ class WellSelectionPage : public QWizardPage
|
||||
|
||||
public:
|
||||
WellSelectionPage(RimWellPathImport* wellPathImport, QWidget* parent = nullptr);
|
||||
~WellSelectionPage();
|
||||
~WellSelectionPage() override;
|
||||
|
||||
virtual void initializePage();
|
||||
void initializePage() override;
|
||||
void buildWellTreeView();
|
||||
|
||||
void selectedWellPathEntries(std::vector<DownloadEntity>& downloadEntities, caf::PdmObjectHandle* objHandle);
|
||||
@@ -155,7 +155,7 @@ class WellSummaryPage : public QWizardPage
|
||||
public:
|
||||
WellSummaryPage(RimWellPathImport* wellPathImport, QWidget* parent = nullptr);
|
||||
|
||||
virtual void initializePage();
|
||||
void initializePage() override;
|
||||
|
||||
void updateSummaryPage();
|
||||
|
||||
@@ -183,7 +183,7 @@ public:
|
||||
|
||||
public:
|
||||
RiuWellImportWizard(const QString& webServiceAddress, const QString& downloadFolder, RimWellPathImport* wellPathImportObject, QWidget *parent = nullptr);
|
||||
~RiuWellImportWizard();
|
||||
~RiuWellImportWizard() override;
|
||||
|
||||
void setCredentials(const QString& username, const QString& password);
|
||||
QStringList absoluteFilePathsToWellPaths() const;
|
||||
|
||||
Reference in new issue
Block a user