mirror of
https://github.com/OPM/ResInsight.git
synced 2026-11-20 12:59:46 -06:00
Moved UnitSystem from RiaEclipseUnitTools to RiaDefines. (#7225)
* 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:
176 files changed
+1470
-1365
No files matched your search
@@ -1303,25 +1303,25 @@ std::vector<RimValveTemplate*> RimProject::allValveTemplates() const
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RiaEclipseUnitTools::UnitSystemType RimProject::commonUnitSystemForAllCases() const
|
||||
caf::AppEnum<RiaDefines::EclipseUnitSystem> RimProject::commonUnitSystemForAllCases() const
|
||||
{
|
||||
std::vector<RimCase*> rimCases;
|
||||
allCases( rimCases );
|
||||
|
||||
RiaEclipseUnitTools::UnitSystem commonUnitSystem = RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN;
|
||||
RiaDefines::EclipseUnitSystem commonUnitSystem = RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN;
|
||||
|
||||
for ( const auto& c : rimCases )
|
||||
{
|
||||
auto eclipseCase = dynamic_cast<RimEclipseCase*>( c );
|
||||
if ( eclipseCase && eclipseCase->eclipseCaseData() )
|
||||
{
|
||||
if ( commonUnitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN )
|
||||
if ( commonUnitSystem == RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN )
|
||||
{
|
||||
commonUnitSystem = eclipseCase->eclipseCaseData()->unitsType();
|
||||
}
|
||||
else if ( commonUnitSystem != eclipseCase->eclipseCaseData()->unitsType() )
|
||||
{
|
||||
commonUnitSystem = RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN;
|
||||
commonUnitSystem = RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user