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

#10753 Fault Reactivation: improve step names

Browse Source 
Fixes #10753.
This commit is contained in:
Kristian Bendiksen 2023-10-30 12:39:08 +01:00
parent ea4e46b400
commit fcf565e541
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ApplicationLibCode/FileInterface/RifFaultReactivationModelExporter.cpp
View File

@ -479,10 +479,9 @@ std::pair<bool, std::string> RifFaultReactivationModelExporter::printSteps( std:
for ( int i = 0; i < static_cast<int>( timeSteps.size() ); i++ ) for ( int i = 0; i < static_cast<int>( timeSteps.size() ); i++ )
{ {
std::string stepNum = std::to_string( i + 1 ); std::string stepNum = std::to_string( i + 1 );
std::string stepName = "Step-" + stepNum; std::string stepName = timeSteps[i].toString( "yyyy-MM-dd" ).toStdString();
RifInpExportTools::printComment( stream, "----------------------------------------------------------------" ); RifInpExportTools::printComment( stream, "----------------------------------------------------------------" );
RifInpExportTools::printSectionComment( stream, "STEP: " + stepName ); RifInpExportTools::printSectionComment( stream, "STEP: " + stepName );
RifInpExportTools::printComment( stream, "Time step: " + timeSteps[i].toString().toStdString() );
RifInpExportTools::printHeading( stream, "Step, name=" + stepName + ", nlgeom=NO" ); RifInpExportTools::printHeading( stream, "Step, name=" + stepName + ", nlgeom=NO" );
@ -495,7 +494,7 @@ std::pair<bool, std::string> RifFaultReactivationModelExporter::printSteps( std:
RifInpExportTools::printSectionComment( stream, "BOUNDARY CONDITIONS" ); RifInpExportTools::printSectionComment( stream, "BOUNDARY CONDITIONS" );
// Export the pore pressure to a separate inp file for each step // Export the pore pressure to a separate inp file for each step
std::string fileName = createFileName( "PORE_PRESSURE", timeSteps[i], stepName ); std::string fileName = createFileName( "PORE_PRESSURE", stepName );
std::string filePath = createFilePath( exportDirectory, fileName ); std::string filePath = createFilePath( exportDirectory, fileName );
bool isOk = bool isOk =
@ -511,7 +510,7 @@ std::pair<bool, std::string> RifFaultReactivationModelExporter::printSteps( std:
RifInpExportTools::printSectionComment( stream, "TEMPERATURE" ); RifInpExportTools::printSectionComment( stream, "TEMPERATURE" );
// Export the pore pressure to a separate inp file for each step // Export the pore pressure to a separate inp file for each step
std::string fileName = createFileName( "TEMPERATURE", timeSteps[i], stepName ); std::string fileName = createFileName( "TEMPERATURE", stepName );
std::string filePath = createFilePath( exportDirectory, fileName ); std::string filePath = createFilePath( exportDirectory, fileName );
bool isOk = writePropertyToFile( model, dataAccess, RimFaultReactivation::Property::Temperature, i, filePath, partNames, "" ); bool isOk = writePropertyToFile( model, dataAccess, RimFaultReactivation::Property::Temperature, i, filePath, partNames, "" );
@ -601,13 +600,9 @@ std::pair<bool, std::string>
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::string RifFaultReactivationModelExporter::createFileName( const std::string& title, const QDateTime& dateTime, const std::string& stepName ) std::string RifFaultReactivationModelExporter::createFileName( const std::string& title, const std::string& stepName )
{ {
return QString( "%1_DATE_%2_%3.inp" ) return QString( "%1_%2.inp" ).arg( QString::fromStdString( title ) ).arg( QString::fromStdString( stepName ) ).toStdString();
.arg( QString::fromStdString( title ) )
.arg( dateTime.toString( "yyyyMMdd" ) )
.arg( QString::fromStdString( stepName ) )
.toStdString();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/FileInterface/RifFaultReactivationModelExporter.h
View File

@ -91,7 +91,7 @@ private:
const std::map<RimFaultReactivation::GridPart, std::string>& partNames, const std::map<RimFaultReactivation::GridPart, std::string>& partNames,
const std::string& additionalData ); const std::string& additionalData );
static std::string createFileName( const std::string& title, const QDateTime& dateTime, const std::string& stepName ); 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 std::string createFilePath( const std::string& dir, const std::string& fileName );
}; };