OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-12 08:25:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Rename to resdata

Browse Source 
* Rename to resdata
* Remove development feature for storing grid import type in project file
* Clean up comments
This commit is contained in:
Magne Sjaastad authored and GitHub committed 2024-04-22 19:56:10 +02:00
1 parent c17e5237ca
commit 98144078c8
31 files changed
+93 -104
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp
+3 -10
View File
@@ -81,14 +81,6 @@ RimEclipseResultCase::RimEclipseResultCase()
{
CAF_PDM_InitScriptableObject( "Eclipse Case", ":/Case48x48.png", "", "The Regular Eclipse Results Case" );
auto defaultReader = RiaPreferences::current()->gridModelReader();
CAF_PDM_InitField( &m_gridModelReader, "gridModelReader", caf::AppEnum<RiaDefines::GridModelReader>( defaultReader ), "Grid Model Reader" );
if ( !RiaApplication::enableDevelopmentFeatures() )
{
m_gridModelReader.xmlCapability()->disableIO();
m_gridModelReader.uiCapability()->setUiHidden( true );
}
CAF_PDM_InitFieldNoDefault( &m_unitSystem, "UnitSystem", "Unit System" );
m_unitSystem.registerGetMethod( RimProject::current(), &RimProject::commonUnitSystemForAllCases );
m_unitSystem.uiCapability()->setUiReadOnly( true );
@@ -145,7 +137,9 @@ bool RimEclipseResultCase::importGridAndResultMetaData( bool showTimeStepFilter
return false;
}
if ( m_gridModelReader == RiaDefines::GridModelReader::LIBECL )
auto defaultReader = RiaPreferences::current()->gridModelReader();
if ( defaultReader == RiaDefines::GridModelReader::RESDATA )
{
auto readerEclipseOutput = new RifReaderEclipseOutput();
@@ -620,7 +614,6 @@ bool RimEclipseResultCase::hasSourSimFile()
//--------------------------------------------------------------------------------------------------
void RimEclipseResultCase::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
uiOrdering.add( &m_gridModelReader );
uiOrdering.add( &m_caseUserDescription );
uiOrdering.add( &m_displayNameOption );
uiOrdering.add( &m_caseId );
ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.h
-1
View File
@@ -94,7 +94,6 @@ private:
cvf::ref<RifReaderEclipseRft> m_readerEclipseRft;
cvf::ref<RifReaderOpmRft> m_readerOpmRft;
caf::PdmField<caf::AppEnum<RiaDefines::GridModelReader>> m_gridModelReader;
caf::PdmProxyValueField<caf::AppEnum<RiaDefines::EclipseUnitSystem>> m_unitSystem;
caf::PdmChildArrayField<RimFlowDiagSolution*> m_flowDiagSolutions;
caf::PdmField<caf::FilePath> m_sourSimFileName;
ApplicationLibCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp
+1 -1
View File
@@ -100,7 +100,7 @@ QString RimFileSummaryCase::caseName() const
void RimFileSummaryCase::createSummaryReaderInterfaceThreadSafe( RiaThreadSafeLogger* threadSafeLogger )
{
// RimFileSummaryCase::findRelatedFilesAndCreateReader is a performance bottleneck. The function
// RifEclipseSummaryTools::getRestartFile() should be refactored to use opm-common instead of libecl.
// RifEclipseSummaryTools::getRestartFile() should be refactored to use opm-common instead of resdata.
// It is not possible to use restart files in ESMRY file format, see see ESmry::make_esmry_file()
//
// https://github.com/OPM/ResInsight/issues/11342