#3696 Non-Darcy perforation intervals : Remove unit constant from UI

This commit is contained in:
Magne Sjaastad
2018-11-22 09:46:40 +01:00
parent 13f8ad5ea8
commit a225d1fd1a
5 changed files with 31 additions and 32 deletions

View File

@@ -20,6 +20,7 @@
#include "RiaApplication.h"
#include "RiaFilePathTools.h"
#include "RiaFractureDefines.h"
#include "RiaLogging.h"
#include "RiaPreferences.h"
@@ -2394,10 +2395,15 @@ double RicWellPathExportCompletionDataFeatureImpl::calculateDFactor(RimEclipseCa
{
using EQ = RigPerforationTransmissibilityEquations;
if (!eclipseCase || !eclipseCase->eclipseCaseData())
{
return std::numeric_limits<double>::infinity();
}
RigEclipseCaseData* eclipseCaseData = eclipseCase->eclipseCaseData();
double porosity = 0.0;
{
RigEclipseCaseData* eclipseCaseData = eclipseCase->eclipseCaseData();
eclipseCase->results(RiaDefines::MATRIX_MODEL)->findOrLoadScalarResult(RiaDefines::STATIC_NATIVE, "PORO");
cvf::ref<RigResultAccessor> poroAccessObject =
RigResultAccessorFactory::createFromUiResultName(eclipseCaseData, 0, RiaDefines::MATRIX_MODEL, 0, "PORO");
@@ -2414,7 +2420,9 @@ double RicWellPathExportCompletionDataFeatureImpl::calculateDFactor(RimEclipseCa
porosity,
nonDarcyParameters->porosityScalingFactor());
return EQ::dFactor(nonDarcyParameters->unitConstant(),
const double alpha = RiaDefines::nonDarcyFlowAlpha(eclipseCaseData->unitsType());
return EQ::dFactor(alpha,
betaFactor,
effectivePermeability,
internalCellLengths.length(),