From 8365d3b0b33793c5ad715a1c123371badd5b0b54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Thu, 18 May 2017 14:40:47 +0200 Subject: [PATCH] #1487 Rename to RifFractureExportTools --- ...vertAllFractureTemplatesToFieldFeature.cpp | 2 -- ...ertAllFractureTemplatesToMetricFeature.cpp | 3 -- .../RicConvertFractureTemplateUnitFeature.cpp | 3 -- ...edSimWellFractureWellCompletionFeature.cpp | 4 +-- ...dWellPathFractureWellCompletionFeature.cpp | 6 ++-- ...rtSimWellFractureWellCompletionFeature.cpp | 6 ++-- ...tWellPathFractureWellCompletionFeature.cpp | 6 ++-- .../FileInterface/CMakeLists_files.cmake | 4 +-- ...rtTools.cpp => RifFractureExportTools.cpp} | 33 ++++++++----------- ...ExportTools.h => RifFractureExportTools.h} | 6 ++-- 10 files changed, 29 insertions(+), 44 deletions(-) rename ApplicationCode/FileInterface/{RifEclipseExportTools.cpp => RifFractureExportTools.cpp} (92%) rename ApplicationCode/FileInterface/{RifEclipseExportTools.h => RifFractureExportTools.h} (96%) diff --git a/ApplicationCode/Commands/RicConvertAllFractureTemplatesToFieldFeature.cpp b/ApplicationCode/Commands/RicConvertAllFractureTemplatesToFieldFeature.cpp index f91fae58e4..2db6e8e4e6 100644 --- a/ApplicationCode/Commands/RicConvertAllFractureTemplatesToFieldFeature.cpp +++ b/ApplicationCode/Commands/RicConvertAllFractureTemplatesToFieldFeature.cpp @@ -20,8 +20,6 @@ #include "RiaApplication.h" -#include "RifEclipseExportTools.h" -#include "RifEclipseExportTools.h" #include "RimDefines.h" #include "RimEclipseCase.h" diff --git a/ApplicationCode/Commands/RicConvertAllFractureTemplatesToMetricFeature.cpp b/ApplicationCode/Commands/RicConvertAllFractureTemplatesToMetricFeature.cpp index 4a43625925..4eacb1e01e 100644 --- a/ApplicationCode/Commands/RicConvertAllFractureTemplatesToMetricFeature.cpp +++ b/ApplicationCode/Commands/RicConvertAllFractureTemplatesToMetricFeature.cpp @@ -20,9 +20,6 @@ #include "RiaApplication.h" -#include "RifEclipseExportTools.h" -#include "RifEclipseExportTools.h" - #include "RimDefines.h" #include "RimEclipseCase.h" #include "RimEclipseView.h" diff --git a/ApplicationCode/Commands/RicConvertFractureTemplateUnitFeature.cpp b/ApplicationCode/Commands/RicConvertFractureTemplateUnitFeature.cpp index a4f6115c48..72467dd2e5 100644 --- a/ApplicationCode/Commands/RicConvertFractureTemplateUnitFeature.cpp +++ b/ApplicationCode/Commands/RicConvertFractureTemplateUnitFeature.cpp @@ -21,9 +21,6 @@ #include "RiaApplication.h" -#include "RifEclipseExportTools.h" -#include "RifEclipseExportTools.h" - #include "RimDefines.h" #include "RimEclipseCase.h" #include "RimEclipseView.h" diff --git a/ApplicationCode/Commands/RicExportSelectedSimWellFractureWellCompletionFeature.cpp b/ApplicationCode/Commands/RicExportSelectedSimWellFractureWellCompletionFeature.cpp index 12b20a0028..46681e7fe0 100644 --- a/ApplicationCode/Commands/RicExportSelectedSimWellFractureWellCompletionFeature.cpp +++ b/ApplicationCode/Commands/RicExportSelectedSimWellFractureWellCompletionFeature.cpp @@ -23,7 +23,7 @@ #include "EclipseWell/RicEclipseWellFeatureImpl.h" -#include "RifEclipseExportTools.h" +#include "RifFractureExportTools.h" #include "RimEclipseCase.h" #include "RimEclipseView.h" @@ -95,7 +95,7 @@ void RicExportSelectedSimWellFractureWellCompletionFeature::onActionTriggered(bo { RiaApplication::instance()->setLastUsedDialogDirectory("FRACTURE_EXPORT_DIR", QFileInfo(exportSettings.fileName).absolutePath()); - bool isOk = RifEclipseExportTools::writeFracturesToTextFile(exportSettings.fileName, fractures, exportSettings.caseToApply); + bool isOk = RifFractureExportTools::writeFracturesToTextFile(exportSettings.fileName, fractures, exportSettings.caseToApply); if (!isOk) { diff --git a/ApplicationCode/Commands/RicExportSelectedWellPathFractureWellCompletionFeature.cpp b/ApplicationCode/Commands/RicExportSelectedWellPathFractureWellCompletionFeature.cpp index 4bd33ba6a1..d1daf897a8 100644 --- a/ApplicationCode/Commands/RicExportSelectedWellPathFractureWellCompletionFeature.cpp +++ b/ApplicationCode/Commands/RicExportSelectedWellPathFractureWellCompletionFeature.cpp @@ -21,8 +21,8 @@ #include "RiaApplication.h" -#include "RifEclipseExportTools.h" -#include "RifEclipseExportTools.h" +#include "RifFractureExportTools.h" +#include "RifFractureExportTools.h" #include "RimEclipseCase.h" #include "RimEclipseView.h" @@ -100,7 +100,7 @@ void RicExportSelectedWellPathFractureWellCompletionFeature::onActionTriggered(b { RiaApplication::instance()->setLastUsedDialogDirectory("FRACTURE_EXPORT_DIR", QFileInfo(exportSettings.fileName).absolutePath()); - bool isOk = RifEclipseExportTools::writeFracturesToTextFile(exportSettings.fileName, fractures, exportSettings.caseToApply); + bool isOk = RifFractureExportTools::writeFracturesToTextFile(exportSettings.fileName, fractures, exportSettings.caseToApply); if (!isOk) { diff --git a/ApplicationCode/Commands/RicExportSimWellFractureWellCompletionFeature.cpp b/ApplicationCode/Commands/RicExportSimWellFractureWellCompletionFeature.cpp index cea7ce8fee..00102d8e42 100644 --- a/ApplicationCode/Commands/RicExportSimWellFractureWellCompletionFeature.cpp +++ b/ApplicationCode/Commands/RicExportSimWellFractureWellCompletionFeature.cpp @@ -21,8 +21,8 @@ #include "RiaApplication.h" -#include "RifEclipseExportTools.h" -#include "RifEclipseExportTools.h" +#include "RifFractureExportTools.h" +#include "RifFractureExportTools.h" #include "RimEclipseCase.h" #include "RimEclipseView.h" @@ -91,7 +91,7 @@ void RicExportSimWellFractureWellCompletionFeature::onActionTriggered(bool isChe { RiaApplication::instance()->setLastUsedDialogDirectory("FRACTURE_EXPORT_DIR", QFileInfo(exportSettings.fileName).absolutePath()); - bool isOk = RifEclipseExportTools::writeFracturesToTextFile(exportSettings.fileName, fractures, exportSettings.caseToApply); + bool isOk = RifFractureExportTools::writeFracturesToTextFile(exportSettings.fileName, fractures, exportSettings.caseToApply); if (!isOk) { diff --git a/ApplicationCode/Commands/RicExportWellPathFractureWellCompletionFeature.cpp b/ApplicationCode/Commands/RicExportWellPathFractureWellCompletionFeature.cpp index 70141d3ce9..ad91162491 100644 --- a/ApplicationCode/Commands/RicExportWellPathFractureWellCompletionFeature.cpp +++ b/ApplicationCode/Commands/RicExportWellPathFractureWellCompletionFeature.cpp @@ -21,8 +21,8 @@ #include "RiaApplication.h" -#include "RifEclipseExportTools.h" -#include "RifEclipseExportTools.h" +#include "RifFractureExportTools.h" +#include "RifFractureExportTools.h" #include "RimEclipseCase.h" #include "RimEclipseView.h" @@ -92,7 +92,7 @@ void RicExportWellPathFractureWellCompletionFeature::onActionTriggered(bool isCh { RiaApplication::instance()->setLastUsedDialogDirectory("FRACTURE_EXPORT_DIR", QFileInfo(exportSettings.fileName).absolutePath()); - bool isOk = RifEclipseExportTools::writeFracturesToTextFile(exportSettings.fileName, fractures, exportSettings.caseToApply); + bool isOk = RifFractureExportTools::writeFracturesToTextFile(exportSettings.fileName, fractures, exportSettings.caseToApply); if (!isOk) { diff --git a/ApplicationCode/FileInterface/CMakeLists_files.cmake b/ApplicationCode/FileInterface/CMakeLists_files.cmake index d14b28f591..2c47d6ea42 100644 --- a/ApplicationCode/FileInterface/CMakeLists_files.cmake +++ b/ApplicationCode/FileInterface/CMakeLists_files.cmake @@ -20,7 +20,7 @@ ${CEE_CURRENT_LIST_DIR}RifReaderMockModel.h ${CEE_CURRENT_LIST_DIR}RifReaderSettings.h ${CEE_CURRENT_LIST_DIR}RifEclipseSummaryAddress.h ${CEE_CURRENT_LIST_DIR}RifEclipseWellCompletionExporter.h -${CEE_CURRENT_LIST_DIR}RifEclipseExportTools.h +${CEE_CURRENT_LIST_DIR}RifFractureExportTools.h ) set (SOURCE_GROUP_SOURCE_FILES @@ -39,7 +39,7 @@ ${CEE_CURRENT_LIST_DIR}RifReaderMockModel.cpp ${CEE_CURRENT_LIST_DIR}RifReaderSettings.cpp ${CEE_CURRENT_LIST_DIR}RifEclipseSummaryAddress.cpp ${CEE_CURRENT_LIST_DIR}RifEclipseWellCompletionExporter.cpp -${CEE_CURRENT_LIST_DIR}RifEclipseExportTools.cpp +${CEE_CURRENT_LIST_DIR}RifFractureExportTools.cpp ) list(APPEND CODE_HEADER_FILES diff --git a/ApplicationCode/FileInterface/RifEclipseExportTools.cpp b/ApplicationCode/FileInterface/RifFractureExportTools.cpp similarity index 92% rename from ApplicationCode/FileInterface/RifEclipseExportTools.cpp rename to ApplicationCode/FileInterface/RifFractureExportTools.cpp index 358bf1d8ba..4b6fec9031 100644 --- a/ApplicationCode/FileInterface/RifEclipseExportTools.cpp +++ b/ApplicationCode/FileInterface/RifFractureExportTools.cpp @@ -16,7 +16,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RifEclipseExportTools.h" +#include "RifFractureExportTools.h" #include "RiaApplication.h" #include "RiaLogging.h" @@ -50,7 +50,7 @@ //-------------------------------------------------------------------------------------------------- /// Constructor //-------------------------------------------------------------------------------------------------- -RifEclipseExportTools::RifEclipseExportTools() +RifFractureExportTools::RifFractureExportTools() { } @@ -59,7 +59,7 @@ RifEclipseExportTools::RifEclipseExportTools() //-------------------------------------------------------------------------------------------------- /// Destructor //-------------------------------------------------------------------------------------------------- -RifEclipseExportTools::~RifEclipseExportTools() +RifFractureExportTools::~RifFractureExportTools() { } @@ -67,20 +67,13 @@ RifEclipseExportTools::~RifEclipseExportTools() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RifEclipseExportTools::writeFracturesToTextFile(const QString& fileName, const std::vector< RimFracture*>& fractures, RimEclipseCase* caseToApply) +bool RifFractureExportTools::writeFracturesToTextFile(const QString& fileName, const std::vector< RimFracture*>& fractures, RimEclipseCase* caseToApply) { RiaLogging::info(QString("Computing and writing COMPDAT values to file %1").arg(fileName)); - RiaApplication* app = RiaApplication::instance(); - RimView* activeView = RiaApplication::instance()->activeReservoirView(); - if (!activeView) return false; - RimEclipseView* activeRiv = dynamic_cast(activeView); - if (!activeRiv) return false; - - const RigMainGrid* mainGrid = activeRiv->mainGrid(); + const RigMainGrid* mainGrid = caseToApply->eclipseCaseData()->mainGrid(); if (!mainGrid) return false; - QFile file(fileName); if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { @@ -91,7 +84,7 @@ bool RifEclipseExportTools::writeFracturesToTextFile(const QString& fileName, c RimEclipseWell* simWell = nullptr; RimWellPath* wellPath = nullptr; - size_t progress =0; + size_t progress = 0; std::vector ijk; QTextStream out(&file); @@ -162,7 +155,7 @@ bool RifEclipseExportTools::writeFracturesToTextFile(const QString& fileName, c //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RifEclipseExportTools::performStimPlanUpscalingAndPrintResults(const std::vector& fractures, RimEclipseCase* caseToApply, QTextStream &out, RimWellPath* wellPath, RimEclipseWell* simWell, const RigMainGrid* mainGrid) +void RifFractureExportTools::performStimPlanUpscalingAndPrintResults(const std::vector& fractures, RimEclipseCase* caseToApply, QTextStream &out, RimWellPath* wellPath, RimEclipseWell* simWell, const RigMainGrid* mainGrid) { //TODO: Get these more generally: @@ -236,7 +229,7 @@ void RifEclipseExportTools::performStimPlanUpscalingAndPrintResults(const std::v //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RifEclipseExportTools::printStimPlanCellsMatrixTransContributions(const std::vector& fractures, RimEclipseCase* caseToApply, QTextStream &out, RimWellPath* wellPath, RimEclipseWell* simWell, const RigMainGrid* mainGrid) +void RifFractureExportTools::printStimPlanCellsMatrixTransContributions(const std::vector& fractures, RimEclipseCase* caseToApply, QTextStream &out, RimWellPath* wellPath, RimEclipseWell* simWell, const RigMainGrid* mainGrid) { out << "StimPlan cells' matrix transmissibility and Eclipse Cell contributions \n"; @@ -347,7 +340,7 @@ void RifEclipseExportTools::printStimPlanCellsMatrixTransContributions(const std //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RifEclipseExportTools::printStimPlanFractureTrans(const std::vector& fractures, QTextStream &out) +void RifFractureExportTools::printStimPlanFractureTrans(const std::vector& fractures, QTextStream &out) { out << "StimPlan cells' fracture transmissibility \n"; @@ -408,7 +401,7 @@ return; //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RifEclipseExportTools::printCOMPDATvalues(QTextStream & out, RigFracturedEclipseCellExportData &fracData, RimFracture* fracture, RimWellPath* wellPath, RimEclipseWell* simWell, const RigMainGrid* mainGrid) +void RifFractureExportTools::printCOMPDATvalues(QTextStream & out, RigFracturedEclipseCellExportData &fracData, RimFracture* fracture, RimWellPath* wellPath, RimEclipseWell* simWell, const RigMainGrid* mainGrid) { out << qSetFieldWidth(8); if (fracData.transmissibility == cvf::UNDEFINED_DOUBLE || !(fracture->attachedFractureDefinition())) out << "--"; //Commenting out line in output file @@ -460,7 +453,7 @@ void RifEclipseExportTools::printCOMPDATvalues(QTextStream & out, RigFracturedEc //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RifEclipseExportTools::printBackgroundDataHeaderLine(QTextStream & out) +void RifFractureExportTools::printBackgroundDataHeaderLine(QTextStream & out) { out << "-- Background data for calculation" << "\n\n"; @@ -518,7 +511,7 @@ void RifEclipseExportTools::printBackgroundDataHeaderLine(QTextStream & out) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RifEclipseExportTools::printBackgroundData(QTextStream & out, RimWellPath* wellPath, RimEclipseWell* simWell, RimFracture* fracture, const RigMainGrid* mainGrid, RigFracturedEclipseCellExportData &fracData) +void RifFractureExportTools::printBackgroundData(QTextStream & out, RimWellPath* wellPath, RimEclipseWell* simWell, RimFracture* fracture, const RigMainGrid* mainGrid, RigFracturedEclipseCellExportData &fracData) { out << qSetFieldWidth(4); out << "-- "; @@ -596,7 +589,7 @@ void RifEclipseExportTools::printBackgroundData(QTextStream & out, RimWellPath* //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RifEclipseExportTools::printTransmissibilityFractureToWell(const std::vector& fractures, QTextStream &out, RimEclipseCase* caseToApply) +void RifFractureExportTools::printTransmissibilityFractureToWell(const std::vector& fractures, QTextStream &out, RimEclipseCase* caseToApply) { out << "-- Transmissibility From Fracture To Well \n"; diff --git a/ApplicationCode/FileInterface/RifEclipseExportTools.h b/ApplicationCode/FileInterface/RifFractureExportTools.h similarity index 96% rename from ApplicationCode/FileInterface/RifEclipseExportTools.h rename to ApplicationCode/FileInterface/RifFractureExportTools.h index 4ca2ba472b..0b8287341c 100644 --- a/ApplicationCode/FileInterface/RifEclipseExportTools.h +++ b/ApplicationCode/FileInterface/RifFractureExportTools.h @@ -43,11 +43,11 @@ class RimWellPath; // Class for access to Eclipse "keyword" files using libecl // //================================================================================================== -class RifEclipseExportTools +class RifFractureExportTools { public: - RifEclipseExportTools(); - virtual ~RifEclipseExportTools(); + RifFractureExportTools(); + virtual ~RifFractureExportTools(); static bool writeFracturesToTextFile(const QString& fileName, const std::vector& fractures, RimEclipseCase* caseToApply);