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

Minor issues related to release

Browse Source 
* Add shortcut for Plot Editor, and modify how command features are triggered
Use Ctrl-E to launch the Plot Editor.

* Add optional use of NOECHO and ECHO keywords in GRDECL files
* Add ECHO keywords to sector model export
* Add Help button to Preferences
This commit is contained in:
Magne Sjaastad
2023-02-20 08:18:08 +01:00
committed by GitHub
parent 40fe3d12ae
commit f0e78f32e8
28 changed files with 219 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
ApplicationLibCode/FileInterface/RifEclipseInputFileTools.cpp
View File

@@ -23,6 +23,9 @@
#include "RiaCellDividingTools.h"
#include "RiaLogging.h"
#include "RiaStringEncodingTools.h"
#include "RiaTextStringTools.h"
#include "ExportCommands/RicEclipseCellResultToFileImpl.h"
#include "RifEclipseInputPropertyLoader.h"
#include "RifEclipseKeywordContent.h"
@@ -48,7 +51,6 @@
#include <QFileInfo>
#include <QTextStream>
#include "RiaTextStringTools.h"
#include "ert/ecl/ecl_box.hpp"
#include "ert/ecl/ecl_grid.hpp"
#include "ert/ecl/ecl_kw.h"
@@ -392,17 +394,23 @@ bool RifEclipseInputFileTools::exportGrid( const QString& fileName,
bool RifEclipseInputFileTools::exportKeywords( const QString& resultFileName,
RigEclipseCaseData* eclipseCase,
const std::vector<QString>& keywords,
const QString& fileWriteMode,
bool writeEchoKeywords,
const cvf::Vec3st& min,
const cvf::Vec3st& maxIn,
const cvf::Vec3st& refinement )
{
FILE* filePtr = util_fopen( RiaStringEncodingTools::toNativeEncoded( resultFileName ).data(),
RiaStringEncodingTools::toNativeEncoded( fileWriteMode ).data() );
if ( !filePtr )
QFile exportFile( resultFileName );
if ( !exportFile.open( QIODevice::WriteOnly | QIODevice::Text ) )
{
return false;
}
if ( writeEchoKeywords )
{
QTextStream stream( &exportFile );
stream << "NOECHO\n";
}
RigCaseCellResultsData* cellResultsData = eclipseCase->results( RiaDefines::PorosityModelType::MATRIX_MODEL );
RigActiveCellInfo* activeCells = cellResultsData->activeCellInfo();
RigMainGrid* mainGrid = eclipseCase->mainGrid();
@@ -464,39 +472,22 @@ bool RifEclipseInputFileTools::exportKeywords( const QString& resul
}
}
ecl_kw_type* ecl_kw = nullptr;
// Multiple keywords can be exported to same file, so write ECHO keywords outside the loop
bool writeEchoKeywordsInExporterObject = false;
RicEclipseCellResultToFileImpl::writeDataToTextFile( &exportFile,
writeEchoKeywordsInExporterObject,
keyword,
filteredResults );
if ( keyword.endsWith( "NUM" ) )
{
std::vector<int> resultValuesInt;
resultValuesInt.reserve( filteredResults.size() );
for ( double val : filteredResults )
{
resultValuesInt.push_back( static_cast<int>( val ) );
}
ecl_kw =
ecl_kw_alloc_new( keyword.toLatin1().data(), (int)resultValuesInt.size(), ECL_INT, resultValuesInt.data() );
}
else
{
std::vector<float> resultValuesFloat;
resultValuesFloat.reserve( filteredResults.size() );
for ( double val : filteredResults )
{
resultValuesFloat.push_back( static_cast<float>( val ) );
}
ecl_kw = ecl_kw_alloc_new( keyword.toLatin1().data(),
(int)resultValuesFloat.size(),
ECL_FLOAT,
resultValuesFloat.data() );
}
ecl_kw_fprintf_grdecl( ecl_kw, filePtr );
ecl_kw_free( ecl_kw );
progress.incrementProgress();
}
fclose( filePtr );
if ( writeEchoKeywords )
{
QTextStream stream( &exportFile );
stream << "ECHO\n";
}
return true;
}
@@ -738,7 +729,8 @@ bool RifEclipseInputFileTools::importFaultsFromFile( RigEclipseCaseData* eclipse
if ( f->name() == RiaResultNames::undefinedGridFaultName() ||
f->name() == RiaResultNames::undefinedGridFaultName() )
{
// Do not include undefined grid faults, as these are recomputed based on the imported faults from files
// Do not include undefined grid faults, as these are recomputed based on the imported faults from
// files
continue;
}

6
ApplicationLibCode/FileInterface/RifEclipseInputFileTools.h
View File

@@ -70,7 +70,7 @@ public:
static bool exportKeywords( const QString& resultFileName,
RigEclipseCaseData* eclipseCase,
const std::vector<QString>& keywords,
const QString& fileWriteMode,
bool writeEchoKeywords,
const cvf::Vec3st& min = cvf::Vec3st::ZERO,
const cvf::Vec3st& max = cvf::Vec3st::UNDEFINED,
const cvf::Vec3st& refinement = cvf::Vec3st( 1, 1, 1 ) );
@@ -142,10 +142,6 @@ private:
static void readKeywordDataContent( QFile& data, qint64 filePos, QStringList* textContent, bool* isEditKeywordDetected );
static bool readDataFromKeyword( ecl_kw_type* eclipseKeywordData,
RigEclipseCaseData* caseData,
const QString& resultName,
QString* errMsg );
static void findGridKeywordPositions( const std::vector<RifKeywordAndFilePos>& keywords,
qint64* coordPos,
qint64* zcornPos,