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

#1596 Rename to RiaEclipseUnitTools

Browse Source
This commit is contained in:
Magne Sjaastad
2017-06-13 15:22:12 +02:00
parent 263015cdff
commit 5fa2f6cfbe
13 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/Commands/CompletionCommands/RicWellPathExportCompletionDataFeature.cpp
View File

@@ -156,12 +156,12 @@ void RicWellPathExportCompletionDataFeature::exportCompletions(const std::vector
bool unitSystemMismatch = false;
for (const RimWellPath* wellPath : wellPaths)
{
if (wellPath->unitSystem() == RimUnitSystem::UNITS_FIELD && exportSettings.caseToApply->eclipseCaseData()->unitsType() != RigEclipseCaseData::UNITS_FIELD)
if (wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_FIELD && exportSettings.caseToApply->eclipseCaseData()->unitsType() != RigEclipseCaseData::UNITS_FIELD)
{
unitSystemMismatch = true;
break;
}
else if (wellPath->unitSystem() == RimUnitSystem::UNITS_METRIC && exportSettings.caseToApply->eclipseCaseData()->unitsType() != RigEclipseCaseData::UNITS_METRIC)
else if (wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_METRIC && exportSettings.caseToApply->eclipseCaseData()->unitsType() != RigEclipseCaseData::UNITS_METRIC)
{
unitSystemMismatch = true;
break;
@@ -693,7 +693,7 @@ double RicWellPathExportCompletionDataFeature::calculateTransmissibility(RimEcli
double permy = permxAccessObject->cellScalarGlobIdx(cellIndex);
double permz = permxAccessObject->cellScalarGlobIdx(cellIndex);
double darcy = RimUnitSystem::darcysConstant(wellPath->unitSystem());
double darcy = RiaEclipseUnitTools::darcysConstant(wellPath->unitSystem());
double transx = RigTransmissibilityEquations::wellBoreTransmissibilityComponent(internalCellLengths.x(), permy, permz, dy, dz, wellRadius, skinFactor, darcy);
double transy = RigTransmissibilityEquations::wellBoreTransmissibilityComponent(internalCellLengths.y(), permx, permz, dx, dz, wellRadius, skinFactor, darcy);

2
ApplicationCode/Commands/WellPathCommands/RicWellPathsUnitSystemSettingsImpl.cpp
View File

@@ -29,7 +29,7 @@
//--------------------------------------------------------------------------------------------------
bool RicWellPathsUnitSystemSettingsImpl::ensureHasUnitSystem(RimWellPath * wellPath)
{
if (wellPath->unitSystem() != RimUnitSystem::UNITS_UNKNOWN)
if (wellPath->unitSystem() != RiaEclipseUnitTools::UNITS_UNKNOWN)
{
return true;
}

2
ApplicationCode/Commands/WellPathCommands/RicWellPathsUnitSystemSettingsImpl.h
View File

@@ -18,7 +18,7 @@
#pragma once
#include "RimUnitSystem.h"
#include "RiaEclipseUnitTools.h"
#include "RimWellPath.h"
//==================================================================================================

4
ApplicationCode/Commands/WellPathCommands/RicWellPathsUnitSystemSettingsUi.cpp
View File

@@ -38,8 +38,8 @@ QList<caf::PdmOptionItemInfo> RicWellPathsUnitSystemSettingsUi::calculateValueOp
QList<caf::PdmOptionItemInfo> options;
if (fieldNeedingOptions == &unitSystem)
{
options.push_back(caf::PdmOptionItemInfo(RimUnitSystem::UnitSystemType::uiText(RimUnitSystem::UNITS_METRIC), RimUnitSystem::UNITS_METRIC));
options.push_back(caf::PdmOptionItemInfo(RimUnitSystem::UnitSystemType::uiText(RimUnitSystem::UNITS_FIELD), RimUnitSystem::UNITS_FIELD));
options.push_back(caf::PdmOptionItemInfo(RiaEclipseUnitTools::UnitSystemType::uiText(RiaEclipseUnitTools::UNITS_METRIC), RiaEclipseUnitTools::UNITS_METRIC));
options.push_back(caf::PdmOptionItemInfo(RiaEclipseUnitTools::UnitSystemType::uiText(RiaEclipseUnitTools::UNITS_FIELD), RiaEclipseUnitTools::UNITS_FIELD));
}
return options;
}

4
ApplicationCode/Commands/WellPathCommands/RicWellPathsUnitSystemSettingsUi.h
View File

@@ -18,7 +18,7 @@
#pragma once
#include "RimUnitSystem.h"
#include "RiaEclipseUnitTools.h"
#include "cafPdmObject.h"
#include "cafPdmField.h"
@@ -34,7 +34,7 @@ public:
RicWellPathsUnitSystemSettingsUi();
caf::PdmField<RimUnitSystem::UnitSystemType> unitSystem;
caf::PdmField<RiaEclipseUnitTools::UnitSystemType> unitSystem;
protected:
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;