OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-16 02:12:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

#3512 System : Remove unused functions

Browse Source
This commit is contained in:
Magne Sjaastad committed 2018-10-17 13:52:48 +02:00
1 parent 075c3eb627
commit 5a1acc124f
43 files changed
+167 -382
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp
-8
View File
@@ -788,14 +788,6 @@ void RimWellPltPlot::setCurrentWellName(const QString& currWellName)
m_wellPathName = currWellName;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimWellPltPlot::currentWellName() const
{
return m_wellPathName;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.h
-1
View File
@@ -79,7 +79,6 @@ public:
RimWellLogPlot* wellLogPlot() const;
void setCurrentWellName(const QString& currWellName);
QString currentWellName() const;
static const char* plotNameFormatString();
ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp
-22
View File
@@ -514,25 +514,3 @@ RimEclipseCase* RimIdenticalGridCaseGroup::mainCase()
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimIdenticalGridCaseGroup::canCaseBeAdded(RimEclipseCase* reservoir) const
{
CVF_ASSERT(reservoir && reservoir->eclipseCaseData() && reservoir->eclipseCaseData()->mainGrid());
if (!m_mainGrid)
{
// Empty case group, reservoir can be added
return true;
}
RigMainGrid* incomingMainGrid = reservoir->eclipseCaseData()->mainGrid();
if (RigGridManager::isEqual(m_mainGrid, incomingMainGrid))
{
return true;
}
return false;
}
ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.h
-1
View File
@@ -58,7 +58,6 @@ public:
void removeCase(RimEclipseCase* reservoir);
bool contains(RimEclipseCase* reservoir) const;
bool canCaseBeAdded(RimEclipseCase* reservoir) const;
RimEclipseStatisticsCase* createAndAppendStatisticsCase();
ApplicationCode/ProjectDataModel/RimWellLogCurveCommonDataSource.cpp
-8
View File
@@ -113,14 +113,6 @@ void RimWellLogCurveCommonDataSource::setWellPathToApply(RimWellPath* val)
m_wellPath = val;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
int RimWellLogCurveCommonDataSource::branchIndexToApply() const
{
return m_branchIndex;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
ApplicationCode/ProjectDataModel/RimWellLogCurveCommonDataSource.h
-1
View File
@@ -48,7 +48,6 @@ public:
void setTrajectoryTypeToApply(int val);
RimWellPath* wellPathToApply() const;
void setWellPathToApply(RimWellPath* val);
int branchIndexToApply() const;
void setBranchIndexToApply(int val);
caf::Tristate branchDetectionToApply() const;
void setBranchDetectionToApply(caf::Tristate::State val);
ApplicationCode/ProjectDataModel/RimWellPathGeometryDef.cpp
-39
View File
@@ -231,45 +231,6 @@ void RimWellPathGeometryDef::appendTarget()
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellPathGeometryDef::addSmootheningTangentToNextToLastTargetIfSensible()
{
if (m_wellTargets.size() < 3) return;
size_t targetMaxIdx = m_wellTargets.size() - 1;
RimWellPathTarget* t1 = m_wellTargets[targetMaxIdx - 2];
RimWellPathTarget* t2 = m_wellTargets[targetMaxIdx - 1];
RimWellPathTarget* t3 = m_wellTargets[targetMaxIdx - 0];
if ( t2->targetType() != RimWellPathTarget::POINT ) return;
cvf::Vec3d t1t2 = t2->targetPointXYZ() - t1->targetPointXYZ();
cvf::Vec3d t2t3 = t3->targetPointXYZ() - t2->targetPointXYZ();
double angle = cvf::GeometryTools::getAngle(t1t2, t2t3);
if (angle < 0.3927) return; // pi/8
double length12 = t1t2.length();
double length23 = t2t3.length();
t1t2 /= length12; // Normalize
t2t3 /= length23; // Normalize
// Inverse distance:
t1t2 /= length12; // Weight
t2t3 /= length23; // Weight
cvf::Vec3d averageTangent = 1.0/(1.0/length12 + 1.0/length23) * (t1t2 + t2t3);
RiaOffshoreSphericalCoords aziInc(averageTangent);
t2->setAsPointXYZAndTangentTarget(t2->targetPointXYZ(), aziInc.azi(), aziInc.inc());
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
ApplicationCode/ProjectDataModel/RimWellPathGeometryDef.h
-2
View File
@@ -58,8 +58,6 @@ public:
void deleteTarget(RimWellPathTarget* targetTodelete);
void appendTarget();
void addSmootheningTangentToNextToLastTargetIfSensible();
const RimWellPathTarget* firstActiveTarget() const;
const RimWellPathTarget* lastActiveTarget() const;
ApplicationCode/ProjectDataModel/Summary/RimObservedData.cpp
-13
View File
@@ -114,19 +114,6 @@ QString RimObservedData::customWellName() const
return "";
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimObservedData::customWellGroupName() const
{
if (m_useCustomIdentifier() && m_summaryCategory() == RifEclipseSummaryAddress::SUMMARY_WELL_GROUP)
{
return m_identifierName();
}
return "";
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
ApplicationCode/ProjectDataModel/Summary/RimObservedData.h
-1
View File
@@ -46,7 +46,6 @@ public:
protected:
QString customWellName() const;
QString customWellGroupName() const;
private:
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
ApplicationCode/ProjectDataModel/Summary/RimObservedDataCollection.cpp
+3 -8
View File
@@ -72,14 +72,6 @@ void RimObservedDataCollection::removeObservedData(RimObservedData* observedData
caf::PdmUiObjectEditorHandle::updateUiAllObjectEditors();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimObservedDataCollection::addObservedData(RimObservedData* observedData)
{
m_observedDataArray.push_back(observedData);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -109,6 +101,9 @@ bool RimObservedDataCollection::fileExists(const QString& fileName, QString* err
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void updateNewSummaryObjectCreated(caf::PdmObject* object)
{
RiuPlotMainWindowTools::showPlotMainWindow();
ApplicationCode/ProjectDataModel/Summary/RimObservedDataCollection.h
-1
View File
@@ -37,7 +37,6 @@ public:
virtual ~RimObservedDataCollection();
void removeObservedData(RimObservedData* observedData);
void addObservedData(RimObservedData* observedData);
RimObservedData* createAndAddRsmObservedDataFromFile(const QString& fileName, QString* errorText = nullptr);
RimObservedData* createAndAddCvsObservedDataFromFile(const QString& fileName, bool useSavedFieldsValuesInDialog, QString* errorText = nullptr);
std::vector<RimSummaryCase*> allObservedData();
ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp
-10
View File
@@ -368,16 +368,6 @@ RimSummaryCaseCollection* RimSummaryCaseMainCollection::defaultAllocator()
return new RimSummaryCaseCollection();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryCase*> RimSummaryCaseMainCollection::createAndAddSummaryCasesFromFileInfos(const std::vector<RifSummaryCaseFileResultInfo>& summaryHeaderFileInfos)
{
std::vector<RimSummaryCase*> newCases = createSummaryCasesFromFileInfos(summaryHeaderFileInfos);
addCases(newCases);
return newCases;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.h
-1
View File
@@ -46,7 +46,6 @@ public:
std::vector<RimSummaryCase*> topLevelSummaryCases() const;
std::vector<RimSummaryCaseCollection*> summaryCaseCollections() const;
std::vector<RimSummaryCase*> createAndAddSummaryCasesFromFileInfos(const std::vector<RifSummaryCaseFileResultInfo>& summaryHeaderFileInfos);
std::vector<RimSummaryCase*> createSummaryCasesFromFileInfos(const std::vector<RifSummaryCaseFileResultInfo>& summaryHeaderFileInfos, bool showProgress = false);
RimSummaryCase* findSummaryCaseFromEclipseResultCase(const RimEclipseResultCase* eclResCase) const;
ApplicationCode/ProjectDataModel/Summary/RimSummaryFilter.cpp
-9
View File
@@ -461,12 +461,3 @@ void RimSummaryFilter::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryFilter::setCompleteVarStringFilter(const QString& stringFilter)
{
m_filterType = SUM_FILTER_VAR_STRING;
m_completeVarStringFilter = stringFilter;
}
ApplicationCode/ProjectDataModel/Summary/RimSummaryFilter.h
-1
View File
@@ -52,7 +52,6 @@ public:
virtual ~RimSummaryFilter();
void updateFromAddress(const RifEclipseSummaryAddress& address);
void setCompleteVarStringFilter(const QString& stringFilter);
bool isIncludedByFilter(const RifEclipseSummaryAddress& addr) const;
ApplicationCode/ProjectDataModel/Summary/RimSummaryObservedDataFile.cpp
-11
View File
@@ -43,17 +43,6 @@ RimSummaryObservedDataFile::~RimSummaryObservedDataFile()
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryObservedDataFile::setSummaryHeaderFilename(const QString& fileName)
{
m_summaryHeaderFilename = fileName;
this->updateAutoShortName();
this->updateTreeItemName();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
ApplicationCode/ProjectDataModel/Summary/RimSummaryObservedDataFile.h
-2
View File
@@ -36,8 +36,6 @@ public:
RimSummaryObservedDataFile();
virtual ~RimSummaryObservedDataFile();
void setSummaryHeaderFilename(const QString& fileName);
virtual void createSummaryReaderInterface() override;
virtual RifSummaryReaderInterface* summaryReader() override;
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
-19
View File
@@ -1022,25 +1022,6 @@ RimEnsembleCurveSetCollection* RimSummaryPlot::ensembleCurveSetCollection() cons
return m_ensembleCurveSetCollection;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryPlot::setCurveCollection(RimSummaryCurveCollection* curveCollection)
{
if (curveCollection)
{
// Delete current curve coll ?
m_summaryCurveCollection = curveCollection;
if (m_qwtPlot)
{
m_summaryCurveCollection->setParentQwtPlotAndReplot(m_qwtPlot);
this->updateAxes();
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.h
-1
View File
@@ -76,7 +76,6 @@ public:
void deleteCurve(RimSummaryCurve* curve);
void deleteCurves(const std::vector<RimSummaryCurve*>& curves);
void setCurveCollection(RimSummaryCurveCollection* curveCollection);
void deleteCurvesAssosiatedWithCase(RimSummaryCase* summaryCase);
RimEnsembleCurveSetCollection* ensembleCurveSetCollection() const;