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

OpenVDS should always be used (#10166)

Browse Source 
* OpenVDS should always be used, remove optional defines
This commit is contained in:
jonjenssen
2023-04-24 18:23:31 +02:00
committed by GitHub
parent 90ccf447fb
commit d8def3d986
6 changed files with 36 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationLibCode/CMakeLists.txt
View File

@@ -258,17 +258,7 @@ list(APPEND RI_LIBRARIES RigGeoMechDataModel)
#
# OpenVDS
#
if(RESINSIGHT_USE_OPENVDS_API)
set(OPENVDS_FILES FileInterface/RifOpenVDSReader.h
FileInterface/RifOpenVDSReader.cpp
)
list(APPEND CPP_SOURCES ${OPENVDS_FILES})
add_definitions(-DUSE_OPENVDS)
include_directories(${RESINSIGHT_OPENVDS_API_DIR}/include)
endif()
include_directories(${RESINSIGHT_OPENVDS_API_DIR}/include)
#
# HDF5

7
ApplicationLibCode/Commands/SeismicCommands/RicImportSeismicFeature.cpp
View File

@@ -49,12 +49,7 @@ bool RicImportSeismicFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicImportSeismicFeature::onActionTriggered( bool isChecked )
{
#ifdef USE_OPENVDS
QString filter = "Seismic files (*.zgy *.vds);;All Files (*.*)";
#else
QString filter = "Seismic files (*.zgy);;All Files (*.*)";
#endif
QString filter = "Seismic files (*.zgy *.vds);;All Files (*.*)";
RiaApplication* app = RiaApplication::instance();
QString defaultDir = app->lastUsedDialogDirectory( "SEISMIC_GRID" );
QString fileName = RiuFileDialogTools::getOpenFileName( Riu3DMainWindowTools::mainWindowWidget(), "Import Seismic", defaultDir, filter );

2
ApplicationLibCode/FileInterface/CMakeLists_files.cmake
View File

@@ -79,6 +79,7 @@ set(SOURCE_GROUP_HEADER_FILES
${CMAKE_CURRENT_LIST_DIR}/RifReaderPressureDepthData.h
${CMAKE_CURRENT_LIST_DIR}/RifSeismicReader.h
${CMAKE_CURRENT_LIST_DIR}/RifSeismicZGYReader.h
${CMAKE_CURRENT_LIST_DIR}/RifOpenVDSReader.h
${CMAKE_CURRENT_LIST_DIR}/RifOpmGridTools.h
${CMAKE_CURRENT_LIST_DIR}/RifCsvSummaryReader.h
${CMAKE_CURRENT_LIST_DIR}/RifRevealSummaryCsvReader.h
@@ -164,6 +165,7 @@ set(SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RifReaderPressureDepthData.cpp
${CMAKE_CURRENT_LIST_DIR}/RifSeismicReader.cpp
${CMAKE_CURRENT_LIST_DIR}/RifSeismicZGYReader.cpp
${CMAKE_CURRENT_LIST_DIR}/RifOpenVDSReader.cpp
${CMAKE_CURRENT_LIST_DIR}/RifOpmGridTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RifCsvSummaryReader.cpp
${CMAKE_CURRENT_LIST_DIR}/RifRevealCsvSummaryReader.cpp

7
ApplicationLibCode/ProjectDataModel/Seismic/RimSeismicData.cpp
View File

@@ -20,11 +20,8 @@
#include "RiaLogging.h"
#include "RifSeismicZGYReader.h"
#ifdef USE_OPENVDS
#include "RifOpenVDSReader.h"
#endif
#include "RifSeismicZGYReader.h"
#include "RimRegularLegendConfig.h"
#include "RimSeismicAlphaMapper.h"
@@ -118,12 +115,10 @@ bool RimSeismicData::openFileIfNotOpen()
{
m_filereader = std::make_shared<RifSeismicZGYReader>();
}
#ifdef USE_OPENVDS
else if ( fi.suffix().toLower() == "vds" )
{
m_filereader = std::make_shared<RifOpenVDSReader>();
}
#endif
else
{
m_filereader.reset();