OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-09 23:16:00 -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
Show Stats 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;

4
ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
View File

@ -14,7 +14,7 @@ ${CEE_CURRENT_LIST_DIR}RimEclipsePropertyFilterCollection.h
${CEE_CURRENT_LIST_DIR}RimCellRangeFilter.h
${CEE_CURRENT_LIST_DIR}RimCellRangeFilterCollection.h
${CEE_CURRENT_LIST_DIR}RimDefines.h
${CEE_CURRENT_LIST_DIR}RimUnitSystem.h
${CEE_CURRENT_LIST_DIR}RiaEclipseUnitTools.h
${CEE_CURRENT_LIST_DIR}RimLegendConfig.h
${CEE_CURRENT_LIST_DIR}RimOilField.h
${CEE_CURRENT_LIST_DIR}RimProject.h
@ -103,7 +103,7 @@ ${CEE_CURRENT_LIST_DIR}RimEclipsePropertyFilterCollection.cpp
${CEE_CURRENT_LIST_DIR}RimCellRangeFilter.cpp
${CEE_CURRENT_LIST_DIR}RimCellRangeFilterCollection.cpp
${CEE_CURRENT_LIST_DIR}RimDefines.cpp
${CEE_CURRENT_LIST_DIR}RimUnitSystem.cpp
${CEE_CURRENT_LIST_DIR}RiaEclipseUnitTools.cpp
${CEE_CURRENT_LIST_DIR}RimLegendConfig.cpp
${CEE_CURRENT_LIST_DIR}RimOilField.cpp
${CEE_CURRENT_LIST_DIR}RimProject.cpp

14
ApplicationCode/ProjectDataModel/RimUnitSystem.cpp → ApplicationCode/ProjectDataModel/RiaEclipseUnitTools.cpp
View File

@ -16,7 +16,7 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimUnitSystem.h"
#include "RiaEclipseUnitTools.h"
#include "cafAppEnum.h"
@ -25,20 +25,20 @@
namespace caf
{
template<>
void RimUnitSystem::UnitSystemType::setUp()
void RiaEclipseUnitTools::UnitSystemType::setUp()
{
addItem(RimUnitSystem::UNITS_METRIC, "UNITS_METRIC", "Metric");
addItem(RimUnitSystem::UNITS_FIELD, "UNITS_FIELD", "Field");
addItem(RimUnitSystem::UNITS_UNKNOWN, "UNITS_UNKNOWN", "Unknown");
addItem(RiaEclipseUnitTools::UNITS_METRIC, "UNITS_METRIC", "Metric");
addItem(RiaEclipseUnitTools::UNITS_FIELD, "UNITS_FIELD", "Field");
addItem(RiaEclipseUnitTools::UNITS_UNKNOWN, "UNITS_UNKNOWN", "Unknown");
setDefault(RimUnitSystem::UNITS_METRIC);
setDefault(RiaEclipseUnitTools::UNITS_METRIC);
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RimUnitSystem::darcysConstant(UnitSystem unitSystem)
double RiaEclipseUnitTools::darcysConstant(UnitSystem unitSystem)
{
// See "Cartesian transmissibility calculations" in the "Eclipse Technical Description"
// CDARCY Darcys constant

4
ApplicationCode/ProjectDataModel/RimUnitSystem.h → ApplicationCode/ProjectDataModel/RiaEclipseUnitTools.h
View File

@ -20,7 +20,7 @@
#include "cafAppEnum.h"
class RimUnitSystem
class RiaEclipseUnitTools
{
public:
@ -32,7 +32,7 @@ public:
//UNITS_LAB
};
typedef caf::AppEnum< RimUnitSystem::UnitSystem > UnitSystemType;
typedef caf::AppEnum< RiaEclipseUnitTools::UnitSystem > UnitSystemType;
static double feetPerMeter() { return 3.2808399; }
static double meterPerFeet() { return 0.3048000; }

4
ApplicationCode/ProjectDataModel/RimWellPath.cpp
View File

@ -451,7 +451,7 @@ double RimWellPath::combinedScaleFactor() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellPath::setUnitSystem(RimUnitSystem::UnitSystem unitSystem)
void RimWellPath::setUnitSystem(RiaEclipseUnitTools::UnitSystem unitSystem)
{
m_unitSystem = unitSystem;
}
@ -459,7 +459,7 @@ void RimWellPath::setUnitSystem(RimUnitSystem::UnitSystem unitSystem)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimUnitSystem::UnitSystem RimWellPath::unitSystem() const
RiaEclipseUnitTools::UnitSystem RimWellPath::unitSystem() const
{
return m_unitSystem();
}

8
ApplicationCode/ProjectDataModel/RimWellPath.h
View File

@ -20,7 +20,7 @@
#pragma once
#include "RimUnitSystem.h"
#include "RiaEclipseUnitTools.h"
#include "cafPdmField.h"
#include "cafPdmObject.h"
@ -91,8 +91,8 @@ public:
double combinedScaleFactor() const;
void setUnitSystem(RimUnitSystem::UnitSystem unitSystem);
RimUnitSystem::UnitSystem unitSystem() const;
void setUnitSystem(RiaEclipseUnitTools::UnitSystem unitSystem);
RiaEclipseUnitTools::UnitSystem unitSystem() const;
private:
@ -117,7 +117,7 @@ private:
caf::PdmField<QString> m_surveyType;
caf::PdmField<double> m_datumElevation;
caf::PdmField<RimUnitSystem::UnitSystemType> m_unitSystem;
caf::PdmField<RiaEclipseUnitTools::UnitSystemType> m_unitSystem;
caf::PdmChildField<RimWellPathCompletions*> m_completions;

10
ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp
View File

@ -420,13 +420,13 @@ void RimWellPathCollection::sortWellsByName()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimUnitSystem::UnitSystemType RimWellPathCollection::findUnitSystemForWellPath(const RimWellPath* wellPath)
RiaEclipseUnitTools::UnitSystemType RimWellPathCollection::findUnitSystemForWellPath(const RimWellPath* wellPath)
{
RimProject* project;
firstAncestorOrThisOfTypeAsserted(project);
if (project->activeOilField()->analysisModels->cases.empty())
{
return RimUnitSystem::UNITS_UNKNOWN;
return RiaEclipseUnitTools::UNITS_UNKNOWN;
}
const RigEclipseCaseData* eclipseCaseData = project->activeOilField()->analysisModels->cases()[0]->eclipseCaseData();
@ -441,12 +441,12 @@ RimUnitSystem::UnitSystemType RimWellPathCollection::findUnitSystemForWellPath(c
{
if (eclipseCaseData->unitsType() == RigEclipseCaseData::UNITS_FIELD)
{
return RimUnitSystem::UNITS_FIELD;
return RiaEclipseUnitTools::UNITS_FIELD;
}
else if (eclipseCaseData->unitsType() == RigEclipseCaseData::UNITS_METRIC)
{
return RimUnitSystem::UNITS_METRIC;
return RiaEclipseUnitTools::UNITS_METRIC;
}
}
return RimUnitSystem::UNITS_UNKNOWN;
return RiaEclipseUnitTools::UNITS_UNKNOWN;
}

4
ApplicationCode/ProjectDataModel/RimWellPathCollection.h
View File

@ -20,7 +20,7 @@
#pragma once
#include "RimUnitSystem.h"
#include "RiaEclipseUnitTools.h"
#include "cafPdmChildArrayField.h"
#include "cafPdmField.h"
@ -102,7 +102,7 @@ private:
void readAndAddWellPaths(std::vector<RimWellPath*>& wellPathArray);
void sortWellsByName();
RimUnitSystem::UnitSystemType findUnitSystemForWellPath(const RimWellPath* wellPath);
RiaEclipseUnitTools::UnitSystemType findUnitSystemForWellPath(const RimWellPath* wellPath);
cvf::ref<RivWellPathCollectionPartMgr> m_wellPathCollectionPartManager;

6
ApplicationCode/ReservoirDataModel/RigWellLogCurveData.cpp
View File

@ -21,7 +21,7 @@
#include "RigCurveDataTools.h"
#include "RimUnitSystem.h"
#include "RiaEclipseUnitTools.h"
#include "cvfMath.h"
#include "cvfAssert.h"
@ -368,7 +368,7 @@ std::vector<double> RigWellLogCurveData::convertFromMeterToFeet(const std::vecto
for (size_t i = 0; i < valuesInMeter.size(); i++)
{
valuesInFeet[i] = valuesInMeter[i] * RimUnitSystem::feetPerMeter();
valuesInFeet[i] = valuesInMeter[i] * RiaEclipseUnitTools::feetPerMeter();
}
return valuesInFeet;
@ -383,7 +383,7 @@ std::vector<double> RigWellLogCurveData::convertFromFeetToMeter(const std::vecto
for (size_t i = 0; i < valuesInFeet.size(); i++)
{
valuesInMeter[i] = valuesInFeet[i] / RimUnitSystem::feetPerMeter();
valuesInMeter[i] = valuesInFeet[i] / RiaEclipseUnitTools::feetPerMeter();
}
return valuesInMeter;