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

Janitor: Remove disabling of clang-format for fracture-related files.

Browse Source
This commit is contained in:
Kristian Bendiksen
2021-01-20 09:14:54 +01:00
committed by Magne Sjaastad
parent 953e7bd18e
commit d072138484
8 changed files with 374 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationLibCode/CommandFileInterface/RicfScaleFractureTemplate.cpp
View File

@@ -34,8 +34,6 @@ CAF_PDM_SOURCE_INIT( RicfScaleFractureTemplate, "scaleFractureTemplate" );
//--------------------------------------------------------------------------------------------------
RicfScaleFractureTemplate::RicfScaleFractureTemplate()
{
// clang-format off
CAF_PDM_InitScriptableField( &m_id, "id", -1, "Id", "", "", "" );
CAF_PDM_InitScriptableField( &m_halfLengthScaleFactor, "halfLength", 1.0, "HalfLengthScaleFactor", "", "", "" );
CAF_PDM_InitScriptableField( &m_heightScaleFactor, "height", 1.0, "HeightScaleFactor", "", "", "" );
@@ -43,8 +41,6 @@ RicfScaleFractureTemplate::RicfScaleFractureTemplate()
CAF_PDM_InitScriptableField( &m_conductivityScaleFactor, "conductivity", 1.0, "ConductivityScaleFactor", "", "", "" );
CAF_PDM_InitScriptableField( &m_OBSOLETE_widthScaleFactor, "width", 1.0, "WidthScaleFactor", "", "", "" );
// clang-format on
}
//--------------------------------------------------------------------------------------------------

4
ApplicationLibCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp
View File

@@ -50,8 +50,6 @@ CAF_PDM_SOURCE_INIT( RimEllipseFractureTemplate, "RimEllipseFractureTemplate" );
//--------------------------------------------------------------------------------------------------
RimEllipseFractureTemplate::RimEllipseFractureTemplate()
{
// clang-format off
CAF_PDM_InitObject( "Fracture Template", ":/FractureTemplate16x16.png", "", "" );
CAF_PDM_InitField( &m_halfLength, "HalfLength", 0.0, "Half Length X<sub>f</sub>", "", "", "" );
@@ -62,8 +60,6 @@ RimEllipseFractureTemplate::RimEllipseFractureTemplate()
m_fractureGrid = new RigFractureGrid();
createFractureGridAndAssignConductivities();
// clang-format on
setDeletable( true );
}

35
ApplicationLibCode/ProjectDataModel/Completions/RimFracture.cpp
View File

@@ -95,8 +95,6 @@ void setDefaultFractureColorResult()
//--------------------------------------------------------------------------------------------------
RimFracture::RimFracture()
{
// clang-format off
CAF_PDM_InitObject( "Fracture", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_fractureTemplate, "FractureDef", "Fracture Template", "", "", "" );
@@ -104,7 +102,13 @@ RimFracture::RimFracture()
m_editFractureTemplate.uiCapability()->setUiEditorTypeName( caf::PdmUiToolButtonEditor::uiEditorTypeName() );
m_editFractureTemplate.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
CAF_PDM_InitField(&m_createEllipseFractureTemplate, "CreateEllipseTemplate", false, "No Fracture Templates Found.", "", "", "");
CAF_PDM_InitField( &m_createEllipseFractureTemplate,
"CreateEllipseTemplate",
false,
"No Fracture Templates Found.",
"",
"",
"" );
m_createEllipseFractureTemplate.uiCapability()->setUiEditorTypeName( caf::PdmUiPushButtonEditor::uiEditorTypeName() );
m_createEllipseFractureTemplate.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP );
@@ -132,7 +136,13 @@ RimFracture::RimFracture()
CAF_PDM_InitField( &m_dip, "Dip", 0.0, "Dip", "", "", "" );
CAF_PDM_InitField( &m_tilt, "Tilt", 0.0, "Tilt", "", "", "" );
CAF_PDM_InitField(&m_fractureUnit, "FractureUnit", caf::AppEnum<RiaEclipseUnitTools::UnitSystem>(RiaEclipseUnitTools::UnitSystem::UNITS_METRIC), "Fracture Unit System", "", "", "");
CAF_PDM_InitField( &m_fractureUnit,
"FractureUnit",
caf::AppEnum<RiaEclipseUnitTools::UnitSystem>( RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ),
"Fracture Unit System",
"",
"",
"" );
m_fractureUnit.uiCapability()->setUiReadOnly( true );
CAF_PDM_InitField( &m_stimPlanTimeIndexToPlot, "TimeIndexToPlot", 0, "StimPlan Time Step", "", "", "" );
@@ -142,18 +152,27 @@ RimFracture::RimFracture()
m_uiWellPathAzimuth.uiCapability()->setUiReadOnly( true );
m_uiWellPathAzimuth.xmlCapability()->disableIO();
CAF_PDM_InitFieldNoDefault(&m_uiWellFractureAzimuthDiff, "WellFractureAzimuthDiff", "Azimuth Difference Between\nFracture and Well", "", "", "");
CAF_PDM_InitFieldNoDefault( &m_uiWellFractureAzimuthDiff,
"WellFractureAzimuthDiff",
"Azimuth Difference Between\nFracture and Well",
"",
"",
"" );
m_uiWellFractureAzimuthDiff.registerGetMethod( this, &RimFracture::wellFractureAzimuthDiffText );
m_uiWellFractureAzimuthDiff.uiCapability()->setUiReadOnly( true );
m_uiWellFractureAzimuthDiff.xmlCapability()->disableIO();
CAF_PDM_InitField(&m_wellFractureAzimuthAngleWarning, "WellFractureAzimithAngleWarning", QString("Difference is below 10 degrees. Consider longitudinal fracture"), "", "", "", "");
CAF_PDM_InitField( &m_wellFractureAzimuthAngleWarning,
"WellFractureAzimithAngleWarning",
QString( "Difference is below 10 degrees. Consider longitudinal fracture" ),
"",
"",
"",
"" );
m_wellFractureAzimuthAngleWarning.uiCapability()->setUiReadOnly( true );
m_wellFractureAzimuthAngleWarning.xmlCapability()->disableIO();
m_fracturePartMgr = new RivWellFracturePartMgr( this );
// clang-format on
}
//--------------------------------------------------------------------------------------------------

74
ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplate.cpp
View File

@@ -35,8 +35,6 @@
#include <cmath>
// clang-format off
namespace caf
{
template <>
@@ -95,11 +93,11 @@ namespace caf
setDefault( RimFractureTemplate::USER_DEFINED_BETA_FACTOR );
}
}
} // namespace caf
// TODO Move to cafPdmObject.h
#define CAF_PDM_InitField_Basic(field, keyword, default, uiName) CAF_PDM_InitField(field, keyword, default, uiName, "", "", "")
#define CAF_PDM_InitField_Basic( field, keyword, default, uiName ) \
CAF_PDM_InitField( field, keyword, default, uiName, "", "", "" )
CAF_PDM_XML_ABSTRACT_SOURCE_INIT( RimFractureTemplate, "RimFractureTemplate" );
@@ -120,11 +118,24 @@ RimFractureTemplate::RimFractureTemplate()
m_nameAndUnit.uiCapability()->setUiHidden( true );
m_nameAndUnit.xmlCapability()->disableIO();
CAF_PDM_InitField(&m_fractureTemplateUnit, "UnitSystem", caf::AppEnum<RiaEclipseUnitTools::UnitSystem>(RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN), "Units System", "", "", "");
CAF_PDM_InitField( &m_fractureTemplateUnit,
"UnitSystem",
caf::AppEnum<RiaEclipseUnitTools::UnitSystem>( RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN ),
"Units System",
"",
"",
"" );
m_fractureTemplateUnit.uiCapability()->setUiReadOnly( true );
CAF_PDM_InitField(&m_orientationType, "Orientation", caf::AppEnum<FracOrientationEnum>(TRANSVERSE_WELL_PATH), "Fracture Orientation", "", "", "");
CAF_PDM_InitField(&m_azimuthAngle, "AzimuthAngle", 0.0f, "Azimuth Angle", "", "", ""); //Is this correct description?
CAF_PDM_InitField( &m_orientationType,
"Orientation",
caf::AppEnum<FracOrientationEnum>( TRANSVERSE_WELL_PATH ),
"Fracture Orientation",
"",
"",
"" );
CAF_PDM_InitField( &m_azimuthAngle, "AzimuthAngle", 0.0f, "Azimuth Angle", "", "", "" ); // Is this correct
// description?
CAF_PDM_InitField( &m_skinFactor, "SkinFactor", 0.0f, "Skin Factor", "", "", "" );
CAF_PDM_InitField( &m_perforationLength, "PerforationLength", 1.0, "Perforation Length", "", "", "" );
@@ -133,7 +144,13 @@ RimFractureTemplate::RimFractureTemplate()
m_perforationEfficiency.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() );
CAF_PDM_InitField( &m_wellDiameter, "WellDiameter", 0.216, "Well Diameter at Fracture", "", "", "" );
CAF_PDM_InitField(&m_conductivityType, "ConductivityType", caf::AppEnum<FracConductivityEnum>(FINITE_CONDUCTIVITY), "Conductivity in Fracture", "", "", "");
CAF_PDM_InitField( &m_conductivityType,
"ConductivityType",
caf::AppEnum<FracConductivityEnum>( FINITE_CONDUCTIVITY ),
"Conductivity in Fracture",
"",
"",
"" );
CAF_PDM_InitFieldNoDefault( &m_fractureContainment, "FractureContainmentField", "Fracture Containment", "", "", "" );
m_fractureContainment = new RimFractureContainment();
@@ -149,14 +166,35 @@ RimFractureTemplate::RimFractureTemplate()
CAF_PDM_InitField_Basic( &m_fractureWidth, "FractureWidth", 0.01, "Fracture Width (h)" );
CAF_PDM_InitFieldNoDefault( &m_betaFactorType, "BetaFactorType", "Type", "", "", "" );
CAF_PDM_InitField_Basic(&m_inertialCoefficient, "InertialCoefficient", 0.006083236, "<html>Inertial Coefficient (&beta;)</html> [Forch. unit]");
CAF_PDM_InitField_Basic( &m_inertialCoefficient,
"InertialCoefficient",
0.006083236,
"<html>Inertial Coefficient (&beta;)</html> [Forch. unit]" );
CAF_PDM_InitFieldNoDefault( &m_permeabilityType, "PermeabilityType", "Type", "", "", "" );
CAF_PDM_InitField_Basic( &m_relativePermeability, "RelativePermeability", 1.0, "Relative Permeability" );
CAF_PDM_InitField(&m_userDefinedEffectivePermeability, "EffectivePermeability",0.0, "Effective Permeability (Ke) [mD]", "", "", "");
CAF_PDM_InitField( &m_userDefinedEffectivePermeability,
"EffectivePermeability",
0.0,
"Effective Permeability (Ke) [mD]",
"",
"",
"" );
CAF_PDM_InitField(&m_relativeGasDensity, "RelativeGasDensity", 0.8, "<html>Relative Gas Density (&gamma;)</html>", "", "Relative density of gas at surface conditions with respect to air at STP", "");
CAF_PDM_InitField(&m_gasViscosity, "GasViscosity", 0.02, "<html>Gas Viscosity (&mu;)</html> [cP]", "", "Gas viscosity at bottom hole pressure", "");
CAF_PDM_InitField( &m_relativeGasDensity,
"RelativeGasDensity",
0.8,
"<html>Relative Gas Density (&gamma;)</html>",
"",
"Relative density of gas at surface conditions with respect to air at STP",
"" );
CAF_PDM_InitField( &m_gasViscosity,
"GasViscosity",
0.02,
"<html>Gas Viscosity (&mu;)</html> [cP]",
"",
"Gas viscosity at bottom hole pressure",
"" );
CAF_PDM_InitFieldNoDefault( &m_dFactorDisplayField, "dFactorDisplayField", "D Factor", "", "", "" );
m_dFactorDisplayField.registerGetMethod( this, &RimFractureTemplate::dFactorForTemplate );
@@ -174,7 +212,13 @@ RimFractureTemplate::RimFractureTemplate()
CAF_PDM_InitField( &m_heightScaleFactor, "HeightScaleFactor", 1.0, "Height", "", "", "" );
CAF_PDM_InitField( &m_halfLengthScaleFactor, "WidthScaleFactor", 1.0, "Half Length", "", "", "" );
CAF_PDM_InitField( &m_dFactorScaleFactor, "DFactorScaleFactor", 1.0, "D-factor", "", "", "" );
CAF_PDM_InitField(&m_conductivityScaleFactor, "ConductivityFactor", 1.0, "Conductivity", "", "The conductivity values read from file will be scaled with this parameters", "");
CAF_PDM_InitField( &m_conductivityScaleFactor,
"ConductivityFactor",
1.0,
"Conductivity",
"",
"The conductivity values read from file will be scaled with this parameters",
"" );
CAF_PDM_InitField( &m_scaleApplyButton, "ScaleApplyButton", false, "Apply", "", "", "" );
m_scaleApplyButton.xmlCapability()->disableIO();
@@ -182,8 +226,6 @@ RimFractureTemplate::RimFractureTemplate()
m_scaleApplyButton.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
}
// clang-format on
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/ProjectDataModel/Completions/RimPerforationInterval.cpp
View File

@@ -39,7 +39,6 @@ CAF_PDM_SOURCE_INIT( RimPerforationInterval, "Perforation" );
//--------------------------------------------------------------------------------------------------
RimPerforationInterval::RimPerforationInterval()
{
// clang-format off
CAF_PDM_InitObject( "Perforation", ":/PerforationInterval16x16.png", "", "" );
CAF_PDM_InitField( &m_startMD, "StartMeasuredDepth", 0.0, "Start MD", "", "", "" );
@@ -63,7 +62,6 @@ RimPerforationInterval::RimPerforationInterval()
m_startMD.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() );
m_endMD.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() );
// clang-format on
setDeletable( true );
}

20
ApplicationLibCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp
View File

@@ -65,8 +65,6 @@ CAF_PDM_SOURCE_INIT( RimStimPlanFractureTemplate, "RimStimPlanFractureTemplate"
//--------------------------------------------------------------------------------------------------
RimStimPlanFractureTemplate::RimStimPlanFractureTemplate()
{
// clang-format off
CAF_PDM_InitObject( "Fracture Template", ":/FractureTemplate16x16.png", "", "" );
CAF_PDM_InitFieldNoDefault( &m_stimPlanFileName, "StimPlanFileName", "File Name", "", "", "" );
@@ -75,14 +73,25 @@ RimStimPlanFractureTemplate::RimStimPlanFractureTemplate()
CAF_PDM_InitField( &m_wellPathDepthAtFracture, "WellPathDepthAtFracture", 0.0, "Well/Fracture Intersection Depth", "", "", "" );
m_wellPathDepthAtFracture.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() );
CAF_PDM_InitField(&m_useUserDefinedWellPathDepthAtFracture, "UseUserDefinedWellPathDepthAtFracture", false,
"Use User-Defined Well/Fracture Intersection Depth", "", "", "");
CAF_PDM_InitField( &m_useUserDefinedWellPathDepthAtFracture,
"UseUserDefinedWellPathDepthAtFracture",
false,
"Use User-Defined Well/Fracture Intersection Depth",
"",
"",
"" );
CAF_PDM_InitField( &m_borderPolygonResultName, "BorderPolygonResultName", QString( "" ), "Parameter", "", "", "" );
m_borderPolygonResultName.uiCapability()->setUiHidden( true );
CAF_PDM_InitField( &m_activeTimeStepIndex, "ActiveTimeStepIndex", 0, "Active TimeStep Index", "", "", "" );
CAF_PDM_InitField(&m_conductivityResultNameOnFile, "ConductivityResultName", QString(""), "Active Conductivity Result Name", "", "", "");
CAF_PDM_InitField( &m_conductivityResultNameOnFile,
"ConductivityResultName",
QString( "" ),
"Active Conductivity Result Name",
"",
"",
"" );
CAF_PDM_InitField( &m_showStimPlanMesh_OBSOLETE, "ShowStimPlanMesh", true, "", "", "", "" );
m_showStimPlanMesh_OBSOLETE.uiCapability()->setUiHidden( true );
@@ -90,7 +99,6 @@ RimStimPlanFractureTemplate::RimStimPlanFractureTemplate()
m_fractureGrid = new RigFractureGrid();
m_readError = false;
// clang-format on
setDeletable( true );
}

111
ApplicationLibCode/ProjectDataModel/Completions/RimWellPathAicdParameters.cpp
View File

@@ -35,27 +35,106 @@ CAF_PDM_SOURCE_INIT( RimWellPathAicdParameters, "WellPathAicdParameters" );
//--------------------------------------------------------------------------------------------------
RimWellPathAicdParameters::RimWellPathAicdParameters()
{
// clang-format off
CAF_PDM_InitObject( "RimWellPathAicdParameters", "", "", "" );
CAF_PDM_InitField( &m_deviceOpen, "DeviceOpen", true, "Device Open?", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_aicdParameterFields[AICD_STRENGTH], "StrengthAICD", "Strength of AICD", "", "", "" );
CAF_PDM_InitFieldNoDefault(&m_aicdParameterFields[AICD_DENSITY_CALIB_FLUID], "DensityCalibrationFluid", "Calibration Fluid Density (kg/m^3)", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_aicdParameterFields[AICD_VISCOSITY_CALIB_FLUID], "ViscosityCalibrationFluid", "Calibration Fluid Viscosity (cP)", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_aicdParameterFields[AICD_VOL_FLOW_EXP], "VolumeFlowRateExponent", "Volume Flow Rate Exponent", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_aicdParameterFields[AICD_VISOSITY_FUNC_EXP], "ViscosityFunctionExponent", "Viscosity Function Exponent", "", "", "");
CAF_PDM_InitFieldNoDefault( &m_aicdParameterFields[AICD_DENSITY_CALIB_FLUID],
"DensityCalibrationFluid",
"Calibration Fluid Density (kg/m^3)",
"",
"",
"" );
CAF_PDM_InitFieldNoDefault( &m_aicdParameterFields[AICD_VISCOSITY_CALIB_FLUID],
"ViscosityCalibrationFluid",
"Calibration Fluid Viscosity (cP)",
"",
"",
"" );
CAF_PDM_InitFieldNoDefault( &m_aicdParameterFields[AICD_VOL_FLOW_EXP],
"VolumeFlowRateExponent",
"Volume Flow Rate Exponent",
"",
"",
"" );
CAF_PDM_InitFieldNoDefault( &m_aicdParameterFields[AICD_VISOSITY_FUNC_EXP],
"ViscosityFunctionExponent",
"Viscosity Function Exponent",
"",
"",
"" );
CAF_PDM_InitField(&m_aicdParameterFields[AICD_CRITICAL_WATER_IN_LIQUID_FRAC], "CriticalWaterLiquidFractionEmul", QString("1*"), "Critical Water in Liquid Fraction for emulsions", "", "", "");
CAF_PDM_InitField(&m_aicdParameterFields[AICD_EMULSION_VISC_TRANS_REGION], "ViscosityTransitionRegionEmul", QString("1*"), "Emulsion Viscosity Transition Region", "", "", "");
CAF_PDM_InitField(&m_aicdParameterFields[AICD_MAX_RATIO_EMULSION_VISC], "MaxRatioOfEmulsionVisc", QString("1*"), "Max Ratio of Emulsion to Continuous Viscosity", "", "", "");
CAF_PDM_InitField(&m_aicdParameterFields[AICD_MAX_FLOW_RATE], "MaxFlowRate", QString("1*"), "Max Flow Rate for AICD Device (m^3 / day)", "", "", "");
CAF_PDM_InitField(&m_aicdParameterFields[AICD_EXP_OIL_FRAC_DENSITY], "ExponentOilDensity", QString("1*"), "Density Exponent of Oil Fraction", "", "", "");
CAF_PDM_InitField(&m_aicdParameterFields[AICD_EXP_WATER_FRAC_DENSITY], "ExponentWaterDensity", QString("1*"), "Density Exponent of Water Fraction", "", "", "");
CAF_PDM_InitField(&m_aicdParameterFields[AICD_EXP_GAS_FRAC_DENSITY], "ExponentGasDensity", QString("1*"), "Density Exponent of Gas Fraction", "", "", "");
CAF_PDM_InitField(&m_aicdParameterFields[AICD_EXP_OIL_FRAC_VISCOSITY], "ExponentOilViscosity", QString("1*"), "Viscosity Exponent of Oil Fraction", "", "", "");
CAF_PDM_InitField(&m_aicdParameterFields[AICD_EXP_WATER_FRAC_VISCOSITY], "ExponentWaterViscosity", QString("1*"), "Viscosity Exponent of Water Fraction", "", "", "");
CAF_PDM_InitField(&m_aicdParameterFields[AICD_EXP_GAS_FRAC_VISCOSITY], "ExponentGasViscosity", QString("1*"), "Viscosity Exponent of Gas Fraction", "", "", "");
CAF_PDM_InitField( &m_aicdParameterFields[AICD_CRITICAL_WATER_IN_LIQUID_FRAC],
"CriticalWaterLiquidFractionEmul",
QString( "1*" ),
"Critical Water in Liquid Fraction for emulsions",
"",
"",
"" );
CAF_PDM_InitField( &m_aicdParameterFields[AICD_EMULSION_VISC_TRANS_REGION],
"ViscosityTransitionRegionEmul",
QString( "1*" ),
"Emulsion Viscosity Transition Region",
"",
"",
"" );
CAF_PDM_InitField( &m_aicdParameterFields[AICD_MAX_RATIO_EMULSION_VISC],
"MaxRatioOfEmulsionVisc",
QString( "1*" ),
"Max Ratio of Emulsion to Continuous Viscosity",
"",
"",
"" );
CAF_PDM_InitField( &m_aicdParameterFields[AICD_MAX_FLOW_RATE],
"MaxFlowRate",
QString( "1*" ),
"Max Flow Rate for AICD Device (m^3 / day)",
"",
"",
"" );
CAF_PDM_InitField( &m_aicdParameterFields[AICD_EXP_OIL_FRAC_DENSITY],
"ExponentOilDensity",
QString( "1*" ),
"Density Exponent of Oil Fraction",
"",
"",
"" );
CAF_PDM_InitField( &m_aicdParameterFields[AICD_EXP_WATER_FRAC_DENSITY],
"ExponentWaterDensity",
QString( "1*" ),
"Density Exponent of Water Fraction",
"",
"",
"" );
CAF_PDM_InitField( &m_aicdParameterFields[AICD_EXP_GAS_FRAC_DENSITY],
"ExponentGasDensity",
QString( "1*" ),
"Density Exponent of Gas Fraction",
"",
"",
"" );
CAF_PDM_InitField( &m_aicdParameterFields[AICD_EXP_OIL_FRAC_VISCOSITY],
"ExponentOilViscosity",
QString( "1*" ),
"Viscosity Exponent of Oil Fraction",
"",
"",
"" );
CAF_PDM_InitField( &m_aicdParameterFields[AICD_EXP_WATER_FRAC_VISCOSITY],
"ExponentWaterViscosity",
QString( "1*" ),
"Viscosity Exponent of Water Fraction",
"",
"",
"" );
CAF_PDM_InitField( &m_aicdParameterFields[AICD_EXP_GAS_FRAC_VISCOSITY],
"ExponentGasViscosity",
QString( "1*" ),
"Viscosity Exponent of Gas Fraction",
"",
"",
"" );
std::vector<caf::PdmFieldHandle*> allFields;
this->fields( allFields );
@@ -67,8 +146,6 @@ RimWellPathAicdParameters::RimWellPathAicdParameters()
stringField->uiCapability()->setUiEditorTypeName( caf::PdmUiLineEditor::uiEditorTypeName() );
}
}
// clang-format on
}
//--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/ReservoirDataModel/Completions/RigPerforationTransmissibilityEquations.cpp
View File

@@ -50,13 +50,11 @@ double RigPerforationTransmissibilityEquations::dFactor( double unitConstant,
double gasDenity,
double gasViscosity )
{
// clang-format off
//
// Ke 1 gasDensity
// D = alpha * beta * -- * -- * ------------
// h rw gasViscosity
//
// clang-format on
const double keOverH = effectivePermeability / perforationLengthInCell;
const double oneOverRw = 1.0 / wellRadius;