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

Refactor: move fault reactivation data access to fix ownership problems.

Browse Source
This commit is contained in:
Kristian Bendiksen
2023-12-18 13:46:49 +01:00
parent 78942b0313
commit 9e1a09bcf9
7 changed files with 79 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
ApplicationLibCode/FileInterface/RifFaultReactivationModelExporter.cpp
View File

@@ -28,9 +28,12 @@
#include "RiaWellLogUnitTools.h"
#include "RifInpExportTools.h"
#include "RifJsonEncodeDecode.h"
#include "RimFaultReactivationDataAccess.h"
#include "RimFaultReactivationEnums.h"
#include "RimFaultReactivationModel.h"
#include "RimFaultReactivationTools.h"
#include <filesystem>
#include <fstream>
@@ -42,6 +45,9 @@ std::pair<bool, std::string> RifFaultReactivationModelExporter::exportToStream(
const std::string& exportDirectory,
const RimFaultReactivationModel& rimModel )
{
auto dataAccess = extractAndExportModelData( rimModel );
if ( !dataAccess ) return { false, "Unable to get necessary data from the input case." };
std::string applicationNameAndVersion = std::string( RI_APPLICATION_NAME ) + " " + std::string( STRPRODUCTVER );
using PartBorderSurface = RimFaultReactivation::BorderSurface;
@@ -90,8 +96,6 @@ std::pair<bool, std::string> RifFaultReactivationModelExporter::exportToStream(
double waterDensity = rimModel.waterDensity();
double seaWaterLoad = RiaWellLogUnitTools<double>::gravityAcceleration() * seaBedDepth * waterDensity;
auto dataAccess = rimModel.dataAccess();
auto model = rimModel.model();
CAF_ASSERT( !model.isNull() );
@@ -808,4 +812,45 @@ std::string RifFaultReactivationModelExporter::createFileName( const std::string
std::string RifFaultReactivationModelExporter::createFilePath( const std::string& dir, const std::string& fileName )
{
return dir + "/" + fileName;
};
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RifFaultReactivationModelExporter::exportModelSettings( const RimFaultReactivationModel& rimModel )
{
auto model = rimModel.model();
if ( model.isNull() ) return false;
if ( !model->isValid() ) return false;
QMap<QString, QVariant> settings;
auto [topPosition, bottomPosition] = model->faultTopBottom();
auto faultNormal = model->faultNormal();
// make sure we move horizontally, and along the 2D model
faultNormal.z() = 0.0;
faultNormal.normalize();
faultNormal = faultNormal ^ cvf::Vec3d::Z_AXIS;
RimFaultReactivationTools::addSettingsToMap( settings, faultNormal, topPosition, bottomPosition );
return ResInsightInternalJson::JsonWriter::encodeFile( rimModel.settingsFilename(), settings );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::shared_ptr<RimFaultReactivationDataAccess>
RifFaultReactivationModelExporter::extractAndExportModelData( const RimFaultReactivationModel& rimModel )
{
if ( !exportModelSettings( rimModel ) ) return nullptr;
auto eCase = rimModel.eclipseCase();
if ( eCase == nullptr ) return nullptr;
// extract data for each timestep
auto dataAccess = std::make_shared<RimFaultReactivationDataAccess>( eCase, rimModel.geoMechCase(), rimModel.selectedTimeStepIndexes() );
dataAccess->extractModelData( *rimModel.model() );
return dataAccess;
}

3
ApplicationLibCode/FileInterface/RifFaultReactivationModelExporter.h
View File

@@ -111,4 +111,7 @@ private:
static std::string createFileName( const std::string& title, const std::string& stepName );
static std::string createFilePath( const std::string& dir, const std::string& fileName );
static bool exportModelSettings( const RimFaultReactivationModel& model );
static std::shared_ptr<RimFaultReactivationDataAccess> extractAndExportModelData( const RimFaultReactivationModel& model );
};