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

14
ApplicationLibCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp
View File

@@ -115,9 +115,9 @@ void RigFlowDiagTimeStepResult::addResult( const RigFlowDiagResultAddress& resAd
class RigOpmFlowDiagStaticData : public cvf::Object
{
public:
RigOpmFlowDiagStaticData( const ecl_grid_type* mainGrid,
const std::wstring& init,
RiaEclipseUnitTools::UnitSystem caseUnitSystem )
RigOpmFlowDiagStaticData( const ecl_grid_type* mainGrid,
const std::wstring& init,
RiaDefines::EclipseUnitSystem caseUnitSystem )
{
Opm::ECLInitFileData initData( init );
@@ -147,11 +147,11 @@ public:
// Try and set output unit system to the same system as the eclipse case system
std::unique_ptr<const Opm::ECLUnits::UnitSystem> eclUnitSystem;
if ( caseUnitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
if ( caseUnitSystem == RiaDefines::EclipseUnitSystem::UNITS_METRIC )
eclUnitSystem = Opm::ECLUnits::metricUnitConventions();
else if ( caseUnitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
else if ( caseUnitSystem == RiaDefines::EclipseUnitSystem::UNITS_FIELD )
eclUnitSystem = Opm::ECLUnits::fieldUnitConventions();
else if ( caseUnitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_LAB )
else if ( caseUnitSystem == RiaDefines::EclipseUnitSystem::UNITS_LAB )
eclUnitSystem = Opm::ECLUnits::labUnitConventions();
if ( eclUnitSystem )
@@ -542,7 +542,7 @@ bool RigFlowDiagSolverInterface::ensureStaticDataObjectInstanceCreated()
return false;
}
RiaEclipseUnitTools::UnitSystem caseUnitSystem = eclipseCaseData->unitsType();
RiaDefines::EclipseUnitSystem caseUnitSystem = eclipseCaseData->unitsType();
m_opmFlowDiagStaticData = new RigOpmFlowDiagStaticData( mainGrid, initFileName, caseUnitSystem );
ecl_grid_free( mainGrid );