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

#5007 Janitor : Do not call virtual methods from constructors

Browse Source
This commit is contained in:
Magne Sjaastad
2019-11-07 09:01:31 +01:00
parent a413f672ec
commit 388b92c092
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPart.cpp
View File

@@ -72,7 +72,8 @@ const RigFemPartGrid* RigFemPart::getOrCreateStructGrid() const
{ {
if ( m_structGrid.isNull() ) if ( m_structGrid.isNull() )
{ {
m_structGrid = new RigFemPartGrid( this ); m_structGrid = new RigFemPartGrid();
m_structGrid->setFemPart( this );
} }
return m_structGrid.p(); return m_structGrid.p();

14
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartGrid.cpp
View File

@@ -26,10 +26,9 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RigFemPartGrid::RigFemPartGrid( const RigFemPart* femPart ) RigFemPartGrid::RigFemPartGrid()
: m_femPart( nullptr )
{ {
m_femPart = femPart;
generateStructGridData();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -37,6 +36,15 @@ RigFemPartGrid::RigFemPartGrid( const RigFemPart* femPart )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RigFemPartGrid::~RigFemPartGrid() {} RigFemPartGrid::~RigFemPartGrid() {}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigFemPartGrid::setFemPart( const RigFemPart* femPart )
{
m_femPart = femPart;
generateStructGridData();
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

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

@@ -26,9 +26,11 @@ class RigFemPart;
class RigFemPartGrid : public cvf::StructGridInterface class RigFemPartGrid : public cvf::StructGridInterface
{ {
public: public:
explicit RigFemPartGrid( const RigFemPart* femPart ); RigFemPartGrid();
~RigFemPartGrid() override; ~RigFemPartGrid() override;
void setFemPart( const RigFemPart* femPart );
bool ijkFromCellIndex( size_t cellIndex, size_t* i, size_t* j, size_t* k ) const 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; size_t cellIndexFromIJK( size_t i, size_t j, size_t k ) const override;