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

Janitor issues

Browse Source 
* Remove obsolete code
* Fix path modification of a relative folder
Replace start token '.' with file path to the project file to make sure that the path './wells/a-1h.dev' can be imported correctly.
* Add more logging when keywords are missing from import
This commit is contained in:
Magne Sjaastad
2023-02-15 07:56:17 +01:00
committed by GitHub
parent af7fe8f00e
commit 70bb221162
16 changed files with 29 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ApplicationLibCode/ProjectDataModel/WellPath/RimFileWellPath.cpp
View File

@@ -279,19 +279,6 @@ bool RimFileWellPath::isStoredInCache() const
return !id().isEmpty();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFileWellPath::updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath )
{
QString newCacheFileName = getCacheFileName();
if ( caf::Utils::fileExists( newCacheFileName ) )
{
m_filePathInCache = newCacheFileName;
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -349,3 +336,16 @@ void RimFileWellPath::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFileWellPath::initAfterRead()
{
QString newCacheFileName = getCacheFileName();
if ( caf::Utils::fileExists( newCacheFileName ) )
{
m_filePathInCache = newCacheFileName;
}
}

2
ApplicationLibCode/ProjectDataModel/WellPath/RimFileWellPath.h
View File

@@ -31,7 +31,6 @@ public:
bool readWellPathFile( QString* errorMessage, RifWellPathImporter* wellPathImporter, bool setWellNameForExport );
int wellPathIndexInFile() const; // -1 means none.
void setWellPathIndexInFile( int index );
void updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath ) override;
static QString getCacheDirectoryPath();
protected:
@@ -43,6 +42,7 @@ private:
bool isStoredInCache() const;
QString getCacheFileName();
void initAfterRead() override;
void setupBeforeSave() override;
void ensureWellPathStartAtSeaLevel( RigWellPath* wellPath );

7
ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp
View File

@@ -813,13 +813,6 @@ size_t RimWellPath::simulationWellBranchCount( const QString& simWellName )
return branches.size();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellPath::updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath )
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.h
View File

@@ -87,8 +87,6 @@ public:
bool tryAssociateWithSimulationWell();
bool isAssociatedWithSimulationWell() const;
virtual void updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath );
void setUnitSystem( RiaDefines::EclipseUnitSystem unitSystem );
RiaDefines::EclipseUnitSystem unitSystem() const;

11
ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathCollection.cpp
View File

@@ -504,17 +504,6 @@ void RimWellPathCollection::scheduleRedrawAffectedViews()
if ( proj ) proj->reloadCompletionTypeResultsInAllViews();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellPathCollection::updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath )
{
for ( auto wellPath : m_wellPaths )
{
wellPath->updateFilePathsFromProjectPath( newProjectPath, oldProjectPath );
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

1
ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathCollection.h
View File

@@ -120,7 +120,6 @@ public:
void scheduleRedrawAffectedViews();
void updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath );
bool anyWellsContainingPerforationIntervals() const;
size_t modelledWellPathCount() const;