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

Moved UnitSystem from RiaEclipseUnitTools to RiaDefines. (#7225)

Browse Source 
* Moved UnitSystem from RiaEclipseUnitTools to RiaDefines.
- Renamed UnitSystem to EclipseUnitSystem
- Replaced header includes and removed obsolete includes of RiaEclipseUnitTools.h
* Moved  result name functions into separate file.
* Minor cleanup

Co-authored-by: rubenthoms <rubenthoms@users.noreply.github.com>
Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Co-authored-by: magnesj <magnesj@users.noreply.github.com>
This commit is contained in:
rubenthoms
2021-01-21 12:58:46 +01:00
committed by GitHub
parent c4c6eb75f2
commit bc81437435
176 changed files with 1470 additions and 1365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ApplicationLibCode/FileInterface/RifEclipseInputFileTools.cpp
View File

@@ -120,8 +120,8 @@ bool RifEclipseInputFileTools::openGridFile( const QString& fileName,
QFile gridFile( fileName );
if ( gridFile.open( QFile::ReadOnly ) )
{
RiaEclipseUnitTools::UnitSystem units = readUnitSystem( gridFile, gridunitPos );
if ( units != RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN )
RiaDefines::EclipseUnitSystem units = readUnitSystem( gridFile, gridunitPos );
if ( units != RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN )
{
eclipseCase->setUnitsType( units );
}
@@ -417,9 +417,9 @@ bool RifEclipseInputFileTools::exportGrid( const QString& fileName,
}
ert_ecl_unit_enum ecl_units = ECL_METRIC_UNITS;
if ( eclipseCase->unitsType() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
if ( eclipseCase->unitsType() == RiaDefines::EclipseUnitSystem::UNITS_FIELD )
ecl_units = ECL_FIELD_UNITS;
else if ( eclipseCase->unitsType() == RiaEclipseUnitTools::UnitSystem::UNITS_LAB )
else if ( eclipseCase->unitsType() == RiaDefines::EclipseUnitSystem::UNITS_LAB )
ecl_units = ECL_LAB_UNITS;
ecl_grid_fprintf_grdecl2( mainEclGrid, filePtr, ecl_units );
@@ -751,8 +751,8 @@ void RifEclipseInputFileTools::saveFaults( QTextStream& stream,
const cvf::Collection<RigFault>& faults = mainGrid->faults();
for ( const auto& fault : faults )
{
if ( fault->name() != RiaDefines::undefinedGridFaultName() &&
fault->name() != RiaDefines::undefinedGridFaultWithInactiveName() )
if ( fault->name() != RiaResultNames::undefinedGridFaultName() &&
fault->name() != RiaResultNames::undefinedGridFaultWithInactiveName() )
{
saveFault( stream, mainGrid, fault->faultFaces(), fault->name(), min, max, refinement );
}
@@ -1662,7 +1662,7 @@ void RifEclipseInputFileTools::readKeywordDataContent( QFile& data,
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaEclipseUnitTools::UnitSystem RifEclipseInputFileTools::readUnitSystem( QFile& file, qint64 gridunitPos )
RiaDefines::EclipseUnitSystem RifEclipseInputFileTools::readUnitSystem( QFile& file, qint64 gridunitPos )
{
bool stopParsing = false;
QStringList unitText;
@@ -1671,18 +1671,18 @@ RiaEclipseUnitTools::UnitSystem RifEclipseInputFileTools::readUnitSystem( QFile&
{
if ( unitString.contains( "FEET", Qt::CaseInsensitive ) )
{
return RiaEclipseUnitTools::UnitSystem::UNITS_FIELD;
return RiaDefines::EclipseUnitSystem::UNITS_FIELD;
}
else if ( unitString.contains( "CM", Qt::CaseInsensitive ) )
{
return RiaEclipseUnitTools::UnitSystem::UNITS_LAB;
return RiaDefines::EclipseUnitSystem::UNITS_LAB;
}
else if ( unitString.contains( "MET", Qt::CaseInsensitive ) )
{
return RiaEclipseUnitTools::UnitSystem::UNITS_METRIC;
return RiaDefines::EclipseUnitSystem::UNITS_METRIC;
}
}
return RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN;
return RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN;
}
//--------------------------------------------------------------------------------------------------