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

System : Removed unused functions

Browse Source
This commit is contained in:
Magne Sjaastad 2015-10-26 10:16:27 +01:00
parent bbdb730372
commit f3f2cf1590
8 changed files with 1 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.cpp
View File

@ -108,25 +108,6 @@ RigGeoMechWellLogExtractor* RimWellLogPlotCollection::findOrCreateExtractor(RimW
return extractor.p();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellLogPlot* RimWellLogPlotCollection::wellLogPlotFromViewer(RiuWellLogPlot* viewer) const
{
CVF_ASSERT(viewer);
for (size_t pIdx = 0; pIdx < wellLogPlots.size(); pIdx++)
{
RimWellLogPlot* wellLogPlot = wellLogPlots[pIdx];
if (wellLogPlot->viewer() == viewer)
{
return wellLogPlot;
}
}
return NULL;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.h
View File

@ -53,8 +53,6 @@ public:
void removeExtractors(const RigCaseData* caseData);
void removeExtractors(const RigGeoMechCaseData* caseData);
RimWellLogPlot* wellLogPlotFromViewer(RiuWellLogPlot* viewer) const;
caf::PdmChildArrayField<RimWellLogPlot*> wellLogPlots;
private:
cvf::Collection<RigEclipseWellLogExtractor> m_extractors;

19
ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp
View File

@ -152,25 +152,6 @@ std::vector<double>& RigCaseCellResultsData::cellScalarResults(size_t scalarResu
return m_cellScalarResults[scalarResultIndex][timeStepIndex];
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RigCaseCellResultsData::cellScalarResult( size_t scalarResultIndex, size_t timeStepIndex, size_t resultValueIndex)
{
if (scalarResultIndex < resultCount() &&
timeStepIndex < m_cellScalarResults[scalarResultIndex].size() &&
resultValueIndex != cvf::UNDEFINED_SIZE_T &&
resultValueIndex < m_cellScalarResults[scalarResultIndex][timeStepIndex].size())
{
return m_cellScalarResults[scalarResultIndex][timeStepIndex][resultValueIndex];
}
else
{
return HUGE_VAL;
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

1
ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.h
View File

@ -87,7 +87,6 @@ public:
const std::vector< std::vector<double> > & cellScalarResults(size_t scalarResultIndex) const;
std::vector< std::vector<double> > & cellScalarResults(size_t scalarResultIndex);
std::vector<double>& cellScalarResults(size_t scalarResultIndex, size_t timeStepIndex);
double cellScalarResult(size_t scalarResultIndex, size_t timeStepIndex, size_t resultValueIndex);
static RifReaderInterface::PorosityModelResultType convertFromProjectModelPorosityModel(RimDefines::PorosityModelType porosityModel);

16
ApplicationCode/ReservoirDataModel/RigCaseToCaseCellMapper.cpp
View File

@ -102,22 +102,6 @@ const int * RigCaseToCaseCellMapper::masterCaseCellIndices(int dependentCaseRese
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigCaseToCaseCellMapper::storeMapping(int depCaseCellIdx, const std::vector<int>& masterCaseMatchingCells)
{
if (masterCaseMatchingCells.size() == 1)
{
m_masterCellOrIntervalIndex[depCaseCellIdx] = masterCaseMatchingCells[0];
}
else if (masterCaseMatchingCells.size() > 1)
{
m_masterCellOrIntervalIndex[depCaseCellIdx] = -((int)(m_masterCellIndexSeries.size()));
m_masterCellIndexSeries.push_back(masterCaseMatchingCells);
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

1
ApplicationCode/ReservoirDataModel/RigCaseToCaseCellMapper.h
View File

@ -50,7 +50,6 @@ public:
private:
void storeMapping(int depCaseCellIdx, const std::vector<int>& masterCaseMatchingCells);
void addMapping(int depCaseCellIdx, int masterCaseMatchingCell);
void calculateEclToGeomCellMapping(RigMainGrid* masterEclGrid, RigFemPart* dependentFemPart, bool eclipseIsMaster);

34
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@ -1057,7 +1057,7 @@ bool RiuMainWindow::checkForDocumentModifications()
void RiuMainWindow::slotCloseProject()
{
RiaApplication* app = RiaApplication::instance();
bool ret = app->closeProject(true);
app->closeProject(true);
}
//--------------------------------------------------------------------------------------------------
@ -2165,38 +2165,6 @@ void RiuMainWindow::slotOpenUsersGuideInBrowserAction()
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuMainWindow::appendActionsContextMenuForPdmObject(caf::PdmObjectHandle* pdmObject, QMenu* menu)
{
if (!menu)
{
return;
}
caf::CmdFeatureManager* cmdFeatureMgr = caf::CmdFeatureManager::instance();
CVF_ASSERT(cmdFeatureMgr);
if (dynamic_cast<RimWellPathCollection*>(pdmObject))
{
menu->addAction(cmdFeatureMgr->action("RicWellPathsImportFileFeature"));
menu->addAction(cmdFeatureMgr->action("RicWellPathsImportSsihubFeature"));
}
else if (dynamic_cast<RimEclipseCaseCollection*>(pdmObject))
{
menu->addAction(cmdFeatureMgr->action("RicImportEclipseCaseFeature"));
menu->addAction(cmdFeatureMgr->action("RicImportInputEclipseCaseFeature"));
menu->addAction(cmdFeatureMgr->action("RicCreateGridCaseGroupFeature"));
}
else if (dynamic_cast<RimGeoMechModels*>(pdmObject))
{
#ifdef USE_ODB_API
menu->addAction(m_importGeoMechCaseAction);
#endif
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

1
ApplicationCode/UserInterface/RiuMainWindow.h
View File

@ -102,7 +102,6 @@ public:
void setDefaultWindowSize();
void appendActionsContextMenuForPdmObject(caf::PdmObjectHandle* pdmObject, QMenu* menu);
void refreshDrawStyleActions();
void setExpanded(const caf::PdmUiItem* uiItem, bool expanded);