OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-27 23:50:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Release 2025.09.0

Browse Source
This commit is contained in:
Magne Sjaastad authored and GitHub committed 2025-09-01 12:38:48 +02:00
1 parent c33402f5ea
commit 917136fec8
1053 files changed
+61952 -11833
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/ProjectDataModelCommands/CommandRouter/RimCommandRouter.cpp
+1 -25
View File
@@ -45,30 +45,6 @@ RimCommandRouter::RimCommandRouter()
///
//--------------------------------------------------------------------------------------------------
RimCommandRouterMethod::RimCommandRouterMethod( PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmObjectMethod( self, PdmObjectMethod::NullPointerType::NULL_IS_VALID, PdmObjectMethod::ResultType::PERSISTENT_FALSE )
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimCommandRouterMethod::isNullptrValidResult() const
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimCommandRouterMethod::resultIsPersistent() const
{
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimCommandRouterMethod::defaultResult() const
{
return nullptr;
}
ApplicationLibCode/ProjectDataModelCommands/CommandRouter/RimCommandRouter.h
-4
View File
@@ -29,10 +29,6 @@ class RimCommandRouterMethod : public caf::PdmObjectMethod
{
public:
RimCommandRouterMethod( PdmObjectHandle* self );
bool isNullptrValidResult() const override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
};
//==================================================================================================
ApplicationLibCode/ProjectDataModelCommands/CommandRouter/RimcExtractSurfaces.cpp
+17 -19
View File
@@ -31,15 +31,13 @@
#include <QDir>
#include <QFileInfo>
#include <memory>
CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimCommandRouter, RimcCommandRouter_extractSurfaces, "ExtractSurfaces" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimcCommandRouter_extractSurfaces::RimcCommandRouter_extractSurfaces( caf::PdmObjectHandle* self )
: RimCommandRouterMethod( self )
: caf::PdmVoidObjectMethod( self )
{
CAF_PDM_InitObject( "Extract Layer Surface", "", "", "Extract Layer Surface" );
@@ -54,21 +52,24 @@ RimcCommandRouter_extractSurfaces::RimcCommandRouter_extractSurfaces( caf::PdmOb
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmObjectHandle* RimcCommandRouter_extractSurfaces::execute()
std::expected<caf::PdmObjectHandle*, QString> RimcCommandRouter_extractSurfaces::execute()
{
extractSurfaces( m_gridModelFilename, m_layers(), m_minimumI(), m_maximumI(), m_minimumJ(), m_maximumJ() );
return nullptr;
auto result = extractSurfaces( m_gridModelFilename, m_layers(), m_minimumI(), m_maximumI(), m_minimumJ(), m_maximumJ() );
if ( result.has_value() )
return nullptr;
else
return std::unexpected( result.error() );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::pair<bool, QStringList> RimcCommandRouter_extractSurfaces::extractSurfaces( const QString& gridModelFilename,
const std::vector<int>& layers,
int minI,
int maxI,
int minJ,
int maxJ )
std::expected<QStringList, QString> RimcCommandRouter_extractSurfaces::extractSurfaces( const QString& gridModelFilename,
const std::vector<int>& layers,
int minI,
int maxI,
int minJ,
int maxJ )
{
QStringList surfaceFileNames;
@@ -132,8 +133,7 @@ std::pair<bool, QStringList> RimcCommandRouter_extractSurfaces::extractSurfaces(
{
if ( !fi.absoluteDir().mkpath( surfaceExportDirName ) )
{
RiaLogging::error( "Unable to create directory for surface export: " + fi.absoluteDir().absolutePath() );
return std::make_pair( false, surfaceFileNames );
return std::unexpected( "Unable to create directory for surface export: " + fi.absoluteDir().absolutePath() );
}
}
@@ -143,8 +143,7 @@ std::pair<bool, QStringList> RimcCommandRouter_extractSurfaces::extractSurfaces(
// TODO: Add more info in surface comment
if ( !RifSurfaceExporter::writeGocadTSurfFile( surfaceFilename, "Surface comment", vertices, triangleIndices ) )
{
RiaLogging::error( "Failed to export surface data to " + surfaceFilename );
return std::make_pair( false, surfaceFileNames );
return std::unexpected( "Failed to export surface data to " + surfaceFilename );
}
else
{
@@ -153,12 +152,11 @@ std::pair<bool, QStringList> RimcCommandRouter_extractSurfaces::extractSurfaces(
}
}
return std::make_pair( true, surfaceFileNames );
return surfaceFileNames;
}
catch ( ... )
{
RiaLogging::error( "Error during creation of surface data for model " + gridModelFilename );
return std::make_pair( false, surfaceFileNames );
return std::unexpected( "Error during creation of surface data for model " + gridModelFilename );
}
}
ApplicationLibCode/ProjectDataModelCommands/CommandRouter/RimcExtractSurfaces.h
+10 -12
View File
@@ -22,32 +22,30 @@
#include "cafPdmField.h"
#include "cvfVector3.h"
#include <QString>
#include <QStringList>
#include <memory>
#include <expected>
//==================================================================================================
///
//==================================================================================================
class RimcCommandRouter_extractSurfaces : public RimCommandRouterMethod
class RimcCommandRouter_extractSurfaces : public caf::PdmVoidObjectMethod
{
CAF_PDM_HEADER_INIT;
public:
RimcCommandRouter_extractSurfaces( caf::PdmObjectHandle* self );
caf::PdmObjectHandle* execute() override;
std::expected<caf::PdmObjectHandle*, QString> execute() override;
static bool readMinMaxLayerFromGridFile( const QString& gridFileName, int& minK, int& maxK );
static std::pair<bool, QStringList> extractSurfaces( const QString& gridModelFileName,
const std::vector<int>& layers,
int minI = -1,
int maxI = -1,
int minJ = -1,
int maxJ = -1 );
static bool readMinMaxLayerFromGridFile( const QString& gridFileName, int& minK, int& maxK );
static std::expected<QStringList, QString> extractSurfaces( const QString& gridModelFileName,
const std::vector<int>& layers,
int minI = -1,
int maxI = -1,
int minJ = -1,
int maxJ = -1 );
private:
caf::PdmField<QString> m_gridModelFilename;