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

#2154 Remove obsolete code

Browse Source
This commit is contained in:
Magne Sjaastad 2017-11-29 07:23:16 +01:00
parent 2d5ce8730d
commit dce728a4a2
4 changed files with 0 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/FlowCommands/CMakeLists_files.cmake
View File

@ -15,7 +15,6 @@ ${CEE_CURRENT_LIST_DIR}RicShowContributingWellsFeatureImpl.h
${CEE_CURRENT_LIST_DIR}RicPlotProductionRateFeature.h ${CEE_CURRENT_LIST_DIR}RicPlotProductionRateFeature.h
${CEE_CURRENT_LIST_DIR}RicSelectViewUI.h ${CEE_CURRENT_LIST_DIR}RicSelectViewUI.h
${CEE_CURRENT_LIST_DIR}RicShowTotalAllocationDataFeature.h ${CEE_CURRENT_LIST_DIR}RicShowTotalAllocationDataFeature.h
${CEE_CURRENT_LIST_DIR}RicCalculateNumberOfFloodedPoreVolumes.h
) )
set (SOURCE_GROUP_SOURCE_FILES set (SOURCE_GROUP_SOURCE_FILES
@ -29,7 +28,6 @@ ${CEE_CURRENT_LIST_DIR}RicShowContributingWellsFeatureImpl.cpp
${CEE_CURRENT_LIST_DIR}RicPlotProductionRateFeature.cpp ${CEE_CURRENT_LIST_DIR}RicPlotProductionRateFeature.cpp
${CEE_CURRENT_LIST_DIR}RicSelectViewUI.cpp ${CEE_CURRENT_LIST_DIR}RicSelectViewUI.cpp
${CEE_CURRENT_LIST_DIR}RicShowTotalAllocationDataFeature.cpp ${CEE_CURRENT_LIST_DIR}RicShowTotalAllocationDataFeature.cpp
${CEE_CURRENT_LIST_DIR}RicCalculateNumberOfFloodedPoreVolumes.cpp
) )
list(APPEND CODE_HEADER_FILES list(APPEND CODE_HEADER_FILES

83
ApplicationCode/Commands/FlowCommands/RicCalculateNumberOfFloodedPoreVolumes.cpp
View File

@ -1,83 +0,0 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2017 Statoil ASA
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#include "RicCalculateNumberOfFloodedPoreVolumes.h"
#include "RiaApplication.h"
#include "RigEclipseCaseData.h"
#include "RigMainGrid.h"
#include "RigNumberOfFloodedPoreVolumesCalculator.h"
#include "RimEclipseCase.h"
#include "RimView.h"
#include <QAction>
#include <QString>
#include "RimReservoirCellResultsStorage.h"
#include "RigActiveCellInfo.h"
CAF_CMD_SOURCE_INIT(RicCalculateNumberOfFloodedPoreVolumes, "RicCalculateNumberOfFloodedPoreVolumes");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicCalculateNumberOfFloodedPoreVolumes::isCommandEnabled()
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicCalculateNumberOfFloodedPoreVolumes::onActionTriggered(bool isChecked)
{
RimView* view = RiaApplication::instance()->activeReservoirView();
RimEclipseCase* caseToApply;
view->firstAncestorOrThisOfType(caseToApply);
RigMainGrid* mainGrid = caseToApply->eclipseCaseData()->mainGrid();
std::vector<QString> tracerNames;
tracerNames.push_back("SOIL");
RigNumberOfFloodedPoreVolumesCalculator calc(caseToApply, tracerNames);
std::vector<std::vector<double>> numberOfFloodedPorevolumes = calc.numberOfFloodedPorevolumes();
//Test
// size_t cellIndex = mainGrid->reservoirCellIndex(mainGrid->cellIndexFromIJK(19, 34, 9));
// RigActiveCellInfo* actCellInfo = caseToApply->eclipseCaseData()->activeCellInfo(RiaDefines::MATRIX_MODEL);
// size_t cellResultIndex = actCellInfo->cellResultIndex(cellIndex);
//
// std::vector<double> numberOfFloodedPorevolumesForSingleCell;
// std::vector<double> cumInflowForSingleCell;
//
// for (size_t timeStep = 0; timeStep < numberOfFloodedPorevolumes.size(); timeStep++)
// {
// numberOfFloodedPorevolumesForSingleCell.push_back(numberOfFloodedPorevolumes[timeStep][cellResultIndex]);
// }
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicCalculateNumberOfFloodedPoreVolumes::setupActionLook(QAction* actionToSetup)
{
actionToSetup->setText("TEST Calculate Number of Flooded Pore Volumes");
}

38
ApplicationCode/Commands/FlowCommands/RicCalculateNumberOfFloodedPoreVolumes.h
View File

@ -1,38 +0,0 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2017 Statoil ASA
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#pragma once
#include "cafCmdFeature.h"
//==================================================================================================
///
//==================================================================================================
class RicCalculateNumberOfFloodedPoreVolumes : public caf::CmdFeature
{
CAF_CMD_HEADER_INIT;
protected:
// Overrides
virtual bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook( QAction* actionToSetup ) override;
};

1
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@ -126,7 +126,6 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder << "RicImportInputEclipseCaseFeature"; menuBuilder << "RicImportInputEclipseCaseFeature";
menuBuilder << "RicCreateGridCaseGroupFeature"; menuBuilder << "RicCreateGridCaseGroupFeature";
menuBuilder << "RicEclipseCaseNewGroupFeature"; menuBuilder << "RicEclipseCaseNewGroupFeature";
menuBuilder << "RicCalculateNumberOfFloodedPoreVolumes";
} }
else if (dynamic_cast<RimGeoMechView*>(uiItem)) else if (dynamic_cast<RimGeoMechView*>(uiItem))
{ {