Removed obsolete USE_ECL_LIB, as ERT is now part of the source code tree

p4#: 20253

ApplicationCode/FileInterface/FileInterface_UnitTests/Ert-Test.cpp

@@ -16,7 +16,6 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#ifdef USE_ECL_LIB
 
 
 #include <time.h>
@@ -118,4 +117,3 @@ TEST(RigReservoirTest, ElipseInputGridFile)
     EXPECT_EQ(size_t(1), res.mainGrid()->numActiveCells());
 
 }
-#endif //USE_ECL_LIB

ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp

@@ -31,11 +31,9 @@
 #include <QTextStream>
 #include <QDebug>
 
-#ifdef USE_ECL_LIB
 #include "ecl_grid.h"
 #include "well_state.h"
 #include "util.h"
-#endif 
 #include <fstream>
 
 

ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp

@@ -18,11 +18,9 @@
 
 #include "RifEclipseOutputFileTools.h"
 
-#ifdef USE_ECL_LIB
 #include "util.h"
 #include "ecl_file.h"
 #include "ecl_intehead.h"
-#endif //USE_ECL_LIB
 
 #include <QFileInfo>
 #include "cafProgressInfo.h"
@@ -32,9 +30,7 @@
 //--------------------------------------------------------------------------------------------------
 RifEclipseOutputFileTools::RifEclipseOutputFileTools()
 {
-#ifdef USE_ECL_LIB
     m_file = NULL;
-#endif //USE_ECL_LIB
 }
 
 
@@ -52,7 +48,6 @@ RifEclipseOutputFileTools::~RifEclipseOutputFileTools()
 //--------------------------------------------------------------------------------------------------
 bool RifEclipseOutputFileTools::open(const QString& fileName)
 {
-#ifdef USE_ECL_LIB
     // Close current file if any
     close();
 
@@ -60,9 +55,6 @@ bool RifEclipseOutputFileTools::open(const QString& fileName)
     if (!m_file) return false;
 
     return true;
-#else
-    return false;
-#endif //USE_ECL_LIB
 }
 
 
@@ -71,13 +63,11 @@ bool RifEclipseOutputFileTools::open(const QString& fileName)
 //--------------------------------------------------------------------------------------------------
 void RifEclipseOutputFileTools::close()
 {
-#ifdef USE_ECL_LIB
     if (m_file)
     {
         ecl_file_close(m_file);
         m_file = NULL;
     }
-#endif //USE_ECL_LIB
 }
 
 
@@ -86,12 +76,8 @@ void RifEclipseOutputFileTools::close()
 //--------------------------------------------------------------------------------------------------
 int RifEclipseOutputFileTools::numOccurrences(const QString& keyword)
 {
-#ifdef USE_ECL_LIB
     CVF_ASSERT(m_file);
     return ecl_file_get_num_named_kw(m_file, keyword.toAscii().data());
-#else
-    return 0;
-#endif //USE_ECL_LIB
 }
 
 
@@ -101,12 +87,10 @@ int RifEclipseOutputFileTools::numOccurrences(const QString& keyword)
 //--------------------------------------------------------------------------------------------------
 bool RifEclipseOutputFileTools::keywordsOnFile(QStringList* keywords, size_t numDataItems, size_t numSteps)
 {
-#ifdef USE_ECL_LIB
     CVF_ASSERT(m_file);
     CVF_ASSERT(keywords);
     keywords->clear();
 
-
     int numKeywords = ecl_file_get_num_distinct_kw(m_file);
 
     caf::ProgressInfo info(numKeywords, "Reading Keywords on file");
@@ -157,9 +141,6 @@ bool RifEclipseOutputFileTools::keywordsOnFile(QStringList* keywords, size_t num
     }
 
     return true;
-#else
-    return false;
-#endif //USE_ECL_LIB
 }
 
 
@@ -168,7 +149,6 @@ bool RifEclipseOutputFileTools::keywordsOnFile(QStringList* keywords, size_t num
 //--------------------------------------------------------------------------------------------------
 bool RifEclipseOutputFileTools::timeStepsText(QStringList* timeSteps)
 {
-#ifdef USE_ECL_LIB
     CVF_ASSERT(timeSteps);
     CVF_ASSERT(m_file);
 
@@ -205,9 +185,6 @@ bool RifEclipseOutputFileTools::timeStepsText(QStringList* timeSteps)
     *timeSteps = timeStepsFound;
 
     return true;
-#else
-    return false;
-#endif //USE_ECL_LIB
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -215,7 +192,6 @@ bool RifEclipseOutputFileTools::timeStepsText(QStringList* timeSteps)
 //--------------------------------------------------------------------------------------------------
 bool RifEclipseOutputFileTools::timeSteps(QList<QDateTime>* timeSteps)
 {
-#ifdef USE_ECL_LIB
     CVF_ASSERT(timeSteps);
     CVF_ASSERT(m_file);
 
@@ -251,9 +227,6 @@ bool RifEclipseOutputFileTools::timeSteps(QList<QDateTime>* timeSteps)
     *timeSteps = timeStepsFound;
 
     return true;
-#else
-    return false;
-#endif //USE_ECL_LIB
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -261,7 +234,6 @@ bool RifEclipseOutputFileTools::timeSteps(QList<QDateTime>* timeSteps)
 //--------------------------------------------------------------------------------------------------
 bool RifEclipseOutputFileTools::keywordData(const QString& keyword, size_t index, std::vector<double>* values)
 {
-#ifdef USE_ECL_LIB
     CVF_ASSERT(m_file);
     CVF_ASSERT(values);
 
@@ -278,16 +250,12 @@ bool RifEclipseOutputFileTools::keywordData(const QString& keyword, size_t index
     }
 
     return true;
-#else
-    return false;
-#endif //USE_ECL_LIB
 }
 
 
 //--------------------------------------------------------------------------------------------------
 /// Get first occurrence of file of given type in given list of filenames, as filename or NULL if not found
 //--------------------------------------------------------------------------------------------------
-#ifdef USE_ECL_LIB
 QString RifEclipseOutputFileTools::fileNameByType(const QStringList& fileSet, ecl_file_enum fileType)
 {
     int i;
@@ -303,13 +271,11 @@ QString RifEclipseOutputFileTools::fileNameByType(const QStringList& fileSet, ec
 
     return QString::null;
 }
-#endif //USE_ECL_LIB
 
 
 //--------------------------------------------------------------------------------------------------
 /// Get all files of file of given type in given list of filenames, as filename or NULL if not found
 //--------------------------------------------------------------------------------------------------
-#ifdef USE_ECL_LIB
 QStringList RifEclipseOutputFileTools::fileNamesByType(const QStringList& fileSet, ecl_file_enum fileType)
 {
     QStringList fileNames;
@@ -327,7 +293,6 @@ QStringList RifEclipseOutputFileTools::fileNamesByType(const QStringList& fileSe
 
     return fileNames;
 }
-#endif //USE_ECL_LIB
 
 
 //--------------------------------------------------------------------------------------------------
@@ -338,7 +303,6 @@ bool RifEclipseOutputFileTools::fileSet(const QString& fileName, QStringList* fi
     CVF_ASSERT(fileSet);
     fileSet->clear();
 
-#ifdef USE_ECL_LIB
     QString filePath = QFileInfo(fileName).absoluteFilePath();
     filePath = QFileInfo(filePath).path();
     QString fileNameBase = QFileInfo(fileName).baseName();
@@ -353,7 +317,6 @@ bool RifEclipseOutputFileTools::fileSet(const QString& fileName, QStringList* fi
     }
 
     stringlist_free(eclipseFiles);
-#endif //USE_ECL_LIB
 
     return fileSet->count() > 0;
 }
@@ -361,9 +324,7 @@ bool RifEclipseOutputFileTools::fileSet(const QString& fileName, QStringList* fi
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-#ifdef USE_ECL_LIB
 ecl_file_type* RifEclipseOutputFileTools::filePointer()
 {
     return m_file;
 }
-#endif //USE_ECL_LIB

ApplicationCode/FileInterface/RifEclipseOutputFileTools.h

@@ -26,9 +26,7 @@
 #include <QStringList>
 #include <QDateTime>
 
-#ifdef USE_ECL_LIB
 #include "ecl_file.h"
-#endif //USE_ECL_LIB
 
 //==================================================================================================
 //
@@ -52,20 +50,14 @@ public:
 
     bool                keywordData(const QString& keyword, size_t index, std::vector<double>* values);
 
-#ifdef USE_ECL_LIB
     ecl_file_type*      filePointer();
-#endif //USE_ECL_LIB
 
     // Static methods
     static bool         fileSet(const QString& fileName, QStringList* fileSet);
 
-#ifdef USE_ECL_LIB
     static QString      fileNameByType(const QStringList& fileSet, ecl_file_enum fileType);
     static QStringList  fileNamesByType(const QStringList& fileSet, ecl_file_enum fileType);
-#endif //USE_ECL_LIB
 
 protected:
-#ifdef USE_ECL_LIB
     ecl_file_type*      m_file;
-#endif //USE_ECL_LIB
 };

ApplicationCode/FileInterface/RifEclipseRestartDataAccess.h

@@ -27,9 +27,7 @@
 
 #include <vector>
 
-#ifdef USE_ECL_LIB
 #include "well_info.h"
-#endif // USE_ECL_LIB
 
 //==================================================================================================
 //
@@ -52,10 +50,7 @@ public:
     virtual QStringList         resultNames() = 0;
     virtual bool                results(const QString& resultName, size_t timeStep, std::vector<double>* values) = 0;
 
-
-#ifdef USE_ECL_LIB
     virtual void                readWellData(well_info_type * well_info) = 0;
-#endif
 
 protected:
     size_t                      m_numGrids;

ApplicationCode/FileInterface/RifEclipseRestartFilesetAccess.cpp

@@ -171,7 +171,6 @@ bool RifEclipseRestartFilesetAccess::results(const QString& resultName, size_t t
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-#ifdef USE_ECL_LIB
 void RifEclipseRestartFilesetAccess::readWellData(well_info_type* well_info)
 {
     if (!well_info) return;
@@ -186,4 +185,3 @@ void RifEclipseRestartFilesetAccess::readWellData(well_info_type* well_info)
         }
     }
 }
-#endif

ApplicationCode/FileInterface/RifEclipseRestartFilesetAccess.h

@@ -45,9 +45,7 @@ public:
     QStringList                 resultNames();
     bool                        results(const QString& resultName, size_t timeStep, std::vector<double>* values);
 
-#ifdef USE_ECL_LIB
     virtual void                readWellData(well_info_type* well_info);
-#endif //USE_ECL_LIB
 
 private:
     std::vector< cvf::ref<RifEclipseOutputFileTools> > m_files;

ApplicationCode/FileInterface/RifEclipseUnifiedRestartFileAccess.cpp

@@ -19,12 +19,10 @@
 #include "RifEclipseUnifiedRestartFileAccess.h"
 #include "RifEclipseOutputFileTools.h"
 
-#ifdef USE_ECL_LIB
 #include <well_state.h>
 #include <well_info.h>
 #include <well_conn.h>
 #include <well_ts.h>
-#endif
 
 //--------------------------------------------------------------------------------------------------
 /// Constructor
@@ -47,7 +45,6 @@ RifEclipseUnifiedRestartFileAccess::~RifEclipseUnifiedRestartFileAccess()
 //--------------------------------------------------------------------------------------------------
 bool RifEclipseUnifiedRestartFileAccess::open(const QStringList& fileSet)
 {
-#ifdef USE_ECL_LIB
     QString fileName = fileSet[0];
 
     cvf::ref<RifEclipseOutputFileTools> fileAccess = new RifEclipseOutputFileTools;
@@ -59,9 +56,6 @@ bool RifEclipseUnifiedRestartFileAccess::open(const QStringList& fileSet)
     m_file = fileAccess;
 
     return true;
-#else
-    return false;
-#endif
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -153,12 +147,10 @@ bool RifEclipseUnifiedRestartFileAccess::results(const QString& resultName, size
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-#ifdef USE_ECL_LIB
 void RifEclipseUnifiedRestartFileAccess::readWellData(well_info_type* well_info)
 {
     if (!well_info) return;
 
     well_info_add_UNRST_wells(well_info, m_file->filePointer());
 }
-#endif
 

ApplicationCode/FileInterface/RifEclipseUnifiedRestartFileAccess.h

@@ -22,9 +22,7 @@
 
 class RifEclipseOutputFileTools;
 
-#ifdef USE_ECL_LIB
 #include "well_info.h"
-#endif // USE_ECL_LIB
 
 //==================================================================================================
 //
@@ -47,9 +45,7 @@ public:
     QStringList                 resultNames();
     bool                        results(const QString& resultName, size_t timeStep, std::vector<double>* values);
 
-#ifdef USE_ECL_LIB
     virtual void                readWellData(well_info_type * well_info);
-#endif
 
 private:
     cvf::ref<RifEclipseOutputFileTools> m_file;

ApplicationCode/FileInterface/RifReaderEclipseInput.cpp

@@ -30,10 +30,8 @@
 #include <iostream>
 #include <cmath>
 
-#ifdef USE_ECL_LIB
 #include "ecl_grid.h"
 #include "well_state.h"
-#endif //USE_ECL_LIB
 #include "util.h"
 
 //==================================================================================================

ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp

@@ -29,10 +29,8 @@
 
 #include <iostream>
 
-#ifdef USE_ECL_LIB
 #include "ecl_grid.h"
 #include "well_state.h"
-#endif //USE_ECL_LIB
 #include "cafProgressInfo.h"
 
 //--------------------------------------------------------------------------------------------------
@@ -85,7 +83,6 @@ static const size_t cellMappingECLRi[8] = { 0, 1, 3, 2, 4, 5, 7, 6 };
 // Static functions
 //**************************************************************************************************
 
-#ifdef USE_ECL_LIB
 bool transferGridCellData(RigMainGrid* mainGrid, RigGridBase* localGrid, const ecl_grid_type* localEclGrid, size_t activeStartIndex)
 {
     int cellCount = ecl_grid_get_global_size(localEclGrid);
@@ -155,7 +152,6 @@ bool transferGridCellData(RigMainGrid* mainGrid, RigGridBase* localGrid, const e
     }
     return true;
 }
-#endif
 
 //==================================================================================================
 //
@@ -208,8 +204,6 @@ bool RifReaderEclipseOutput::transferGeometry(const ecl_grid_type* mainEclGrid,
 {
     CVF_ASSERT(reservoir);
 
-#ifdef USE_ECL_LIB
-    
     if (!mainEclGrid)
     {
         // Some error
@@ -276,10 +270,7 @@ bool RifReaderEclipseOutput::transferGeometry(const ecl_grid_type* mainEclGrid,
         progInfo.setProgress(3 + lgrIdx);
     }
 
-#endif
-
     return true;
-
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -304,7 +295,6 @@ bool RifReaderEclipseOutput::open(const QString& fileName, RigReservoir* reservo
     m_fileSet = fileSet;
 
     // Read geometry
-#ifdef USE_ECL_LIB
     ecl_grid_type * mainEclGrid = ecl_grid_alloc( fileName.toAscii().data() );
 
     progInfo.setProgress(1);
@@ -319,8 +309,6 @@ bool RifReaderEclipseOutput::open(const QString& fileName, RigReservoir* reservo
     progInfo.setProgress(8);
     progInfo.setProgressDescription("Reading Result index");
 
-#endif
-
     // Build results meta data
     if (!buildMetaData(reservoir)) return false;
 
@@ -337,7 +325,6 @@ bool RifReaderEclipseOutput::open(const QString& fileName, RigReservoir* reservo
 //--------------------------------------------------------------------------------------------------
 bool RifReaderEclipseOutput::buildMetaData(RigReservoir* reservoir)
 {
-#ifdef USE_ECL_LIB
     CVF_ASSERT(reservoir);
     CVF_ASSERT(m_fileSet.size() > 0);
 
@@ -400,9 +387,6 @@ bool RifReaderEclipseOutput::buildMetaData(RigReservoir* reservoir)
     }
 
     return true;
-#else
-    return false;
-#endif //USE_ECL_LIB
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -412,7 +396,6 @@ RifEclipseRestartDataAccess* RifReaderEclipseOutput::dynamicResultsAccess(const
 {
     RifEclipseRestartDataAccess* resultsAccess = NULL;
 
-#ifdef USE_ECL_LIB
     // Look for unified restart file
     QString unrstFileName = RifEclipseOutputFileTools::fileNameByType(fileSet, ECL_UNIFIED_RESTART_FILE);
     if (unrstFileName.size() > 0)
@@ -438,7 +421,6 @@ RifEclipseRestartDataAccess* RifReaderEclipseOutput::dynamicResultsAccess(const
             }
         }
     }
-#endif //USE_ECL_LIB
 
     // !! could add support for formatted result files
     // !! consider priorities in case multiple types exist (.UNRST, .XNNNN, ...)
@@ -492,7 +474,6 @@ void RifReaderEclipseOutput::readWellCells(RigReservoir* reservoir)
 
     if (m_dynamicResultsAccess.isNull()) return;
 
-#ifdef USE_ECL_LIB
     well_info_type* ert_well_info = well_info_alloc(NULL);
     if (!ert_well_info) return;
 
@@ -643,8 +624,5 @@ void RifReaderEclipseOutput::readWellCells(RigReservoir* reservoir)
     well_info_free(ert_well_info);
 
     reservoir->setWellResults(wells);
-
-
-#endif
 }
 

ApplicationCode/FileInterface/RifReaderEclipseOutput.h

@@ -46,9 +46,7 @@ public:
     bool                    staticResult(const QString& result, std::vector<double>* values);
     bool                    dynamicResult(const QString& result, size_t stepIndex, std::vector<double>* values);
 
-#ifdef USE_ECL_LIB
     static bool             transferGeometry(const ecl_grid_type* mainEclGrid, RigReservoir* reservoir);
-#endif
 
 private:
     void                    ground();

ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests/CMakeLists.txt

@@ -60,7 +60,7 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     )
 
         # Linux specific code
-        set(CMAKE_CXX_FLAGS 		"-DCVF_LINUX -DUSE_ECL_LIB -pipe -Wextra -Woverloaded-virtual -Wformat")
+        set(CMAKE_CXX_FLAGS 		"-DCVF_LINUX -pipe -Wextra -Woverloaded-virtual -Wformat")
         set(CMAKE_CXX_FLAGS_DEBUG 	"-g -DDEBUG -D_DEBUG")
         set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNO_DEBUG")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ")

ApplicationCode/UserInterface/RIMainWindow.cpp

@@ -94,11 +94,6 @@ RIMainWindow::RIMainWindow()
     slotRefreshFileActions();
     slotRefreshEditActions();
 
-#ifndef USE_ECL_LIB
-    // Always load mock model on Windows
-    //slotMockModel();
-#endif
-
     // Set pdm root so scripts are displayed
     setPdmRoot(RIApplication::instance()->project());
 }
@@ -597,18 +592,11 @@ void RIMainWindow::slotOpenBinaryGridFiles()
     {
         RIApplication* app = RIApplication::instance();
 
-#ifdef USE_ECL_LIB
-
         QString defaultDir = app->defaultFileDialogDirectory("BINARY_GRID");
         QStringList fileNames = QFileDialog::getOpenFileNames(this, "Open Eclipse File", defaultDir, "Eclipse Grid Files (*.GRID *.EGRID)");
         if (fileNames.size()) defaultDir = QFileInfo(fileNames.last()).absolutePath();
         app->setDefaultFileDialogDirectory("BINARY_GRID", defaultDir);
 
-#else
-        QStringList fileNames;
-        fileNames << "dummy";
-#endif
-
         int i;
         for (i = 0; i < fileNames.size(); i++)
         {

CMakeLists.txt

@@ -17,14 +17,14 @@ endif()
 
 IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
         # Linux specific code
-        set(CMAKE_CXX_FLAGS 		"-DCVF_LINUX -DUSE_ECL_LIB -pipe -Wextra -Woverloaded-virtual -Wformat")
+        set(CMAKE_CXX_FLAGS 		"-DCVF_LINUX -pipe -Wextra -Woverloaded-virtual -Wformat")
         set(CMAKE_CXX_FLAGS_DEBUG 	"-ggdb -g3 -O0 -DDEBUG -D_DEBUG")
         set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNO_DEBUG")
         #set(CMAKE_EXE_LINKER_FLAGS  "-Xlinker -rpath .")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
 #        set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -g1")
 ELSE()
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /openmp -DUSE_ECL_LIB")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /openmp")
 ENDIF()