OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-11 16:06:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

#4751 System : Use std::wstring to communicate file path

Browse Source
This commit is contained in:
Magne Sjaastad 2019-09-23 13:37:29 +02:00
parent 00eb02ccec
commit f41edcee44
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp
View File

@ -118,7 +118,7 @@ class RigOpmFlowDiagStaticData : public cvf::Object
{
public:
RigOpmFlowDiagStaticData( const ecl_grid_type* mainGrid,
const std::string& init,
const std::wstring& init,
RiaEclipseUnitTools::UnitSystem caseUnitSystem )
{
Opm::ECLInitFileData initData( init );
@ -516,8 +516,8 @@ bool RigFlowDiagSolverInterface::ensureStaticDataObjectInstanceCreated()
if ( m_opmFlowDiagStaticData.isNull() )
{
// Get set of files
QString gridFileName = m_eclipseCase->gridFileName();
std::string initFileName = getInitFileName();
QString gridFileName = m_eclipseCase->gridFileName();
std::wstring initFileName = getInitFileName();
if ( initFileName.empty() ) return false;
const RigEclipseCaseData* eclipseCaseData = m_eclipseCase->eclipseCaseData();
@ -992,18 +992,18 @@ bool RigFlowDiagSolverInterface::calculatePvtDynamicPropertiesViscosity(
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::string RigFlowDiagSolverInterface::getInitFileName() const
std::wstring RigFlowDiagSolverInterface::getInitFileName() const
{
QString gridFileName = m_eclipseCase->gridFileName();
QStringList m_filesWithSameBaseName;
if ( !RifEclipseOutputFileTools::findSiblingFilesWithSameBaseName( gridFileName, &m_filesWithSameBaseName ) )
return std::string();
return std::wstring();
QString initFileName = RifEclipseOutputFileTools::firstFileNameOfType( m_filesWithSameBaseName, ECL_INIT_FILE );
return initFileName.toStdString();
return initFileName.toStdWString();
}
//--------------------------------------------------------------------------------------------------

10
ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.h
View File

@ -157,11 +157,11 @@ public:
size_t activeCellIndex, double pressure, double rs, double rv, double* mu_o, double* mu_g );
private:
std::string getInitFileName() const;
bool ensureStaticDataObjectInstanceCreated();
void assignPhaseCorrecedPORV( RigFlowDiagResultAddress::PhaseSelection phaseSelection, size_t timeStepIdx );
void reportRelPermCurveError( const QString& message );
void reportPvtCurveError( const QString& message );
std::wstring getInitFileName() const;
bool ensureStaticDataObjectInstanceCreated();
void assignPhaseCorrecedPORV( RigFlowDiagResultAddress::PhaseSelection phaseSelection, size_t timeStepIdx );
void reportRelPermCurveError( const QString& message );
void reportPvtCurveError( const QString& message );
RimEclipseResultCase* m_eclipseCase;
cvf::ref<RigOpmFlowDiagStaticData> m_opmFlowDiagStaticData;