From 4e9895ef0e06bdc2dc84679d8884bac0c752006d Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Thu, 14 Feb 2019 15:11:27 +0100 Subject: [PATCH] System : Remove unused class --- .../Summary/RimSummaryObservedDataFile.cpp | 25 +++++----- .../ReservoirDataModel/CMakeLists_files.cmake | 2 - .../ReservoirDataModel/RigObservedData.cpp | 46 ------------------- .../ReservoirDataModel/RigObservedData.h | 35 -------------- 4 files changed, 11 insertions(+), 97 deletions(-) delete mode 100644 ApplicationCode/ReservoirDataModel/RigObservedData.cpp delete mode 100644 ApplicationCode/ReservoirDataModel/RigObservedData.h diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryObservedDataFile.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryObservedDataFile.cpp index 7d6f49064c..5fdd975a7b 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryObservedDataFile.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryObservedDataFile.cpp @@ -1,33 +1,33 @@ ///////////////////////////////////////////////////////////////////////////////// // // 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 +// +// See the GNU General Public License at // for more details. // ///////////////////////////////////////////////////////////////////////////////// #include "RimSummaryObservedDataFile.h" -#include "RigObservedData.h" +#include "RifReaderObservedData.h" + #include "RimTools.h" #include -#include "RifReaderObservedData.h" CAF_PDM_SOURCE_INIT(RimSummaryObservedDataFile, "SummaryObservedDataFile"); //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- RimSummaryObservedDataFile::RimSummaryObservedDataFile() { @@ -36,15 +36,12 @@ RimSummaryObservedDataFile::RimSummaryObservedDataFile() } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- -RimSummaryObservedDataFile::~RimSummaryObservedDataFile() -{ - -} +RimSummaryObservedDataFile::~RimSummaryObservedDataFile() {} //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- void RimSummaryObservedDataFile::createSummaryReaderInterface() { @@ -57,7 +54,7 @@ void RimSummaryObservedDataFile::createSummaryReaderInterface() } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- RifSummaryReaderInterface* RimSummaryObservedDataFile::summaryReader() { diff --git a/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake b/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake index 6236bf2ef2..33fd8c177b 100644 --- a/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake +++ b/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake @@ -45,7 +45,6 @@ ${CMAKE_CURRENT_LIST_DIR}/RigWellLogCurveData.h ${CMAKE_CURRENT_LIST_DIR}/RigWellLogExtractionTools.h ${CMAKE_CURRENT_LIST_DIR}/RigHexIntersectionTools.h ${CMAKE_CURRENT_LIST_DIR}/RigTimeHistoryResultAccessor.h -${CMAKE_CURRENT_LIST_DIR}/RigObservedData.h ${CMAKE_CURRENT_LIST_DIR}/RigLasFileExporter.h ${CMAKE_CURRENT_LIST_DIR}/RigSimulationWellCoordsAndMD.h ${CMAKE_CURRENT_LIST_DIR}/RigFishbonesGeometry.h @@ -112,7 +111,6 @@ ${CMAKE_CURRENT_LIST_DIR}/RigEclipseMultiPropertyStatCalc.cpp ${CMAKE_CURRENT_LIST_DIR}/RigWellLogCurveData.cpp ${CMAKE_CURRENT_LIST_DIR}/RigHexIntersectionTools.cpp ${CMAKE_CURRENT_LIST_DIR}/RigTimeHistoryResultAccessor.cpp -${CMAKE_CURRENT_LIST_DIR}/RigObservedData.cpp ${CMAKE_CURRENT_LIST_DIR}/RigLasFileExporter.cpp ${CMAKE_CURRENT_LIST_DIR}/RigSimulationWellCoordsAndMD.cpp ${CMAKE_CURRENT_LIST_DIR}/RigFishbonesGeometry.cpp diff --git a/ApplicationCode/ReservoirDataModel/RigObservedData.cpp b/ApplicationCode/ReservoirDataModel/RigObservedData.cpp deleted file mode 100644 index 5c4176d4f4..0000000000 --- a/ApplicationCode/ReservoirDataModel/RigObservedData.cpp +++ /dev/null @@ -1,46 +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 -// for more details. -// -///////////////////////////////////////////////////////////////////////////////// - -#include "RigObservedData.h" - -#include -#include - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RigObservedData::RigObservedData(const QString& observedDataFileName) -{ - openOrReloadCase(observedDataFileName); -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RigObservedData::~RigObservedData() -{ - -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RigObservedData::openOrReloadCase(const QString& observedDataFileName) -{ - -} diff --git a/ApplicationCode/ReservoirDataModel/RigObservedData.h b/ApplicationCode/ReservoirDataModel/RigObservedData.h deleted file mode 100644 index 6d23c53e7b..0000000000 --- a/ApplicationCode/ReservoirDataModel/RigObservedData.h +++ /dev/null @@ -1,35 +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 -// for more details. -// -///////////////////////////////////////////////////////////////////////////////// - -#pragma once - -#include "cvfBase.h" -#include "cvfObject.h" - -class QString; - -class RigObservedData: public cvf::Object -{ -public: - explicit RigObservedData(const QString& observedDataFileName ); - ~RigObservedData() override; - - void openOrReloadCase(const QString& observedDataFileName); - -private: -};