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

Rename : Removed s from TRANS to TRAN to be in line with Eclipse naming

Browse Source
This commit is contained in:
Magne Sjaastad 2014-09-09 07:12:43 +02:00
parent e605ceafa2
commit 980207f4a7
6 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/RimDefines.cpp
View File

@ -64,7 +64,7 @@ bool RimDefines::isPerCellFaceResult(const QString& resultName)
{ {
return true; return true;
} }
else if (resultName.compare(RimDefines::combinedRiTransResultName(), Qt::CaseInsensitive) == 0) else if (resultName.compare(RimDefines::combinedRiTranResultName(), Qt::CaseInsensitive) == 0)
{ {
return true; return true;
} }
@ -72,7 +72,7 @@ bool RimDefines::isPerCellFaceResult(const QString& resultName)
{ {
return true; return true;
} }
else if (resultName.compare(RimDefines::combinedRiAreaNormTransResultName(), Qt::CaseInsensitive) == 0) else if (resultName.compare(RimDefines::combinedRiAreaNormTranResultName(), Qt::CaseInsensitive) == 0)
{ {
return true; return true;
} }

18
ApplicationCode/ProjectDataModel/RimDefines.h
View File

@ -43,24 +43,24 @@ public:
static QString undefinedResultName() { return "None"; } static QString undefinedResultName() { return "None"; }
static QString undefinedGridFaultName() { return "Undefined grid faults"; } static QString undefinedGridFaultName() { return "Undefined grid faults"; }
static QString combinedTransmissibilityResultName() { return "TRANSXYZ"; } static QString combinedTransmissibilityResultName() { return "TRANXYZ"; }
static QString ternarySaturationResultName() { return "TERNARY"; } static QString ternarySaturationResultName() { return "TERNARY"; }
static QString combinedMultResultName() { return "MULTXYZ"; } static QString combinedMultResultName() { return "MULTXYZ"; }
static QString riTransXResultName() { return "riTRANSX"; } static QString riTranXResultName() { return "riTRANX"; }
static QString riTransYResultName() { return "riTRANSY"; } static QString riTranYResultName() { return "riTRANY"; }
static QString riTransZResultName() { return "riTRANSZ"; } static QString riTranZResultName() { return "riTRANZ"; }
static QString combinedRiTransResultName() { return "riTRANSXYZ"; } static QString combinedRiTranResultName() { return "riTRANXYZ"; }
static QString riMultXResultName() { return "riMULTX"; } static QString riMultXResultName() { return "riMULTX"; }
static QString riMultYResultName() { return "riMULTY"; } static QString riMultYResultName() { return "riMULTY"; }
static QString riMultZResultName() { return "riMULTZ"; } static QString riMultZResultName() { return "riMULTZ"; }
static QString combinedRiMultResultName() { return "riMULTXYZ"; } static QString combinedRiMultResultName() { return "riMULTXYZ"; }
static QString riAreaNormTransXResultName() { return "riTRANSXbyArea"; } static QString riAreaNormTranXResultName() { return "riTRANXbyArea"; }
static QString riAreaNormTransYResultName() { return "riTRANSYbyArea"; } static QString riAreaNormTranYResultName() { return "riTRANYbyArea"; }
static QString riAreaNormTransZResultName() { return "riTRANSZbyArea"; } static QString riAreaNormTranZResultName() { return "riTRANZbyArea"; }
static QString combinedRiAreaNormTransResultName() { return "riTRANSXYZbyArea"; } static QString combinedRiAreaNormTranResultName() { return "riTRANXYZbyArea"; }
// Mock model text identifiers // Mock model text identifiers
static QString mockModelBasic() { return "Result Mock Debug Model Simple"; } static QString mockModelBasic() { return "Result Mock Debug Model Simple"; }

52
ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp
View File

@ -282,16 +282,16 @@ size_t RimReservoirCellResultsStorage::findOrLoadScalarResult(RimDefines::Result
this->findOrLoadScalarResult(type, "MULTZ"); this->findOrLoadScalarResult(type, "MULTZ");
this->findOrLoadScalarResult(type, "MULTZ-"); this->findOrLoadScalarResult(type, "MULTZ-");
} }
else if (resultName == RimDefines::combinedRiTransResultName()) else if (resultName == RimDefines::combinedRiTranResultName())
{ {
computeRiTransComponent(RimDefines::riTransXResultName()); computeRiTransComponent(RimDefines::riTranXResultName());
computeRiTransComponent(RimDefines::riTransYResultName()); computeRiTransComponent(RimDefines::riTranYResultName());
computeRiTransComponent(RimDefines::riTransZResultName()); computeRiTransComponent(RimDefines::riTranZResultName());
computeNncCombRiTrans(); computeNncCombRiTrans();
} }
else if (resultName == RimDefines::riTransXResultName() else if (resultName == RimDefines::riTranXResultName()
|| resultName == RimDefines::riTransYResultName() || resultName == RimDefines::riTranYResultName()
|| resultName == RimDefines::riTransZResultName()) || resultName == RimDefines::riTranZResultName())
{ {
computeRiTransComponent(resultName); computeRiTransComponent(resultName);
} }
@ -309,16 +309,16 @@ size_t RimReservoirCellResultsStorage::findOrLoadScalarResult(RimDefines::Result
{ {
computeRiMULTComponent(resultName); computeRiMULTComponent(resultName);
} }
else if (resultName == RimDefines::combinedRiAreaNormTransResultName()) else if (resultName == RimDefines::combinedRiAreaNormTranResultName())
{ {
computeRiTRANSbyAreaComponent(RimDefines::riAreaNormTransXResultName()); computeRiTRANSbyAreaComponent(RimDefines::riAreaNormTranXResultName());
computeRiTRANSbyAreaComponent(RimDefines::riAreaNormTransYResultName()); computeRiTRANSbyAreaComponent(RimDefines::riAreaNormTranYResultName());
computeRiTRANSbyAreaComponent(RimDefines::riAreaNormTransZResultName()); computeRiTRANSbyAreaComponent(RimDefines::riAreaNormTranZResultName());
computeNncCombRiTRANSbyArea(); computeNncCombRiTRANSbyArea();
} }
else if (resultName == RimDefines::riAreaNormTransXResultName() else if (resultName == RimDefines::riAreaNormTranXResultName()
|| resultName == RimDefines::riAreaNormTransYResultName() || resultName == RimDefines::riAreaNormTranYResultName()
|| resultName == RimDefines::riAreaNormTransZResultName()) || resultName == RimDefines::riAreaNormTranZResultName())
{ {
computeRiTRANSbyAreaComponent(resultName); computeRiTRANSbyAreaComponent(resultName);
} }
@ -785,17 +785,17 @@ void RimReservoirCellResultsStorage::computeRiTransComponent(const QString& riTr
cvf::StructGridInterface::FaceType faceId; cvf::StructGridInterface::FaceType faceId;
QString permCompName; QString permCompName;
if (riTransComponentResultName == RimDefines::riTransXResultName()) if (riTransComponentResultName == RimDefines::riTranXResultName())
{ {
permCompName = "PERMX"; permCompName = "PERMX";
faceId = cvf::StructGridInterface::POS_I; faceId = cvf::StructGridInterface::POS_I;
} }
else if (riTransComponentResultName == RimDefines::riTransYResultName()) else if (riTransComponentResultName == RimDefines::riTranYResultName())
{ {
permCompName = "PERMY"; permCompName = "PERMY";
faceId = cvf::StructGridInterface::POS_J; faceId = cvf::StructGridInterface::POS_J;
} }
else if (riTransComponentResultName == RimDefines::riTransZResultName()) else if (riTransComponentResultName == RimDefines::riTranZResultName())
{ {
permCompName = "PERMZ"; permCompName = "PERMZ";
faceId = cvf::StructGridInterface::POS_K; faceId = cvf::StructGridInterface::POS_K;
@ -947,7 +947,7 @@ void RimReservoirCellResultsStorage::computeNncCombRiTrans()
{ {
if (!m_cellResults) return; if (!m_cellResults) return;
size_t riCombTransScalarResultIndex = m_cellResults->findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::combinedRiTransResultName()); size_t riCombTransScalarResultIndex = m_cellResults->findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::combinedRiTranResultName());
if (m_ownerMainGrid->nncData()->connectionScalarResult(riCombTransScalarResultIndex)) return; if (m_ownerMainGrid->nncData()->connectionScalarResult(riCombTransScalarResultIndex)) return;
double cdarchy = darchysValue(); double cdarchy = darchysValue();
@ -1132,17 +1132,17 @@ void RimReservoirCellResultsStorage::computeRiMULTComponent(const QString& riMul
if (riMultCompName == RimDefines::riMultXResultName()) if (riMultCompName == RimDefines::riMultXResultName())
{ {
riTransCompName = RimDefines::riTransXResultName(); riTransCompName = RimDefines::riTranXResultName();
transCompName = "TRANX"; transCompName = "TRANX";
} }
else if (riMultCompName == RimDefines::riMultYResultName()) else if (riMultCompName == RimDefines::riMultYResultName())
{ {
riTransCompName = RimDefines::riTransYResultName(); riTransCompName = RimDefines::riTranYResultName();
transCompName = "TRANY"; transCompName = "TRANY";
} }
else if (riMultCompName == RimDefines::riMultZResultName()) else if (riMultCompName == RimDefines::riMultZResultName())
{ {
riTransCompName = RimDefines::riTransZResultName(); riTransCompName = RimDefines::riTranZResultName();
transCompName = "TRANZ"; transCompName = "TRANZ";
} }
else else
@ -1193,7 +1193,7 @@ void RimReservoirCellResultsStorage::computeNncCombRiMULT()
if (!m_cellResults) return; if (!m_cellResults) return;
size_t riCombMultScalarResultIndex = m_cellResults->findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::combinedRiMultResultName()); size_t riCombMultScalarResultIndex = m_cellResults->findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::combinedRiMultResultName());
size_t riCombTransScalarResultIndex = m_cellResults->findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::combinedRiTransResultName()); size_t riCombTransScalarResultIndex = m_cellResults->findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::combinedRiTranResultName());
size_t combTransScalarResultIndex = m_cellResults->findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::combinedTransmissibilityResultName()); size_t combTransScalarResultIndex = m_cellResults->findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::combinedTransmissibilityResultName());
if (m_ownerMainGrid->nncData()->connectionScalarResult(riCombMultScalarResultIndex)) return; if (m_ownerMainGrid->nncData()->connectionScalarResult(riCombMultScalarResultIndex)) return;
@ -1220,17 +1220,17 @@ void RimReservoirCellResultsStorage::computeRiTRANSbyAreaComponent(const QString
cvf::StructGridInterface::FaceType faceId; cvf::StructGridInterface::FaceType faceId;
QString transCompName; QString transCompName;
if (riTransByAreaCompResultName == RimDefines::riAreaNormTransXResultName()) if (riTransByAreaCompResultName == RimDefines::riAreaNormTranXResultName())
{ {
transCompName = "TRANX"; transCompName = "TRANX";
faceId = cvf::StructGridInterface::POS_I; faceId = cvf::StructGridInterface::POS_I;
} }
else if (riTransByAreaCompResultName == RimDefines::riAreaNormTransYResultName()) else if (riTransByAreaCompResultName == RimDefines::riAreaNormTranYResultName())
{ {
transCompName = "TRANY"; transCompName = "TRANY";
faceId = cvf::StructGridInterface::POS_J; faceId = cvf::StructGridInterface::POS_J;
} }
else if (riTransByAreaCompResultName == RimDefines::riAreaNormTransZResultName()) else if (riTransByAreaCompResultName == RimDefines::riAreaNormTranZResultName())
{ {
transCompName = "TRANZ"; transCompName = "TRANZ";
faceId = cvf::StructGridInterface::POS_K; faceId = cvf::StructGridInterface::POS_K;
@ -1330,7 +1330,7 @@ void RimReservoirCellResultsStorage::computeNncCombRiTRANSbyArea()
{ {
if (!m_cellResults) return; if (!m_cellResults) return;
size_t riCombTransByAreaScResIdx = m_cellResults->findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::combinedRiAreaNormTransResultName()); size_t riCombTransByAreaScResIdx = m_cellResults->findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::combinedRiAreaNormTranResultName());
size_t combTransScalarResultIndex = m_cellResults->findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::combinedTransmissibilityResultName()); size_t combTransScalarResultIndex = m_cellResults->findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::combinedTransmissibilityResultName());
if (m_ownerMainGrid->nncData()->connectionScalarResult(riCombTransByAreaScResIdx)) return; if (m_ownerMainGrid->nncData()->connectionScalarResult(riCombTransByAreaScResIdx)) return;

38
ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp
View File

@ -262,12 +262,12 @@ size_t RigCaseCellResultsData::addEmptyScalarResult(RimDefines::ResultCatType ty
statisticsCalculator = calc; statisticsCalculator = calc;
} }
else if (resultName == RimDefines::combinedRiTransResultName()) else if (resultName == RimDefines::combinedRiTranResultName())
{ {
cvf::ref<RigMultipleDatasetStatCalc> calc = new RigMultipleDatasetStatCalc(); cvf::ref<RigMultipleDatasetStatCalc> calc = new RigMultipleDatasetStatCalc();
calc->addNativeStatisticsCalculator(this, findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::riTransXResultName())); calc->addNativeStatisticsCalculator(this, findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::riTranXResultName()));
calc->addNativeStatisticsCalculator(this, findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::riTransYResultName())); calc->addNativeStatisticsCalculator(this, findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::riTranYResultName()));
calc->addNativeStatisticsCalculator(this, findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::riTransZResultName())); calc->addNativeStatisticsCalculator(this, findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::riTranZResultName()));
statisticsCalculator = calc; statisticsCalculator = calc;
} }
else if (resultName == RimDefines::combinedRiMultResultName()) else if (resultName == RimDefines::combinedRiMultResultName())
@ -278,12 +278,12 @@ size_t RigCaseCellResultsData::addEmptyScalarResult(RimDefines::ResultCatType ty
calc->addNativeStatisticsCalculator(this, findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::riMultZResultName())); calc->addNativeStatisticsCalculator(this, findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::riMultZResultName()));
statisticsCalculator = calc; statisticsCalculator = calc;
} }
else if (resultName == RimDefines::combinedRiAreaNormTransResultName()) else if (resultName == RimDefines::combinedRiAreaNormTranResultName())
{ {
cvf::ref<RigMultipleDatasetStatCalc> calc = new RigMultipleDatasetStatCalc(); cvf::ref<RigMultipleDatasetStatCalc> calc = new RigMultipleDatasetStatCalc();
calc->addNativeStatisticsCalculator(this, findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::riAreaNormTransXResultName())); calc->addNativeStatisticsCalculator(this, findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::riAreaNormTranXResultName()));
calc->addNativeStatisticsCalculator(this, findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::riAreaNormTransYResultName())); calc->addNativeStatisticsCalculator(this, findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::riAreaNormTranYResultName()));
calc->addNativeStatisticsCalculator(this, findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::riAreaNormTransZResultName())); calc->addNativeStatisticsCalculator(this, findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::riAreaNormTranZResultName()));
statisticsCalculator = calc; statisticsCalculator = calc;
} }
else else
@ -557,10 +557,10 @@ void RigCaseCellResultsData::createPlaceholderResultEntries()
&& findScalarResultIndex(RimDefines::STATIC_NATIVE, "PERMY") != cvf::UNDEFINED_SIZE_T && findScalarResultIndex(RimDefines::STATIC_NATIVE, "PERMY") != cvf::UNDEFINED_SIZE_T
&& findScalarResultIndex(RimDefines::STATIC_NATIVE, "PERMZ") != cvf::UNDEFINED_SIZE_T) && findScalarResultIndex(RimDefines::STATIC_NATIVE, "PERMZ") != cvf::UNDEFINED_SIZE_T)
{ {
addStaticScalarResult(RimDefines::STATIC_NATIVE, RimDefines::riTransXResultName(), false, 0); addStaticScalarResult(RimDefines::STATIC_NATIVE, RimDefines::riTranXResultName(), false, 0);
addStaticScalarResult(RimDefines::STATIC_NATIVE, RimDefines::riTransYResultName(), false, 0); addStaticScalarResult(RimDefines::STATIC_NATIVE, RimDefines::riTranYResultName(), false, 0);
addStaticScalarResult(RimDefines::STATIC_NATIVE, RimDefines::riTransZResultName(), false, 0); addStaticScalarResult(RimDefines::STATIC_NATIVE, RimDefines::riTranZResultName(), false, 0);
addStaticScalarResult(RimDefines::STATIC_NATIVE, RimDefines::combinedRiTransResultName(), false, 0); addStaticScalarResult(RimDefines::STATIC_NATIVE, RimDefines::combinedRiTranResultName(), false, 0);
} }
} }
@ -568,9 +568,9 @@ void RigCaseCellResultsData::createPlaceholderResultEntries()
{ {
size_t tranX, tranY, tranZ; size_t tranX, tranY, tranZ;
if (findTransmissibilityResults(tranX, tranY, tranZ) if (findTransmissibilityResults(tranX, tranY, tranZ)
&& findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::riTransXResultName()) != cvf::UNDEFINED_SIZE_T && findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::riTranXResultName()) != cvf::UNDEFINED_SIZE_T
&& findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::riTransYResultName()) != cvf::UNDEFINED_SIZE_T && findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::riTranYResultName()) != cvf::UNDEFINED_SIZE_T
&& findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::riTransZResultName()) != cvf::UNDEFINED_SIZE_T) && findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::riTranZResultName()) != cvf::UNDEFINED_SIZE_T)
{ {
addStaticScalarResult(RimDefines::STATIC_NATIVE, RimDefines::riMultXResultName(), false, 0); addStaticScalarResult(RimDefines::STATIC_NATIVE, RimDefines::riMultXResultName(), false, 0);
addStaticScalarResult(RimDefines::STATIC_NATIVE, RimDefines::riMultYResultName(), false, 0); addStaticScalarResult(RimDefines::STATIC_NATIVE, RimDefines::riMultYResultName(), false, 0);
@ -583,23 +583,23 @@ void RigCaseCellResultsData::createPlaceholderResultEntries()
{ {
if (findScalarResultIndex(RimDefines::STATIC_NATIVE, "TRANX") != cvf::UNDEFINED_SIZE_T) if (findScalarResultIndex(RimDefines::STATIC_NATIVE, "TRANX") != cvf::UNDEFINED_SIZE_T)
{ {
addStaticScalarResult(RimDefines::STATIC_NATIVE, RimDefines::riAreaNormTransXResultName(), false, 0); addStaticScalarResult(RimDefines::STATIC_NATIVE, RimDefines::riAreaNormTranXResultName(), false, 0);
} }
if (findScalarResultIndex(RimDefines::STATIC_NATIVE, "TRANY") != cvf::UNDEFINED_SIZE_T) if (findScalarResultIndex(RimDefines::STATIC_NATIVE, "TRANY") != cvf::UNDEFINED_SIZE_T)
{ {
addStaticScalarResult(RimDefines::STATIC_NATIVE, RimDefines::riAreaNormTransYResultName(), false, 0); addStaticScalarResult(RimDefines::STATIC_NATIVE, RimDefines::riAreaNormTranYResultName(), false, 0);
} }
if (findScalarResultIndex(RimDefines::STATIC_NATIVE, "TRANZ") != cvf::UNDEFINED_SIZE_T) if (findScalarResultIndex(RimDefines::STATIC_NATIVE, "TRANZ") != cvf::UNDEFINED_SIZE_T)
{ {
addStaticScalarResult(RimDefines::STATIC_NATIVE, RimDefines::riAreaNormTransZResultName(), false, 0); addStaticScalarResult(RimDefines::STATIC_NATIVE, RimDefines::riAreaNormTranZResultName(), false, 0);
} }
size_t tranX, tranY, tranZ; size_t tranX, tranY, tranZ;
if (findTransmissibilityResults(tranX, tranY, tranZ)) if (findTransmissibilityResults(tranX, tranY, tranZ))
{ {
addStaticScalarResult(RimDefines::STATIC_NATIVE, RimDefines::combinedRiAreaNormTransResultName(), false, 0); addStaticScalarResult(RimDefines::STATIC_NATIVE, RimDefines::combinedRiAreaNormTranResultName(), false, 0);
} }
} }
} }

16
ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp
View File

@ -79,13 +79,13 @@ cvf::ref<RigResultAccessor> RigResultAccessorFactory::createResultAccessor(RigCa
return cellFaceAccessObject; return cellFaceAccessObject;
} }
else if (uiResultName == RimDefines::combinedRiTransResultName()) else if (uiResultName == RimDefines::combinedRiTranResultName())
{ {
cvf::ref<RigCombTransResultAccessor> cellFaceAccessObject = new RigCombTransResultAccessor(grid); cvf::ref<RigCombTransResultAccessor> cellFaceAccessObject = new RigCombTransResultAccessor(grid);
cvf::ref<RigResultAccessor> xTransAccessor = RigResultAccessorFactory::createNativeResultAccessor(eclipseCase, gridIndex, porosityModel, timeStepIndex, RimDefines::riTransXResultName()); cvf::ref<RigResultAccessor> xTransAccessor = RigResultAccessorFactory::createNativeResultAccessor(eclipseCase, gridIndex, porosityModel, timeStepIndex, RimDefines::riTranXResultName());
cvf::ref<RigResultAccessor> yTransAccessor = RigResultAccessorFactory::createNativeResultAccessor(eclipseCase, gridIndex, porosityModel, timeStepIndex, RimDefines::riTransYResultName()); cvf::ref<RigResultAccessor> yTransAccessor = RigResultAccessorFactory::createNativeResultAccessor(eclipseCase, gridIndex, porosityModel, timeStepIndex, RimDefines::riTranYResultName());
cvf::ref<RigResultAccessor> zTransAccessor = RigResultAccessorFactory::createNativeResultAccessor(eclipseCase, gridIndex, porosityModel, timeStepIndex, RimDefines::riTransZResultName()); cvf::ref<RigResultAccessor> zTransAccessor = RigResultAccessorFactory::createNativeResultAccessor(eclipseCase, gridIndex, porosityModel, timeStepIndex, RimDefines::riTranZResultName());
cellFaceAccessObject->setTransResultAccessors(xTransAccessor.p(), yTransAccessor.p(), zTransAccessor.p()); cellFaceAccessObject->setTransResultAccessors(xTransAccessor.p(), yTransAccessor.p(), zTransAccessor.p());
@ -103,13 +103,13 @@ cvf::ref<RigResultAccessor> RigResultAccessorFactory::createResultAccessor(RigCa
return cellFaceAccessObject; return cellFaceAccessObject;
} }
else if (uiResultName == RimDefines::combinedRiAreaNormTransResultName()) else if (uiResultName == RimDefines::combinedRiAreaNormTranResultName())
{ {
cvf::ref<RigCombTransResultAccessor> cellFaceAccessObject = new RigCombTransResultAccessor(grid); cvf::ref<RigCombTransResultAccessor> cellFaceAccessObject = new RigCombTransResultAccessor(grid);
cvf::ref<RigResultAccessor> xRiAreaNormTransAccessor = RigResultAccessorFactory::createNativeResultAccessor(eclipseCase, gridIndex, porosityModel, timeStepIndex, RimDefines::riAreaNormTransXResultName()); cvf::ref<RigResultAccessor> xRiAreaNormTransAccessor = RigResultAccessorFactory::createNativeResultAccessor(eclipseCase, gridIndex, porosityModel, timeStepIndex, RimDefines::riAreaNormTranXResultName());
cvf::ref<RigResultAccessor> yRiAreaNormTransAccessor = RigResultAccessorFactory::createNativeResultAccessor(eclipseCase, gridIndex, porosityModel, timeStepIndex, RimDefines::riAreaNormTransYResultName()); cvf::ref<RigResultAccessor> yRiAreaNormTransAccessor = RigResultAccessorFactory::createNativeResultAccessor(eclipseCase, gridIndex, porosityModel, timeStepIndex, RimDefines::riAreaNormTranYResultName());
cvf::ref<RigResultAccessor> zRiAreaNormTransAccessor = RigResultAccessorFactory::createNativeResultAccessor(eclipseCase, gridIndex, porosityModel, timeStepIndex, RimDefines::riAreaNormTransZResultName()); cvf::ref<RigResultAccessor> zRiAreaNormTransAccessor = RigResultAccessorFactory::createNativeResultAccessor(eclipseCase, gridIndex, porosityModel, timeStepIndex, RimDefines::riAreaNormTranZResultName());
cellFaceAccessObject->setTransResultAccessors(xRiAreaNormTransAccessor.p(), yRiAreaNormTransAccessor.p(), zRiAreaNormTransAccessor.p()); cellFaceAccessObject->setTransResultAccessors(xRiAreaNormTransAccessor.p(), yRiAreaNormTransAccessor.p(), zRiAreaNormTransAccessor.p());

8
ApplicationCode/UserInterface/RiuResultTextBuilder.cpp
View File

@ -392,9 +392,9 @@ void RiuResultTextBuilder::appendTextFromResultSlot(RigCaseData* eclipseCase, si
resultInfoText->append(QString("MULTZ- : %1\n").arg(scalarValue)); resultInfoText->append(QString("MULTZ- : %1\n").arg(scalarValue));
} }
} }
else if (resultSlot->resultVariable().compare(RimDefines::combinedRiTransResultName(), Qt::CaseInsensitive) == 0) else if (resultSlot->resultVariable().compare(RimDefines::combinedRiTranResultName(), Qt::CaseInsensitive) == 0)
{ {
cvf::ref<RigResultAccessor> transResultAccessor = RigResultAccessorFactory::createResultAccessor(eclipseCase, gridIndex, porosityModel, 0, RimDefines::combinedRiTransResultName()); cvf::ref<RigResultAccessor> transResultAccessor = RigResultAccessorFactory::createResultAccessor(eclipseCase, gridIndex, porosityModel, 0, RimDefines::combinedRiTranResultName());
{ {
double scalarValue = transResultAccessor->cellFaceScalar(cellIndex, cvf::StructGridInterface::POS_I); double scalarValue = transResultAccessor->cellFaceScalar(cellIndex, cvf::StructGridInterface::POS_I);
resultInfoText->append(QString("riTran X : %1\n").arg(scalarValue)); resultInfoText->append(QString("riTran X : %1\n").arg(scalarValue));
@ -420,9 +420,9 @@ void RiuResultTextBuilder::appendTextFromResultSlot(RigCaseData* eclipseCase, si
resultInfoText->append(QString("riMult Z : %1\n").arg(scalarValue)); resultInfoText->append(QString("riMult Z : %1\n").arg(scalarValue));
} }
} }
else if (resultSlot->resultVariable().compare(RimDefines::combinedRiAreaNormTransResultName(), Qt::CaseInsensitive) == 0) else if (resultSlot->resultVariable().compare(RimDefines::combinedRiAreaNormTranResultName(), Qt::CaseInsensitive) == 0)
{ {
cvf::ref<RigResultAccessor> resultAccessor = RigResultAccessorFactory::createResultAccessor(eclipseCase, gridIndex, porosityModel, 0, RimDefines::combinedRiAreaNormTransResultName()); cvf::ref<RigResultAccessor> resultAccessor = RigResultAccessorFactory::createResultAccessor(eclipseCase, gridIndex, porosityModel, 0, RimDefines::combinedRiAreaNormTranResultName());
{ {
double scalarValue = resultAccessor->cellFaceScalar(cellIndex, cvf::StructGridInterface::POS_I); double scalarValue = resultAccessor->cellFaceScalar(cellIndex, cvf::StructGridInterface::POS_I);
resultInfoText->append(QString("riTransByArea X : %1\n").arg(scalarValue)); resultInfoText->append(QString("riTransByArea X : %1\n").arg(scalarValue));