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

Janitor : Remove unused code

Browse Source
This commit is contained in:
Magne Sjaastad 2020-12-14 20:00:58 +01:00
parent e3b13a1685
commit 877ff8e376
9 changed files with 0 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
ApplicationCode/FileInterface/RifReaderEclipseSummary.cpp
View File

@ -638,30 +638,6 @@ RiaEclipseUnitTools::UnitSystem RifReaderEclipseSummary::unitSystem() const
return m_unitSystem; return m_unitSystem;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RifReaderEclipseSummary::markForCachePurge( const RifEclipseSummaryAddress& address )
{
m_valuesCache->markAddressForPurge( address );
}
#if 0
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RifReaderEclipseSummary::populateVectorFromStringList(stringlist_type* stringList, std::vector<std::string>* strings)
{
assert(stringList && strings);
for (int i = 0; i < stringlist_get_size(stringList); i++)
{
strings->push_back(stringlist_iget(stringList, i));
}
}
#endif
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -688,7 +664,6 @@ void RifReaderEclipseSummary::ValuesCache::insertValues( const RifEclipseSummary
const std::vector<double>& values ) const std::vector<double>& values )
{ {
m_cachedValues[address] = values; m_cachedValues[address] = values;
m_purgeList.erase( address );
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -702,23 +677,3 @@ const std::vector<double>& RifReaderEclipseSummary::ValuesCache::getValues( cons
} }
return EMPTY_VECTOR; return EMPTY_VECTOR;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RifReaderEclipseSummary::ValuesCache::markAddressForPurge( const RifEclipseSummaryAddress& address )
{
m_purgeList.insert( address );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RifReaderEclipseSummary::ValuesCache::purgeData()
{
for ( const auto& purgeAddr : m_purgeList )
{
m_cachedValues.erase( purgeAddr );
}
m_purgeList.clear();
}

6
ApplicationCode/FileInterface/RifReaderEclipseSummary.h
View File

@ -78,8 +78,6 @@ public:
RiaEclipseUnitTools::UnitSystem unitSystem() const override; RiaEclipseUnitTools::UnitSystem unitSystem() const override;
QStringList warnings() const { return m_warnings; } QStringList warnings() const { return m_warnings; }
void markForCachePurge( const RifEclipseSummaryAddress& address ) override;
static std::string differenceIdentifier() { return "_DIFF"; } static std::string differenceIdentifier() { return "_DIFF"; }
static const std::string historyIdentifier() { return "H"; } static const std::string historyIdentifier() { return "H"; }
@ -119,13 +117,9 @@ private:
void insertValues( const RifEclipseSummaryAddress& address, const std::vector<double>& values ); void insertValues( const RifEclipseSummaryAddress& address, const std::vector<double>& values );
const std::vector<double>& getValues( const RifEclipseSummaryAddress& address ) const; const std::vector<double>& getValues( const RifEclipseSummaryAddress& address ) const;
void markAddressForPurge( const RifEclipseSummaryAddress& address );
private: private:
void purgeData();
std::map<const RifEclipseSummaryAddress, std::vector<double>> m_cachedValues; std::map<const RifEclipseSummaryAddress, std::vector<double>> m_cachedValues;
std::set<RifEclipseSummaryAddress> m_purgeList;
}; };
std::unique_ptr<ValuesCache> m_valuesCache; std::unique_ptr<ValuesCache> m_valuesCache;

2
ApplicationCode/FileInterface/RifSummaryReaderInterface.h
View File

@ -51,8 +51,6 @@ public:
virtual std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const = 0; virtual std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const = 0;
virtual RiaEclipseUnitTools::UnitSystem unitSystem() const = 0; virtual RiaEclipseUnitTools::UnitSystem unitSystem() const = 0;
virtual void markForCachePurge( const RifEclipseSummaryAddress& address ) {}
protected: protected:
std::set<RifEclipseSummaryAddress> m_allResultAddresses; // Result and error addresses std::set<RifEclipseSummaryAddress> m_allResultAddresses; // Result and error addresses
std::set<RifEclipseSummaryAddress> m_allErrorAddresses; // Error addresses std::set<RifEclipseSummaryAddress> m_allErrorAddresses; // Error addresses

12
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
View File

@ -383,7 +383,6 @@ void RimEnsembleCurveSet::deleteCurve( RimSummaryCurve* curve )
if ( curve ) if ( curve )
{ {
m_curves.removeChildObject( curve ); m_curves.removeChildObject( curve );
curve->markCachedDataForPurge();
delete curve; delete curve;
} }
} }
@ -1808,17 +1807,6 @@ void RimEnsembleCurveSet::showCurves( bool show )
m_showCurves = show; m_showCurves = show;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsembleCurveSet::markCachedDataForPurge()
{
for ( const auto& curve : m_curves )
{
curve->markCachedDataForPurge();
}
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h
View File

@ -126,8 +126,6 @@ public:
RimEnsembleCurveSet* clone() const; RimEnsembleCurveSet* clone() const;
void showCurves( bool show ); void showCurves( bool show );
void markCachedDataForPurge();
void updateAllTextInPlot(); void updateAllTextInPlot();
std::vector<EnsembleParameter> variationSortedEnsembleParameters() const; std::vector<EnsembleParameter> variationSortedEnsembleParameters() const;

1
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.cpp
View File

@ -193,7 +193,6 @@ void RimEnsembleCurveSetCollection::deleteCurveSets( const std::vector<RimEnsemb
for ( const auto curveSet : curveSets ) for ( const auto curveSet : curveSets )
{ {
m_curveSets.removeChildObject( curveSet ); m_curveSets.removeChildObject( curveSet );
curveSet->markCachedDataForPurge();
delete curveSet; delete curveSet;
} }
} }

9
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
View File

@ -971,15 +971,6 @@ void RimSummaryCurve::setCurveAppearanceFromCaseType()
} }
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryCurve::markCachedDataForPurge()
{
auto reader = valuesSummaryReaderY();
if ( reader ) reader->markForCachePurge( m_yValuesSummaryAddress->address() );
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.h
View File

@ -91,8 +91,6 @@ public:
QString curveExportDescription( const RifEclipseSummaryAddress& address = RifEclipseSummaryAddress() ) const override; QString curveExportDescription( const RifEclipseSummaryAddress& address = RifEclipseSummaryAddress() ) const override;
void setCurveAppearanceFromCaseType(); void setCurveAppearanceFromCaseType();
void markCachedDataForPurge();
void setAsTopZWithinCategory( bool enable ); void setAsTopZWithinCategory( bool enable );
void setZIndexFromCurveInfo(); void setZIndexFromCurveInfo();

1
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveCollection.cpp
View File

@ -206,7 +206,6 @@ void RimSummaryCurveCollection::deleteCurve( RimSummaryCurve* curve )
removeCurve( curve ); removeCurve( curve );
if ( curve ) if ( curve )
{ {
curve->markCachedDataForPurge();
delete curve; delete curve;
} }
} }