6877 well fracture intersection per fracture (#7251)

* #6877 Move well/fracture intersection to fracture (from template).
* #6877 Read stimplan xml without scaling and well/fracture intersection offset
* #6877 Move fracture grid to RimFracture from template.
* #6877 Use RiaDefines::conductivityResultName() where applicable.
* #6877 Reintroduce fracture template scaling.
* #6877 Hide well/fracture intersection option for elliptical template
* #7280: Fix crash when picking in first time step of StimPlan fracture
* #7279 Redraw after deleting fracture to make it disappear.
This commit is contained in:
Kristian Bendiksen authored and GitHub committed 2021-01-26 15:32:18 +01:00
1 parent 05aceef936
commit f8aae6691d
22 files changed
+317 -227

No files matched your search

@@ -15,23 +15,14 @@ TEST( RifStimPlanXmlReaderTest, LoadFile )
QString fileName = CASE_REAL_TEST_DATA_DIRECTORY + "small_fracture.xml";
double conductivityScaleFactor = 1.0;
double halfLengthScaleFactor = 1.0;
double heightScaleFactor = 1.0;
double wellPathDepthAtFracture = 100.0;
RiaDefines::EclipseUnitSystem unit = RiaDefines::EclipseUnitSystem::UNITS_METRIC;
QString errorMessage;
RifStimPlanXmlReader::MirrorMode mode = RifStimPlanXmlReader::MIRROR_AUTO;
cvf::ref<RigStimPlanFractureDefinition> fractureData;
fractureData = RifStimPlanXmlReader::readStimPlanXMLFile( fileName,
conductivityScaleFactor,
halfLengthScaleFactor,
heightScaleFactor,
-wellPathDepthAtFracture,
mode,
unit,
&errorMessage );
fractureData =
RifStimPlanXmlReader::readStimPlanXMLFile( fileName, conductivityScaleFactor, mode, unit, &errorMessage );
EXPECT_TRUE( errorMessage.isEmpty() );
EXPECT_TRUE( fractureData.notNull() );
@@ -50,23 +41,14 @@ TEST( RifStimPlanXmlReaderTest, LoadFileNewFormat )
QString fileName = CASE_REAL_TEST_DATA_DIRECTORY + "contour_Metric.xml";
double conductivityScaleFactor = 1.0;
double halfLengthScaleFactor = 1.0;
double heightScaleFactor = 1.0;
double wellPathDepthAtFracture = 100.0;
RiaDefines::EclipseUnitSystem unit = RiaDefines::EclipseUnitSystem::UNITS_METRIC;
QString errorMessage;
RifStimPlanXmlReader::MirrorMode mode = RifStimPlanXmlReader::MIRROR_AUTO;
cvf::ref<RigStimPlanFractureDefinition> fractureData;
fractureData = RifStimPlanXmlReader::readStimPlanXMLFile( fileName,
conductivityScaleFactor,
halfLengthScaleFactor,
heightScaleFactor,
-wellPathDepthAtFracture,
mode,
unit,
&errorMessage );
fractureData =
RifStimPlanXmlReader::readStimPlanXMLFile( fileName, conductivityScaleFactor, mode, unit, &errorMessage );
EXPECT_TRUE( errorMessage.isEmpty() );
EXPECT_TRUE( fractureData.notNull() );