From 4101c3cd8543bb0c0202435a60bc18227116327b Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Fri, 22 Mar 2013 10:10:34 +0100 Subject: [PATCH] Removed obsolete file p4#: 21048 --- .../FileInterface/CMakeLists_files.cmake | 2 - .../RifReaderStatisticalCalculation.cpp | 134 ------------------ .../RifReaderStatisticalCalculation.h | 55 ------- 3 files changed, 191 deletions(-) delete mode 100644 ApplicationCode/FileInterface/RifReaderStatisticalCalculation.cpp delete mode 100644 ApplicationCode/FileInterface/RifReaderStatisticalCalculation.h diff --git a/ApplicationCode/FileInterface/CMakeLists_files.cmake b/ApplicationCode/FileInterface/CMakeLists_files.cmake index 04b2938dc9..7e80dd49d8 100644 --- a/ApplicationCode/FileInterface/CMakeLists_files.cmake +++ b/ApplicationCode/FileInterface/CMakeLists_files.cmake @@ -15,7 +15,6 @@ ${CEE_CURRENT_LIST_DIR}RifReaderEclipseInput.h ${CEE_CURRENT_LIST_DIR}RifReaderEclipseOutput.h ${CEE_CURRENT_LIST_DIR}RifReaderInterface.h ${CEE_CURRENT_LIST_DIR}RifReaderMockModel.h -${CEE_CURRENT_LIST_DIR}RifReaderStatisticalCalculation.h ) list(APPEND CODE_SOURCE_FILES @@ -27,7 +26,6 @@ ${CEE_CURRENT_LIST_DIR}RifEclipseUnifiedRestartFileAccess.cpp ${CEE_CURRENT_LIST_DIR}RifReaderEclipseInput.cpp ${CEE_CURRENT_LIST_DIR}RifReaderEclipseOutput.cpp ${CEE_CURRENT_LIST_DIR}RifReaderMockModel.cpp -${CEE_CURRENT_LIST_DIR}RifReaderStatisticalCalculation.cpp ) diff --git a/ApplicationCode/FileInterface/RifReaderStatisticalCalculation.cpp b/ApplicationCode/FileInterface/RifReaderStatisticalCalculation.cpp deleted file mode 100644 index 07bf2ab9db..0000000000 --- a/ApplicationCode/FileInterface/RifReaderStatisticalCalculation.cpp +++ /dev/null @@ -1,134 +0,0 @@ -///////////////////////////////////////////////////////////////////////////////// -// -// Copyright (C) 2011-2012 Statoil ASA, Ceetron AS -// -// 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 -// for more details. -// -///////////////////////////////////////////////////////////////////////////////// - -#include "cvfBase.h" - -#include "RigMainGrid.h" -#include "RigEclipseCase.h" -#include "RigReservoirCellResults.h" - -#include "RifReaderStatisticalCalculation.h" - - -//-------------------------------------------------------------------------------------------------- -/// Constructor -//-------------------------------------------------------------------------------------------------- -RifReaderStatisticalCalculation::RifReaderStatisticalCalculation() -{ -} - -//-------------------------------------------------------------------------------------------------- -/// Destructor -//-------------------------------------------------------------------------------------------------- -RifReaderStatisticalCalculation::~RifReaderStatisticalCalculation() -{ -} - -//-------------------------------------------------------------------------------------------------- -/// Open file and read geometry into given reservoir object -//-------------------------------------------------------------------------------------------------- -bool RifReaderStatisticalCalculation::open(const QString& fileName, RigEclipseCase* eclipseCase) -{ - buildMetaData(eclipseCase); - - return true; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RifReaderStatisticalCalculation::buildMetaData(RigEclipseCase* eclipseCase) -{ - RigReservoirCellResults* matrixModelResults = eclipseCase->results(RifReaderInterface::MATRIX_RESULTS); - RigReservoirCellResults* fractureModelResults = eclipseCase->results(RifReaderInterface::FRACTURE_RESULTS); - - // Dynamic results - for (int i = 0; i < m_matrixDynamicResultNames.size(); ++i) - { - size_t resIndex = matrixModelResults->addEmptyScalarResult(RimDefines::DYNAMIC_NATIVE, m_matrixDynamicResultNames[i], true); - matrixModelResults->setTimeStepDates(resIndex, m_timeSteps); - } - - for (int i = 0; i < m_fractureDynamicResultNames.size(); ++i) - { - size_t resIndex = fractureModelResults->addEmptyScalarResult(RimDefines::DYNAMIC_NATIVE, m_fractureDynamicResultNames[i], true); - fractureModelResults->setTimeStepDates(resIndex, m_timeSteps); - } - - std::vector staticDate; - if (m_timeSteps.size() > 0) - { - staticDate.push_back(m_timeSteps.front()); - } - - // Static results - for (int i = 0; i < m_fractureStaticResultNames.size(); ++i) - { - size_t resIndex = fractureModelResults->addEmptyScalarResult(RimDefines::STATIC_NATIVE, m_fractureStaticResultNames[i], true); - fractureModelResults->setTimeStepDates(resIndex, staticDate); - } - - for (int i = 0; i < m_matrixStaticResultNames.size(); ++i) - { - size_t resIndex = matrixModelResults->addEmptyScalarResult(RimDefines::STATIC_NATIVE, m_matrixStaticResultNames[i], true); - matrixModelResults->setTimeStepDates(resIndex, staticDate); - } -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RifReaderStatisticalCalculation::setMatrixResultNames(const QStringList& staticResultNames, const QStringList& dynamicResultNames) -{ - m_matrixStaticResultNames = staticResultNames; - m_matrixDynamicResultNames = dynamicResultNames; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RifReaderStatisticalCalculation::setFractureResultNames(const QStringList& staticResultNames, const QStringList& dynamicResultNames) -{ - m_fractureStaticResultNames = staticResultNames; - m_fractureDynamicResultNames = dynamicResultNames; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RifReaderStatisticalCalculation::setTimeSteps(const std::vector& timesteps) -{ - m_timeSteps = timesteps; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -bool RifReaderStatisticalCalculation::staticResult(const QString& result, PorosityModelResultType matrixOrFracture, std::vector* values) -{ - return false; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -bool RifReaderStatisticalCalculation::dynamicResult(const QString& result, PorosityModelResultType matrixOrFracture, size_t stepIndex, std::vector* values) -{ - return false; -} - diff --git a/ApplicationCode/FileInterface/RifReaderStatisticalCalculation.h b/ApplicationCode/FileInterface/RifReaderStatisticalCalculation.h deleted file mode 100644 index 649fd08b74..0000000000 --- a/ApplicationCode/FileInterface/RifReaderStatisticalCalculation.h +++ /dev/null @@ -1,55 +0,0 @@ -///////////////////////////////////////////////////////////////////////////////// -// -// Copyright (C) 2011-2012 Statoil ASA, Ceetron AS -// -// 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 -// for more details. -// -///////////////////////////////////////////////////////////////////////////////// - -#pragma once - -#include "RifReaderInterface.h" - - -class RifReaderStatisticalCalculation : public RifReaderInterface -{ -public: - RifReaderStatisticalCalculation(); - virtual ~RifReaderStatisticalCalculation(); - - // Virtual interface implementation - virtual bool open(const QString& fileName, RigEclipseCase* eclipseCase); - - virtual void close() {} - - virtual bool staticResult(const QString& result, PorosityModelResultType matrixOrFracture, std::vector* values ); - virtual bool dynamicResult(const QString& result, PorosityModelResultType matrixOrFracture, size_t stepIndex, std::vector* values ); - - void setMatrixResultNames(const QStringList& staticResultNames, const QStringList& dynamicResultNames); - void setFractureResultNames(const QStringList& staticResultNames, const QStringList& dynamicResultNames); - - void setTimeSteps(const std::vector& timesteps); - -private: - void buildMetaData(RigEclipseCase* eclipseCase); - -private: - std::vector m_timeSteps; - - QStringList m_matrixDynamicResultNames; - QStringList m_fractureDynamicResultNames; - - QStringList m_matrixStaticResultNames; - QStringList m_fractureStaticResultNames; - -};