diff --git a/ApplicationLibCode/FileInterface/RifEclipseInputFileTools.cpp b/ApplicationLibCode/FileInterface/RifEclipseInputFileTools.cpp index ccd82e8e89..e61adfb5f7 100644 --- a/ApplicationLibCode/FileInterface/RifEclipseInputFileTools.cpp +++ b/ApplicationLibCode/FileInterface/RifEclipseInputFileTools.cpp @@ -199,6 +199,13 @@ bool RifEclipseInputFileTools::openGridFile( const QString& fileName, return true; } + QString txt = "Missing required keywords :"; + if ( !specGridKw ) txt += " SPECGRID"; + if ( !zCornKw ) txt += " ZCORN"; + if ( !coordKw ) txt += " COORD"; + + RiaLogging::error( txt ); + return false; } diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp index 4854c69c94..14d0956c10 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp @@ -277,17 +277,7 @@ void RimFractureTemplateCollection::loadAndUpdateData() { stimPlanFracture->loadDataAndUpdate(); } - } -} -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimFractureTemplateCollection::updateFilePathsFromProjectPath( const QString& newProjectPath, - const QString& oldProjectPath ) -{ - for ( RimFractureTemplate* f : m_fractureDefinitions() ) - { RimEllipseFractureTemplate* ellipseFracture = dynamic_cast( f ); if ( ellipseFracture ) { diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.h b/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.h index 21df3d9238..ab0f4507ba 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.h +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.h @@ -60,8 +60,6 @@ public: void createAndAssignTemplateCopyForNonMatchingUnit(); void loadAndUpdateData(); - void updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath ); - void onChildDeleted( caf::PdmChildArrayFieldHandle* childArray, std::vector& referringObjects ) override; diff --git a/ApplicationLibCode/ProjectDataModel/RimFormationNames.cpp b/ApplicationLibCode/ProjectDataModel/RimFormationNames.cpp index 27ed52ecfb..4ce0eb7e4b 100644 --- a/ApplicationLibCode/ProjectDataModel/RimFormationNames.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimFormationNames.cpp @@ -150,15 +150,6 @@ void RimFormationNames::readFormationNamesFile( QString* errorMessage ) m_formationNamesData = RifColorLegendData::readFormationNamesFile( m_formationNamesFileName().path(), errorMessage ); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimFormationNames::updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath ) -{ - // m_formationNamesFileName = - // RimTools::relocateFile( m_formationNamesFileName(), newProjectPath, oldProjectPath, nullptr, nullptr ); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimFormationNames.h b/ApplicationLibCode/ProjectDataModel/RimFormationNames.h index 4b436680a0..881c7e2688 100644 --- a/ApplicationLibCode/ProjectDataModel/RimFormationNames.h +++ b/ApplicationLibCode/ProjectDataModel/RimFormationNames.h @@ -44,7 +44,6 @@ public: void updateConnectedViews(); void readFormationNamesFile( QString* errorMessage ); - void updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath ); static QString layerZoneTableFileName(); diff --git a/ApplicationLibCode/ProjectDataModel/RimFormationNamesCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimFormationNamesCollection.cpp index 166be30358..74337475ae 100644 --- a/ApplicationLibCode/ProjectDataModel/RimFormationNamesCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimFormationNamesCollection.cpp @@ -112,18 +112,6 @@ std::vector RimFormationNamesCollection::importFiles( const return m_formationNamesList.children(); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimFormationNamesCollection::updateFilePathsFromProjectPath( const QString& newProjectPath, - const QString& oldProjectPath ) -{ - for ( RimFormationNames* fmNames : m_formationNamesList ) - { - fmNames->updateFilePathsFromProjectPath( newProjectPath, oldProjectPath ); - } -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimFormationNamesCollection.h b/ApplicationLibCode/ProjectDataModel/RimFormationNamesCollection.h index 29f5c21e69..dd168200d6 100644 --- a/ApplicationLibCode/ProjectDataModel/RimFormationNamesCollection.h +++ b/ApplicationLibCode/ProjectDataModel/RimFormationNamesCollection.h @@ -39,8 +39,6 @@ public: std::vector importFiles( const QStringList& fileNames ); - void updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath ); - void onChildDeleted( caf::PdmChildArrayFieldHandle* childArray, std::vector& referringObjects ) override; diff --git a/ApplicationLibCode/ProjectDataModel/RimProject.cpp b/ApplicationLibCode/ProjectDataModel/RimProject.cpp index 45b56912a7..a467fcdb42 100644 --- a/ApplicationLibCode/ProjectDataModel/RimProject.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimProject.cpp @@ -473,38 +473,18 @@ void RimProject::setProjectFileNameAndUpdateDependencies( const QString& project bool foundFile = false; std::vector searchedPaths; + QString filePathCandidate = filePath->path(); + if ( filePathCandidate.startsWith( '.' ) ) + { + filePathCandidate = filePathCandidate.right( filePathCandidate.size() - 1 ); + filePathCandidate = newProjectPath + filePathCandidate; + } + QString newFilePath = - RimTools::relocateFile( filePath->path(), newProjectPath, oldProjectPath, &foundFile, &searchedPaths ); + RimTools::relocateFile( filePathCandidate, newProjectPath, oldProjectPath, &foundFile, &searchedPaths ); filePath->setPath( newFilePath ); } - // Update path to well path file cache - for ( RimOilField* oilField : oilFields ) - { - if ( oilField == nullptr ) continue; - if ( oilField->wellPathCollection() != nullptr ) - { - oilField->wellPathCollection()->updateFilePathsFromProjectPath( newProjectPath, oldProjectPath ); - } - if ( oilField->formationNamesCollection() != nullptr ) - { - oilField->formationNamesCollection()->updateFilePathsFromProjectPath( newProjectPath, oldProjectPath ); - } - - CVF_ASSERT( oilField->fractureDefinitionCollection() ); - oilField->fractureDefinitionCollection()->updateFilePathsFromProjectPath( newProjectPath, oldProjectPath ); - } - - { - std::vector rimWellLogFiles; - this->descendantsIncludingThisOfType( rimWellLogFiles ); - - for ( auto rimWellLogFile : rimWellLogFiles ) - { - rimWellLogFile->updateFilePathsFromProjectPath( newProjectPath, oldProjectPath ); - } - } - wellPathImport->updateFilePaths(); } diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFile.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFile.cpp index 498c409ee2..fbecf3f44e 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFile.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFile.cpp @@ -232,22 +232,6 @@ bool RimWellLogFile::hasFlowData() const return RimWellPlotTools::hasFlowData( this ); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimWellLogFile::updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath ) -{ - // bool foundFile = false; - // std::vector searchedPaths; - // - // QString fileNameCandidate = - // RimTools::relocateFile( m_fileName(), newProjectPath, oldProjectPath, &foundFile, &searchedPaths ); - // if ( foundFile ) - // { - // m_fileName = fileNameCandidate; - // } -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFile.h b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFile.h index f703dc782c..d809a47122 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFile.h +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFile.h @@ -70,8 +70,6 @@ public: RimWellLogFile::WellFlowCondition wellFlowRateCondition() const { return m_wellFlowCondition(); } - void updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath ); - static std::vector> findMdAndChannelValuesForWellPath( const RimWellPath* wellPath, const QString& channelName, QString* unitString = nullptr ); diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimFileWellPath.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimFileWellPath.cpp index 6bec69abbb..bad3efee91 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimFileWellPath.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimFileWellPath.cpp @@ -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; + } +} diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimFileWellPath.h b/ApplicationLibCode/ProjectDataModel/WellPath/RimFileWellPath.h index 6beb4fc57e..1da6d988f6 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimFileWellPath.h +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimFileWellPath.h @@ -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 ); diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp index ce4a2399ad..a78da3624c 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp @@ -813,13 +813,6 @@ size_t RimWellPath::simulationWellBranchCount( const QString& simWellName ) return branches.size(); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimWellPath::updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath ) -{ -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.h b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.h index ca007ddf82..7317cb537f 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.h +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.h @@ -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; diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathCollection.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathCollection.cpp index bbf79d8702..fbdd0379af 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathCollection.cpp @@ -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 ); - } -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathCollection.h b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathCollection.h index 6e4a429594..88ccbc9ea7 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathCollection.h +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathCollection.h @@ -120,7 +120,6 @@ public: void scheduleRedrawAffectedViews(); - void updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath ); bool anyWellsContainingPerforationIntervals() const; size_t modelledWellPathCount() const;