mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
#82 Import ascii grdecl input properties into simulation case.
This allows data from text files to be imported into a binary Eclipse case imported based on *.EGRID.
This commit is contained in:
@@ -223,6 +223,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
|
||||
menuBuilder << "RicNewContourMapViewFeature";
|
||||
menuBuilder << "RicShowFlowCharacteristicsPlotFeature";
|
||||
menuBuilder << "RicEclipseCaseNewGroupFeature";
|
||||
menuBuilder << "RicAddEclipseInputPropertyFeature";
|
||||
menuBuilder << "Separator";
|
||||
menuBuilder << "RicCopyReferencesToClipboardFeature";
|
||||
menuBuilder << "Separator";
|
||||
|
||||
@@ -999,3 +999,8 @@ std::vector<QDateTime> RimEclipseCase::timeStepDates() const
|
||||
}
|
||||
return std::vector<QDateTime>();
|
||||
}
|
||||
|
||||
bool RimEclipseCase::importAsciiInputProperties( const QStringList& fileNames )
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -72,6 +72,7 @@ public:
|
||||
bool ensureReservoirCaseIsOpen();
|
||||
bool openReserviorCase();
|
||||
virtual bool openEclipseGridFile() = 0;
|
||||
virtual bool importAsciiInputProperties( const QStringList& fileNames );
|
||||
|
||||
RigEclipseCaseData* eclipseCaseData();
|
||||
const RigEclipseCaseData* eclipseCaseData() const;
|
||||
|
||||
@@ -73,6 +73,15 @@ RimEclipseInputCase::RimEclipseInputCase()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimEclipseInputCase::~RimEclipseInputCase() {}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
/// Import ascii properties. If no grid data has been read, it will first find the possible
|
||||
/// grid data among the files then read all supported properties from the files matching the grid
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
bool RimEclipseInputCase::importAsciiInputProperties( const QStringList& fileNames )
|
||||
{
|
||||
return openDataFileSet( fileNames );
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
/// Open the supplied file set. If no grid data has been read, it will first find the possible
|
||||
/// grid data among the files then read all supported properties from the files matching the grid
|
||||
|
||||
@@ -46,6 +46,7 @@ public:
|
||||
|
||||
// File open methods
|
||||
bool openDataFileSet( const QStringList& fileNames );
|
||||
bool importAsciiInputProperties( const QStringList& fileNames ) override;
|
||||
void loadAndSyncronizeInputProperties();
|
||||
|
||||
// RimCase overrides
|
||||
|
||||
@@ -28,6 +28,7 @@
|
||||
|
||||
#include "RicfCommandObject.h"
|
||||
|
||||
#include "RifEclipseInputPropertyLoader.h"
|
||||
#include "RifEclipseOutputFileTools.h"
|
||||
#include "RifReaderEclipseOutput.h"
|
||||
#include "RifReaderEclipseRft.h"
|
||||
@@ -41,6 +42,8 @@
|
||||
|
||||
#include "RimDialogData.h"
|
||||
#include "RimEclipseCellColors.h"
|
||||
#include "RimEclipseInputProperty.h"
|
||||
#include "RimEclipseInputPropertyCollection.h"
|
||||
#include "RimEclipseView.h"
|
||||
#include "RimFlowDiagSolution.h"
|
||||
#include "RimMockModelSettings.h"
|
||||
@@ -239,6 +242,18 @@ bool RimEclipseResultCase::importGridAndResultMetaData( bool showTimeStepFilter
|
||||
return true;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
bool RimEclipseResultCase::importAsciiInputProperties( const QStringList& fileNames )
|
||||
{
|
||||
bool importFaults = false;
|
||||
return RifEclipseInputPropertyLoader::readInputPropertiesFromFiles( m_inputPropertyCollection,
|
||||
this->eclipseCaseData(),
|
||||
importFaults,
|
||||
fileNames.toVector().toStdVector() );
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
@@ -26,11 +26,13 @@
|
||||
|
||||
#include <cafPdmProxyValueField.h>
|
||||
|
||||
class RifReaderInterface;
|
||||
class RigMainGrid;
|
||||
class RimFlowDiagSolution;
|
||||
class RigFlowDiagSolverInterface;
|
||||
class RifReaderEclipseRft;
|
||||
class RifReaderInterface;
|
||||
class RigFlowDiagSolverInterface;
|
||||
class RigMainGrid;
|
||||
class RimEclipseInputProperty;
|
||||
class RimEclipseInputPropertyCollection;
|
||||
class RimFlowDiagSolution;
|
||||
|
||||
//==================================================================================================
|
||||
//
|
||||
@@ -53,6 +55,7 @@ public:
|
||||
bool openEclipseGridFile() override;
|
||||
|
||||
bool importGridAndResultMetaData( bool showTimeStepFilter );
|
||||
bool importAsciiInputProperties( const QStringList& fileNames );
|
||||
|
||||
void reloadEclipseGridFile() override;
|
||||
bool openAndReadActiveCellData( RigEclipseCaseData* mainEclipseCase );
|
||||
|
||||
Reference in New Issue
Block a user