mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-24 22:27:55 -05:00
Refactor: move simulation file/input code to separate class.
This commit is contained in:
1 parent
3a8d521bc2
commit
c47e8ac76f
10 files changed
+1399
-1091
No files matched your search
@@ -89,6 +89,7 @@ list(
|
||||
ReservoirDataModel/CMakeLists_files.cmake
|
||||
ReservoirDataModel/CMakeLists_filesNotToUnitTest.cmake
|
||||
ReservoirDataModel/Completions/CMakeLists_files.cmake
|
||||
ReservoirDataModel/SimulationFile/CMakeLists_files.cmake
|
||||
ReservoirDataModel/CompletionsMsw/CMakeLists_files.cmake
|
||||
ReservoirDataModel/ContourMap/CMakeLists_files.cmake
|
||||
ReservoirDataModel/ResultAccessors/CMakeLists_files.cmake
|
||||
@@ -391,6 +392,7 @@ target_include_directories(
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/ReservoirDataModel/Completions
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/ReservoirDataModel/ResultAccessors
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/ReservoirDataModel/ResultCalculators
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/ReservoirDataModel/SimulationFile
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/ResultStatisticsCache
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/SocketInterface
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/UserInterface
|
||||
|
||||
+25
-1026
File diff suppressed because it is too large.
Load diff
@@ -52,9 +52,6 @@ public:
|
||||
|
||||
static std::pair<caf::VecIjk0, caf::VecIjk0> getVisibleCellRange( RimEclipseView* view, const cvf::UByteArray& cellVisibility );
|
||||
|
||||
static std::expected<Opm::DeckRecord, QString>
|
||||
processEqualsRecord( const Opm::DeckRecord& record, const caf::VecIjk0& min, const caf::VecIjk0& max, const cvf::Vec3st& refinement );
|
||||
|
||||
protected:
|
||||
bool isCommandEnabled() const override;
|
||||
void onActionTriggered( bool isChecked ) override;
|
||||
@@ -64,52 +61,7 @@ private:
|
||||
RimEclipseView* selectedView() const;
|
||||
static cvf::ref<cvf::UByteArray> createVisibilityBasedOnBoxSelection( RimEclipseView* view,
|
||||
const RicExportEclipseSectorModelUi& exportSettings );
|
||||
static std::expected<void, QString>
|
||||
exportSimulationInput( RimEclipseView& view, RimEclipseCase& eclipseCase, const RicExportEclipseSectorModelUi& exportSettings );
|
||||
static void exportGrid( RimEclipseView* view, const RicExportEclipseSectorModelUi& exportSettings );
|
||||
static void exportFaults( RimEclipseView* view, const RicExportEclipseSectorModelUi& exportSettings );
|
||||
static void exportParameters( RimEclipseView* view, const RicExportEclipseSectorModelUi& exportSettings );
|
||||
|
||||
static std::expected<void, QString>
|
||||
addFaultsToDeckFile( RimEclipseCase* eclipseCase, const RicExportEclipseSectorModelUi& exportSettings, RifOpmFlowDeckFile& deckFile );
|
||||
|
||||
static std::expected<void, QString> addBorderBoundaryConditions( RimEclipseCase* eclipseCase,
|
||||
const RicExportEclipseSectorModelUi& exportSettings,
|
||||
RifOpmFlowDeckFile& deckFile );
|
||||
|
||||
static std::expected<void, QString> replaceKeywordValuesInDeckFile( RimEclipseCase* eclipseCase,
|
||||
const RicExportEclipseSectorModelUi& exportSettings,
|
||||
RifOpmFlowDeckFile& deckFile );
|
||||
|
||||
static std::expected<void, QString> updateCornerPointGridInDeckFile( RimEclipseCase* eclipseCase,
|
||||
const RicExportEclipseSectorModelUi& exportSettings,
|
||||
RifOpmFlowDeckFile& deckFile );
|
||||
|
||||
static std::expected<void, QString> filterAndUpdateWellKeywords( RimEclipseCase* eclipseCase,
|
||||
const RicExportEclipseSectorModelUi& exportSettings,
|
||||
RifOpmFlowDeckFile& deckFile );
|
||||
|
||||
static std::expected<void, QString> addOperNumRegionAndOperater( RimEclipseCase* eclipseCase,
|
||||
const RicExportEclipseSectorModelUi& exportSettings,
|
||||
RifOpmFlowDeckFile& deckFile,
|
||||
int operNumRegion );
|
||||
|
||||
static std::expected<void, QString> replaceEqualsKeywordIndices( RimEclipseCase* eclipseCase,
|
||||
const RicExportEclipseSectorModelUi& exportSettings,
|
||||
RifOpmFlowDeckFile& deckFile );
|
||||
|
||||
static std::vector<RigSimWellData*> findIntersectingWells( RimEclipseCase* eclipseCase, const cvf::Vec3st& min, const cvf::Vec3st& max );
|
||||
|
||||
static std::expected<Opm::DeckRecord, QString> processWelspecsRecord( const Opm::DeckRecord& record,
|
||||
const std::string& wellName,
|
||||
const RicExportEclipseSectorModelUi& exportSettings );
|
||||
|
||||
static std::expected<Opm::DeckRecord, QString> processCompdatRecord( const Opm::DeckRecord& record,
|
||||
const std::string& wellName,
|
||||
const RicExportEclipseSectorModelUi& exportSettings );
|
||||
|
||||
static std::expected<Opm::DeckRecord, QString> processCompsegsRecord( const Opm::DeckRecord& record,
|
||||
const std::string& wellName,
|
||||
bool isWellNameRecord,
|
||||
const RicExportEclipseSectorModelUi& exportSettings );
|
||||
static void exportGrid( RimEclipseView* view, const RicExportEclipseSectorModelUi& exportSettings );
|
||||
static void exportFaults( RimEclipseView* view, const RicExportEclipseSectorModelUi& exportSettings );
|
||||
static void exportParameters( RimEclipseView* view, const RicExportEclipseSectorModelUi& exportSettings );
|
||||
};
|
||||
@@ -0,0 +1,12 @@
|
||||
set(SOURCE_GROUP_HEADER_FILES
|
||||
${CMAKE_CURRENT_LIST_DIR}/RigSimulationInputSettings.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RigSimulationInputTool.h
|
||||
)
|
||||
|
||||
set(SOURCE_GROUP_SOURCE_FILES
|
||||
${CMAKE_CURRENT_LIST_DIR}/RigSimulationInputSettings.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RigSimulationInputTool.cpp
|
||||
)
|
||||
|
||||
list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
|
||||
list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
|
||||
@@ -0,0 +1,144 @@
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2025- Equinor ASA
|
||||
//
|
||||
// ResInsight is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
// FITNESS FOR A PARTICULAR PURPOSE.
|
||||
//
|
||||
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
|
||||
// for more details.
|
||||
//
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "RigSimulationInputSettings.h"
|
||||
|
||||
#include "opm/input/eclipse/Deck/DeckRecord.hpp"
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RigSimulationInputSettings::RigSimulationInputSettings()
|
||||
: m_min( caf::VecIjk0::ZERO )
|
||||
, m_max( caf::VecIjk0::ZERO )
|
||||
, m_refinement( 1, 1, 1 )
|
||||
, m_boundaryCondition( 0 )
|
||||
{
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
caf::VecIjk0 RigSimulationInputSettings::min() const
|
||||
{
|
||||
return m_min;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
caf::VecIjk0 RigSimulationInputSettings::max() const
|
||||
{
|
||||
return m_max;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RigSimulationInputSettings::setMin( const caf::VecIjk0& min )
|
||||
{
|
||||
m_min = min;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RigSimulationInputSettings::setMax( const caf::VecIjk0& max )
|
||||
{
|
||||
m_max = max;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
cvf::Vec3st RigSimulationInputSettings::refinement() const
|
||||
{
|
||||
return m_refinement;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RigSimulationInputSettings::setRefinement( const cvf::Vec3st& refinement )
|
||||
{
|
||||
m_refinement = refinement;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
std::vector<Opm::DeckRecord> RigSimulationInputSettings::bcpropKeywords() const
|
||||
{
|
||||
return m_bcpropKeywords;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RigSimulationInputSettings::setBcpropKeywords( const std::vector<Opm::DeckRecord>& keywords )
|
||||
{
|
||||
m_bcpropKeywords = keywords;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
int RigSimulationInputSettings::boundaryCondition() const
|
||||
{
|
||||
return m_boundaryCondition;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RigSimulationInputSettings::setBoundaryCondition( int value )
|
||||
{
|
||||
m_boundaryCondition = value;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
QString RigSimulationInputSettings::inputDeckFileName() const
|
||||
{
|
||||
return m_inputDeckFileName;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RigSimulationInputSettings::setInputDeckFileName( const QString& fileName )
|
||||
{
|
||||
m_inputDeckFileName = fileName;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
QString RigSimulationInputSettings::outputDeckFileName() const
|
||||
{
|
||||
return m_outputDeckFileName;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RigSimulationInputSettings::setOutputDeckFileName( const QString& fileName )
|
||||
{
|
||||
m_outputDeckFileName = fileName;
|
||||
}
|
||||
@@ -0,0 +1,74 @@
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2025- Equinor ASA
|
||||
//
|
||||
// ResInsight is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
// FITNESS FOR A PARTICULAR PURPOSE.
|
||||
//
|
||||
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
|
||||
// for more details.
|
||||
//
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "cafVecIjk.h"
|
||||
#include "cvfVector3.h"
|
||||
|
||||
#include <QString>
|
||||
#include <vector>
|
||||
|
||||
namespace Opm
|
||||
{
|
||||
class DeckRecord;
|
||||
}
|
||||
|
||||
//==================================================================================================
|
||||
///
|
||||
/// Settings for exporting simulation input files (sector models)
|
||||
///
|
||||
//==================================================================================================
|
||||
class RigSimulationInputSettings
|
||||
{
|
||||
public:
|
||||
RigSimulationInputSettings();
|
||||
|
||||
// Sector bounds (0-based grid coordinates)
|
||||
caf::VecIjk0 min() const;
|
||||
caf::VecIjk0 max() const;
|
||||
void setMin( const caf::VecIjk0& min );
|
||||
void setMax( const caf::VecIjk0& max );
|
||||
|
||||
// Grid refinement
|
||||
cvf::Vec3st refinement() const;
|
||||
void setRefinement( const cvf::Vec3st& refinement );
|
||||
|
||||
// Boundary conditions
|
||||
std::vector<Opm::DeckRecord> bcpropKeywords() const;
|
||||
void setBcpropKeywords( const std::vector<Opm::DeckRecord>& keywords );
|
||||
|
||||
int boundaryCondition() const;
|
||||
void setBoundaryCondition( int value );
|
||||
|
||||
// File paths
|
||||
QString inputDeckFileName() const;
|
||||
void setInputDeckFileName( const QString& fileName );
|
||||
|
||||
QString outputDeckFileName() const;
|
||||
void setOutputDeckFileName( const QString& fileName );
|
||||
|
||||
private:
|
||||
caf::VecIjk0 m_min;
|
||||
caf::VecIjk0 m_max;
|
||||
cvf::Vec3st m_refinement;
|
||||
std::vector<Opm::DeckRecord> m_bcpropKeywords;
|
||||
int m_boundaryCondition;
|
||||
QString m_inputDeckFileName;
|
||||
QString m_outputDeckFileName;
|
||||
};
|
||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,94 @@
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2025- Equinor ASA
|
||||
//
|
||||
// ResInsight is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
// FITNESS FOR A PARTICULAR PURPOSE.
|
||||
//
|
||||
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
|
||||
// for more details.
|
||||
//
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "cafVecIjk.h"
|
||||
#include "cvfVector3.h"
|
||||
|
||||
#include <QString>
|
||||
|
||||
#include <expected>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
class RimEclipseView;
|
||||
class RimEclipseCase;
|
||||
class RigSimulationInputSettings;
|
||||
class RifOpmFlowDeckFile;
|
||||
class RigSimWellData;
|
||||
|
||||
namespace Opm
|
||||
{
|
||||
class DeckRecord;
|
||||
class DeckKeyword;
|
||||
} // namespace Opm
|
||||
|
||||
//==================================================================================================
|
||||
///
|
||||
/// Tool for exporting simulation input files (sector models)
|
||||
///
|
||||
//==================================================================================================
|
||||
class RigSimulationInputTool
|
||||
{
|
||||
public:
|
||||
static std::expected<void, QString>
|
||||
exportSimulationInput( RimEclipseView& view, RimEclipseCase& eclipseCase, const RigSimulationInputSettings& settings );
|
||||
|
||||
static std::expected<Opm::DeckRecord, QString>
|
||||
processEqualsRecord( const Opm::DeckRecord& record, const caf::VecIjk0& min, const caf::VecIjk0& max, const cvf::Vec3st& refinement );
|
||||
|
||||
private:
|
||||
static std::expected<void, QString> updateCornerPointGridInDeckFile( RimEclipseCase* eclipseCase,
|
||||
const RigSimulationInputSettings& settings,
|
||||
RifOpmFlowDeckFile& deckFile );
|
||||
|
||||
static std::expected<void, QString> replaceKeywordValuesInDeckFile( RimEclipseCase* eclipseCase,
|
||||
const RigSimulationInputSettings& settings,
|
||||
RifOpmFlowDeckFile& deckFile );
|
||||
|
||||
static std::expected<void, QString>
|
||||
addBorderBoundaryConditions( RimEclipseCase* eclipseCase, const RigSimulationInputSettings& settings, RifOpmFlowDeckFile& deckFile );
|
||||
|
||||
static std::expected<void, QString>
|
||||
replaceEqualsKeywordIndices( RimEclipseCase* eclipseCase, const RigSimulationInputSettings& settings, RifOpmFlowDeckFile& deckFile );
|
||||
|
||||
static std::expected<void, QString>
|
||||
addFaultsToDeckFile( RimEclipseCase* eclipseCase, const RigSimulationInputSettings& settings, RifOpmFlowDeckFile& deckFile );
|
||||
|
||||
static std::expected<void, QString>
|
||||
filterAndUpdateWellKeywords( RimEclipseCase* eclipseCase, const RigSimulationInputSettings& settings, RifOpmFlowDeckFile& deckFile );
|
||||
|
||||
static std::expected<void, QString> addOperNumRegionAndOperater( RimEclipseCase* eclipseCase,
|
||||
const RigSimulationInputSettings& settings,
|
||||
RifOpmFlowDeckFile& deckFile,
|
||||
int operNumRegion );
|
||||
|
||||
static std::vector<RigSimWellData*> findIntersectingWells( RimEclipseCase* eclipseCase, const cvf::Vec3st& min, const cvf::Vec3st& max );
|
||||
|
||||
static std::expected<Opm::DeckRecord, QString>
|
||||
processWelspecsRecord( const Opm::DeckRecord& record, const std::string& wellName, const RigSimulationInputSettings& settings );
|
||||
|
||||
static std::expected<Opm::DeckRecord, QString>
|
||||
processCompdatRecord( const Opm::DeckRecord& record, const std::string& wellName, const RigSimulationInputSettings& settings );
|
||||
|
||||
static std::expected<Opm::DeckRecord, QString> processCompsegsRecord( const Opm::DeckRecord& record,
|
||||
const std::string& wellName,
|
||||
bool isWellNameRecord,
|
||||
const RigSimulationInputSettings& settings );
|
||||
};
|
||||
@@ -8,7 +8,7 @@ endif(MSVC)
|
||||
set(SOURCE_UNITTEST_FILES
|
||||
${CMAKE_CURRENT_LIST_DIR}/cvfGeometryTools-Test.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/Ert-Test.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RicExportEclipseSectorModelFeature-Test.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RigSimulationInputTool-Test.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RigBoundingBoxIjk-Test.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RifcCommandCore-Test.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RifEclipseInputFileTools-Test.cpp
|
||||
|
||||
+13
-13
@@ -18,7 +18,7 @@
|
||||
|
||||
#include "gtest/gtest.h"
|
||||
|
||||
#include "ExportCommands/RicExportEclipseSectorModelFeature.h"
|
||||
#include "RigSimulationInputTool.h"
|
||||
|
||||
#include "RifOpmDeckTools.h"
|
||||
|
||||
@@ -50,7 +50,7 @@ static Opm::DeckRecord createEqualsRecord( const std::string& fieldName, int val
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
/// Test EQUALS record with no overlap - should return error
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
TEST( RicExportEclipseSectorModelFeature, ProcessEqualsRecord_NoOverlap )
|
||||
TEST( RigSimulationInputTool, ProcessEqualsRecord_NoOverlap )
|
||||
{
|
||||
// Sector: sectorMin=(0, 15, 0), sectorMax=(19, 29, 9) (inclusive, cells [0-19, 15-29, 0-9])
|
||||
caf::VecIjk0 sectorMin( 0, 15, 0 );
|
||||
@@ -62,7 +62,7 @@ TEST( RicExportEclipseSectorModelFeature, ProcessEqualsRecord_NoOverlap )
|
||||
// Sector J is [15-29], so no overlap in J dimension
|
||||
auto record = createEqualsRecord( "FIPNUM", 1, 1, 20, 1, 14, 1, 10 );
|
||||
|
||||
auto result = RicExportEclipseSectorModelFeature::processEqualsRecord( record, sectorMin, sectorMax, refinement );
|
||||
auto result = RigSimulationInputTool::processEqualsRecord( record, sectorMin, sectorMax, refinement );
|
||||
|
||||
EXPECT_FALSE( result.has_value() );
|
||||
EXPECT_TRUE( result.error().contains( "does not overlap" ) );
|
||||
@@ -71,7 +71,7 @@ TEST( RicExportEclipseSectorModelFeature, ProcessEqualsRecord_NoOverlap )
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
/// Test EQUALS record with partial overlap requiring clamping
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
TEST( RicExportEclipseSectorModelFeature, ProcessEqualsRecord_PartialOverlapWithClamping )
|
||||
TEST( RigSimulationInputTool, ProcessEqualsRecord_PartialOverlapWithClamping )
|
||||
{
|
||||
// Sector: sectorMin=(0, 15, 0), sectorMax=(19, 29, 9) (inclusive, cells [0-19, 15-29, 0-9])
|
||||
caf::VecIjk0 sectorMin( 0, 15, 0 );
|
||||
@@ -84,7 +84,7 @@ TEST( RicExportEclipseSectorModelFeature, ProcessEqualsRecord_PartialOverlapWith
|
||||
// Intersection (clamped): I[0-19], J[15-29], K[0-9]
|
||||
auto record = createEqualsRecord( "FIPNUM", 2, 1, 20, 15, 30, 1, 10 );
|
||||
|
||||
auto result = RicExportEclipseSectorModelFeature::processEqualsRecord( record, sectorMin, sectorMax, refinement );
|
||||
auto result = RigSimulationInputTool::processEqualsRecord( record, sectorMin, sectorMax, refinement );
|
||||
|
||||
ASSERT_TRUE( result.has_value() );
|
||||
|
||||
@@ -109,7 +109,7 @@ TEST( RicExportEclipseSectorModelFeature, ProcessEqualsRecord_PartialOverlapWith
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
/// Test EQUALS record completely inside sector (no clamping)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
TEST( RicExportEclipseSectorModelFeature, ProcessEqualsRecord_CompletelyInside )
|
||||
TEST( RigSimulationInputTool, ProcessEqualsRecord_CompletelyInside )
|
||||
{
|
||||
// Sector: min=(0, 0, 0), max=(19, 19, 9) (inclusive, cells [0-19, 0-19, 0-9])
|
||||
caf::VecIjk0 sectorMin( 0, 0, 0 );
|
||||
@@ -120,7 +120,7 @@ TEST( RicExportEclipseSectorModelFeature, ProcessEqualsRecord_CompletelyInside )
|
||||
// Converts to 0-based: I[4-14], J[4-14], K[1-7]
|
||||
auto record = createEqualsRecord( "FIPNUM", 3, 5, 15, 5, 15, 2, 8 );
|
||||
|
||||
auto result = RicExportEclipseSectorModelFeature::processEqualsRecord( record, sectorMin, sectorMax, refinement );
|
||||
auto result = RigSimulationInputTool::processEqualsRecord( record, sectorMin, sectorMax, refinement );
|
||||
|
||||
ASSERT_TRUE( result.has_value() );
|
||||
|
||||
@@ -139,7 +139,7 @@ TEST( RicExportEclipseSectorModelFeature, ProcessEqualsRecord_CompletelyInside )
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
/// Test EQUALS record completely outside sector
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
TEST( RicExportEclipseSectorModelFeature, ProcessEqualsRecord_CompletelyOutside )
|
||||
TEST( RigSimulationInputTool, ProcessEqualsRecord_CompletelyOutside )
|
||||
{
|
||||
// Sector: min=(0, 0, 0), max=(9, 9, 9) (inclusive, cells [0-9, 0-9, 0-9])
|
||||
caf::VecIjk0 sectorMin( 0, 0, 0 );
|
||||
@@ -151,7 +151,7 @@ TEST( RicExportEclipseSectorModelFeature, ProcessEqualsRecord_CompletelyOutside
|
||||
// No overlap with sector
|
||||
auto record = createEqualsRecord( "FIPNUM", 4, 20, 30, 20, 30, 1, 10 );
|
||||
|
||||
auto result = RicExportEclipseSectorModelFeature::processEqualsRecord( record, sectorMin, sectorMax, refinement );
|
||||
auto result = RigSimulationInputTool::processEqualsRecord( record, sectorMin, sectorMax, refinement );
|
||||
|
||||
EXPECT_FALSE( result.has_value() );
|
||||
EXPECT_TRUE( result.error().contains( "does not overlap" ) );
|
||||
@@ -160,7 +160,7 @@ TEST( RicExportEclipseSectorModelFeature, ProcessEqualsRecord_CompletelyOutside
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
/// Test invalid EQUALS record (insufficient items)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
TEST( RicExportEclipseSectorModelFeature, ProcessEqualsRecord_InvalidRecord )
|
||||
TEST( RigSimulationInputTool, ProcessEqualsRecord_InvalidRecord )
|
||||
{
|
||||
caf::VecIjk0 sectorMin( 0, 0, 0 );
|
||||
caf::VecIjk0 sectorMax( 9, 9, 9 );
|
||||
@@ -177,7 +177,7 @@ TEST( RicExportEclipseSectorModelFeature, ProcessEqualsRecord_InvalidRecord )
|
||||
|
||||
Opm::DeckRecord record{ std::move( items ) };
|
||||
|
||||
auto result = RicExportEclipseSectorModelFeature::processEqualsRecord( record, sectorMin, sectorMax, refinement );
|
||||
auto result = RigSimulationInputTool::processEqualsRecord( record, sectorMin, sectorMax, refinement );
|
||||
|
||||
EXPECT_FALSE( result.has_value() );
|
||||
EXPECT_TRUE( result.error().contains( "insufficient items" ) );
|
||||
@@ -186,7 +186,7 @@ TEST( RicExportEclipseSectorModelFeature, ProcessEqualsRecord_InvalidRecord )
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
/// Test EQUALS record at sector boundary
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
TEST( RicExportEclipseSectorModelFeature, ProcessEqualsRecord_AtBoundary )
|
||||
TEST( RigSimulationInputTool, ProcessEqualsRecord_AtBoundary )
|
||||
{
|
||||
// Sector: min=(5, 5, 5), max=(14, 14, 14) (inclusive, cells [5-14, 5-14, 5-14])
|
||||
caf::VecIjk0 sectorMin( 5, 5, 5 );
|
||||
@@ -197,7 +197,7 @@ TEST( RicExportEclipseSectorModelFeature, ProcessEqualsRecord_AtBoundary )
|
||||
// Converts to 0-based: I[5-14], J[5-14], K[5-14]
|
||||
auto record = createEqualsRecord( "FIPNUM", 5, 6, 15, 6, 15, 6, 15 );
|
||||
|
||||
auto result = RicExportEclipseSectorModelFeature::processEqualsRecord( record, sectorMin, sectorMax, refinement );
|
||||
auto result = RigSimulationInputTool::processEqualsRecord( record, sectorMin, sectorMax, refinement );
|
||||
|
||||
ASSERT_TRUE( result.has_value() );
|
||||
|
||||
Reference in new issue
Block a user