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

Merge branch 'dev' into cmake-improvements

Browse Source
This commit is contained in:
Magne Sjaastad
2018-02-28 08:33:39 +01:00
parent 89c090ba24 267e3ef59d
commit 25a1823f35
141 changed files with 1097 additions and 804 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
View File

@@ -95,14 +95,10 @@ ${CMAKE_CURRENT_LIST_DIR}/RimTimeStepFilter.h
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCalculation.h
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCalculationCollection.h
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCalculationVariable.h
${CMAKE_CURRENT_LIST_DIR}/RimStimPlanLegendConfig.h
${CMAKE_CURRENT_LIST_DIR}/RimStimPlanColors.h
)
if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES)
list (APPEND SOURCE_GROUP_HEADER_FILES
${CMAKE_CURRENT_LIST_DIR}/RimStimPlanLegendConfig.h
${CMAKE_CURRENT_LIST_DIR}/RimStimPlanColors.h
)
endif()
set (SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RimEclipseCaseCollection.cpp
@@ -200,15 +196,10 @@ ${CMAKE_CURRENT_LIST_DIR}/RimTimeStepFilter.cpp
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCalculation.cpp
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCalculationCollection.cpp
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCalculationVariable.cpp
${CMAKE_CURRENT_LIST_DIR}/RimStimPlanLegendConfig.cpp
${CMAKE_CURRENT_LIST_DIR}/RimStimPlanColors.cpp
)
if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES)
list (APPEND SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RimStimPlanLegendConfig.cpp
${CMAKE_CURRENT_LIST_DIR}/RimStimPlanColors.cpp
)
endif()
list(APPEND CODE_HEADER_FILES
${SOURCE_GROUP_HEADER_FILES}
)

56
ApplicationCode/ProjectDataModel/Completions/CMakeLists_files.cmake
View File

@@ -9,25 +9,19 @@ ${CMAKE_CURRENT_LIST_DIR}/RimFishboneWellPathCollection.h
${CMAKE_CURRENT_LIST_DIR}/RimPerforationCollection.h
${CMAKE_CURRENT_LIST_DIR}/RimPerforationInterval.h
${CMAKE_CURRENT_LIST_DIR}/RimWellPathCompletions.h
${CMAKE_CURRENT_LIST_DIR}/RimEllipseFractureTemplate.h
${CMAKE_CURRENT_LIST_DIR}/RimFracture.h
${CMAKE_CURRENT_LIST_DIR}/RimFractureContainment.h
${CMAKE_CURRENT_LIST_DIR}/RimFractureExportSettings.h
${CMAKE_CURRENT_LIST_DIR}/RimFractureTemplate.h
${CMAKE_CURRENT_LIST_DIR}/RimFractureTemplateCollection.h
${CMAKE_CURRENT_LIST_DIR}/RimSimWellFracture.h
${CMAKE_CURRENT_LIST_DIR}/RimSimWellFractureCollection.h
${CMAKE_CURRENT_LIST_DIR}/RimStimPlanFractureTemplate.h
${CMAKE_CURRENT_LIST_DIR}/RimWellPathFracture.h
${CMAKE_CURRENT_LIST_DIR}/RimWellPathFractureCollection.h
)
if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES)
list (APPEND SOURCE_GROUP_HEADER_FILES
${CMAKE_CURRENT_LIST_DIR}/RimEllipseFractureTemplate.h
${CMAKE_CURRENT_LIST_DIR}/RimFracture.h
${CMAKE_CURRENT_LIST_DIR}/RimFractureContainment.h
${CMAKE_CURRENT_LIST_DIR}/RimFractureExportSettings.h
${CMAKE_CURRENT_LIST_DIR}/RimFractureTemplate.h
${CMAKE_CURRENT_LIST_DIR}/RimFractureTemplateCollection.h
${CMAKE_CURRENT_LIST_DIR}/RimSimWellFracture.h
${CMAKE_CURRENT_LIST_DIR}/RimSimWellFractureCollection.h
${CMAKE_CURRENT_LIST_DIR}/RimStimPlanFractureTemplate.h
${CMAKE_CURRENT_LIST_DIR}/RimWellPathFracture.h
${CMAKE_CURRENT_LIST_DIR}/RimWellPathFractureCollection.h
)
endif()
set (SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RimCompletionCellIntersectionCalc.cpp
@@ -39,25 +33,19 @@ ${CMAKE_CURRENT_LIST_DIR}/RimFishboneWellPathCollection.cpp
${CMAKE_CURRENT_LIST_DIR}/RimPerforationCollection.cpp
${CMAKE_CURRENT_LIST_DIR}/RimPerforationInterval.cpp
${CMAKE_CURRENT_LIST_DIR}/RimWellPathCompletions.cpp
${CMAKE_CURRENT_LIST_DIR}/RimEllipseFractureTemplate.cpp
${CMAKE_CURRENT_LIST_DIR}/RimFracture.cpp
${CMAKE_CURRENT_LIST_DIR}/RimFractureContainment.cpp
${CMAKE_CURRENT_LIST_DIR}/RimFractureExportSettings.cpp
${CMAKE_CURRENT_LIST_DIR}/RimFractureTemplate.cpp
${CMAKE_CURRENT_LIST_DIR}/RimFractureTemplateCollection.cpp
${CMAKE_CURRENT_LIST_DIR}/RimSimWellFracture.cpp
${CMAKE_CURRENT_LIST_DIR}/RimSimWellFractureCollection.cpp
${CMAKE_CURRENT_LIST_DIR}/RimStimPlanFractureTemplate.cpp
${CMAKE_CURRENT_LIST_DIR}/RimWellPathFracture.cpp
${CMAKE_CURRENT_LIST_DIR}/RimWellPathFractureCollection.cpp
)
if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES)
list (APPEND SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RimEllipseFractureTemplate.cpp
${CMAKE_CURRENT_LIST_DIR}/RimFracture.cpp
${CMAKE_CURRENT_LIST_DIR}/RimFractureContainment.cpp
${CMAKE_CURRENT_LIST_DIR}/RimFractureExportSettings.cpp
${CMAKE_CURRENT_LIST_DIR}/RimFractureTemplate.cpp
${CMAKE_CURRENT_LIST_DIR}/RimFractureTemplateCollection.cpp
${CMAKE_CURRENT_LIST_DIR}/RimSimWellFracture.cpp
${CMAKE_CURRENT_LIST_DIR}/RimSimWellFractureCollection.cpp
${CMAKE_CURRENT_LIST_DIR}/RimStimPlanFractureTemplate.cpp
${CMAKE_CURRENT_LIST_DIR}/RimWellPathFracture.cpp
${CMAKE_CURRENT_LIST_DIR}/RimWellPathFractureCollection.cpp
)
endif()
list(APPEND CODE_HEADER_FILES
${SOURCE_GROUP_HEADER_FILES}
)

8
ApplicationCode/ProjectDataModel/Completions/RimCompletionCellIntersectionCalc.cpp
View File

@@ -38,7 +38,6 @@
#include "RigWellPathIntersectionTools.h"
#include "RigCellGeometryTools.h"
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
#include "RimFracture.h"
#include "RimWellPathFracture.h"
#include "RimFractureTemplate.h"
@@ -47,7 +46,6 @@
#include "RimSimWellFracture.h"
#include "RigFractureGrid.h"
#include "RigFractureCell.h"
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
#include <QDateTime>
@@ -70,7 +68,6 @@ void RimCompletionCellIntersectionCalc::calculateCompletionTypeResult(const RimP
}
}
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
for (RimEclipseView* view : eclipseCase->reservoirViews())
{
for (RimSimWellInView* simWell : view->wellCollection()->wells())
@@ -81,7 +78,6 @@ void RimCompletionCellIntersectionCalc::calculateCompletionTypeResult(const RimP
}
}
}
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
}
//--------------------------------------------------------------------------------------------------
@@ -115,7 +111,6 @@ void RimCompletionCellIntersectionCalc::calculateWellPathIntersections(const Rim
}
}
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
if (wellPath->fractureCollection()->isChecked())
{
for (const RimWellPathFracture* fracture : wellPath->fractureCollection()->fractures())
@@ -126,7 +121,6 @@ void RimCompletionCellIntersectionCalc::calculateWellPathIntersections(const Rim
}
}
}
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
if (wellPath->perforationIntervalCollection()->isChecked())
{
@@ -182,7 +176,6 @@ void RimCompletionCellIntersectionCalc::calculatePerforationIntersections(const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
void RimCompletionCellIntersectionCalc::calculateFractureIntersections(const RigMainGrid* mainGrid, const RimFracture* fracture, std::vector<double>& values)
{
if (!fracture->fractureTemplate()) return;
@@ -251,4 +244,3 @@ void RimCompletionCellIntersectionCalc::calculateFractureIntersections(const Rig
}
}
#endif // USE_PROTOTYPE_FEATURE_FRACTURES

16
ApplicationCode/ProjectDataModel/Completions/RimCompletionCellIntersectionCalc.h
View File

@@ -20,18 +20,14 @@
#include <vector>
class RigMainGrid;
class RimEclipseCase;
class RimFishbonesMultipleSubs;
class RimFracture;
class RimPerforationInterval;
class RimProject;
class RimWellPath;
class RimFishbonesMultipleSubs;
class RimPerforationInterval;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
class RimFracture;
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
class RimEclipseCase;
class RigMainGrid;
class QDateTime;
//==================================================================================================
@@ -51,7 +47,5 @@ private:
static void calculateWellPathIntersections(const RimWellPath* wellPath, const RigMainGrid* grid, std::vector<double>& values, const QDateTime& fromDate);
static void calculateFishbonesIntersections(const RimFishbonesMultipleSubs* fishbonesSubs, const RigMainGrid* grid, std::vector<double>& values);
static void calculatePerforationIntersections(const RimWellPath* wellPath, const RimPerforationInterval* perforationInterval, const RigMainGrid* grid, std::vector<double>& values);
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
static void calculateFractureIntersections(const RigMainGrid* mainGrid, const RimFracture* fracture, std::vector<double>& values);
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
};

4
ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPathCollection.cpp
View File

@@ -28,7 +28,7 @@
#include "RifWellPathImporter.h"
#include "RiuMainWindow.h"
#include "Riu3DMainWindowTools.h"
CAF_PDM_SOURCE_INIT(RimFishboneWellPathCollection, "WellPathCompletionCollection");
@@ -133,7 +133,7 @@ void RimFishboneWellPathCollection::appendCompletion(RimFishboneWellPath* comple
m_wellPaths.push_back(completion);
updateConnectedEditors();
RiuMainWindow::instance()->selectAsCurrentItem(completion);
Riu3DMainWindowTools::selectAsCurrentItem(completion);
uiCapability()->setUiHidden(!m_wellPaths.empty());

38
ApplicationCode/ProjectDataModel/Completions/RimFracture.cpp
View File

@@ -342,6 +342,28 @@ cvf::Mat4d RimFracture::transformMatrix() const
return m;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFracture::setFractureTemplateNoUpdate(RimFractureTemplate* fractureTemplate)
{
if (fractureTemplate && fractureTemplate->fractureTemplateUnit() != fractureUnit())
{
QString fractureUnitText = RiaEclipseUnitTools::UnitSystemType::uiText(fractureUnit());
QString warningText =
QString("Using a fracture template defined in a different unit is not supported.\n\nPlease select a "
"fracture template of unit '%1'")
.arg(fractureUnitText);
QMessageBox::warning(nullptr, "Fracture Template Selection", warningText);
return;
}
m_fractureTemplate = fractureTemplate;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -622,21 +644,7 @@ size_t RimFracture::findAnchorEclipseCell(const RigMainGrid* mainGrid ) const
//--------------------------------------------------------------------------------------------------
void RimFracture::setFractureTemplate(RimFractureTemplate* fractureTemplate)
{
if (fractureTemplate && fractureTemplate->fractureTemplateUnit() != fractureUnit())
{
QString fractureUnitText = RiaEclipseUnitTools::UnitSystemType::uiText(fractureUnit());
QString warningText =
QString("Using a fracture template defined in a different unit is not supported.\n\nPlease select a "
"fracture template of unit '%1'")
.arg(fractureUnitText);
QMessageBox::warning(nullptr, "Fracture Template Selection", warningText);
return;
}
m_fractureTemplate = fractureTemplate;
setFractureTemplateNoUpdate(fractureTemplate);
if (!fractureTemplate)
{

1
ApplicationCode/ProjectDataModel/Completions/RimFracture.h
View File

@@ -72,6 +72,7 @@ public:
cvf::Mat4d transformMatrix() const;
void setFractureTemplateNoUpdate(RimFractureTemplate* fractureTemplate);
void setFractureTemplate(RimFractureTemplate* fractureTemplate);
RimFractureTemplate* fractureTemplate() const;

65
ApplicationCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp
View File

@@ -18,6 +18,8 @@
#include "RimFractureTemplateCollection.h"
#include "RiaLogging.h"
#include "RigStatisticsMath.h"
#include "RimCase.h"
@@ -127,6 +129,69 @@ void RimFractureTemplateCollection::computeMinMax(const QString& uiResultName, c
if (*negClosestToZero) *negClosestToZero = posNegAccumulator.neg;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFractureTemplateCollection::createAndAssignTemplateCopyForNonMatchingUnit()
{
// If a fracture has different unit than the associated template, create a copy of template in correct unit
std::vector<RimFractureTemplate*> templatesToBeAdded;
for (RimFractureTemplate* fractureTemplate : fractureDefinitions())
{
if (fractureTemplate)
{
RimFractureTemplate* templateWithMatchingUnit = nullptr;
std::vector<caf::PdmObjectHandle*> referringObjects;
fractureTemplate->objectsWithReferringPtrFields(referringObjects);
for (auto refObj : referringObjects)
{
auto fracture = dynamic_cast<RimFracture*>(refObj);
if (fracture && fracture->fractureUnit() != fractureTemplate->fractureTemplateUnit())
{
if (!templateWithMatchingUnit)
{
templateWithMatchingUnit = dynamic_cast<RimFractureTemplate*>(fractureTemplate->xmlCapability()->copyByXmlSerialization(caf::PdmDefaultObjectFactory::instance()));
auto currentUnit = fractureTemplate->fractureTemplateUnit();
auto neededUnit = RiaEclipseUnitTools::UNITS_UNKNOWN;
if (currentUnit == RiaEclipseUnitTools::UNITS_METRIC)
{
neededUnit = RiaEclipseUnitTools::UNITS_FIELD;
}
else if (currentUnit == RiaEclipseUnitTools::UNITS_FIELD)
{
neededUnit = RiaEclipseUnitTools::UNITS_METRIC;
}
templateWithMatchingUnit->convertToUnitSystem(neededUnit);
QString name = templateWithMatchingUnit->name();
name += " (created to match fracture unit)";
templateWithMatchingUnit->setName(name);
templatesToBeAdded.push_back(templateWithMatchingUnit);
}
RiaLogging::warning("Detected fracture with different unit than fracture template. Creating copy of template "
"with matching unit.");
CVF_ASSERT(templateWithMatchingUnit->fractureTemplateUnit() == fracture->fractureUnit());
fracture->setFractureTemplateNoUpdate(templateWithMatchingUnit);
}
}
}
}
for (auto templateWithMatchingUnit : templatesToBeAdded)
{
fractureDefinitions.push_back(templateWithMatchingUnit);
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

1
ApplicationCode/ProjectDataModel/Completions/RimFractureTemplateCollection.h
View File

@@ -46,6 +46,7 @@ public:
std::vector<std::pair<QString, QString> > resultNamesAndUnits() const;
void computeMinMax(const QString& uiResultName, const QString& unit, double* minValue, double* maxValue, double* posClosestToZero, double* negClosestToZero) const;
void createAndAssignTemplateCopyForNonMatchingUnit();
void loadAndUpdateData();
void setDefaultConductivityResultIfEmpty();

4
ApplicationCode/ProjectDataModel/Completions/RimPerforationCollection.cpp
View File

@@ -27,7 +27,7 @@
#include "RifWellPathImporter.h"
#include "RiuMainWindow.h"
#include "Riu3DMainWindowTools.h"
CAF_PDM_SOURCE_INIT(RimPerforationCollection, "PerforationCollection");
@@ -81,7 +81,7 @@ void RimPerforationCollection::appendPerforation(RimPerforationInterval* perfora
perforation->setUnitSystemSpecificDefaults();
updateConnectedEditors();
RiuMainWindow::instance()->selectAsCurrentItem(perforation);
Riu3DMainWindowTools::selectAsCurrentItem(perforation);
RimProject* proj;
this->firstAncestorOrThisOfTypeAsserted(proj);

10
ApplicationCode/ProjectDataModel/Completions/RimWellPathCompletions.cpp
View File

@@ -21,9 +21,7 @@
#include "RimFishbonesCollection.h"
#include "RimFishboneWellPathCollection.h"
#include "RimPerforationCollection.h"
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
#include "RimWellPathFractureCollection.h"
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
#include "cvfAssert.h"
@@ -47,11 +45,9 @@ RimWellPathCompletions::RimWellPathCompletions()
m_fishbonesCollection = new RimFishbonesCollection;
m_fishbonesCollection.uiCapability()->setUiHidden(true);
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
CAF_PDM_InitFieldNoDefault(&m_fractureCollection, "Fractures", "Fractures", "", "", "");
m_fractureCollection = new RimWellPathFractureCollection;
m_fractureCollection.uiCapability()->setUiHidden(true);
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
CAF_PDM_InitField(&m_wellNameForExport, "WellNameForExport", QString(), "Well Name for Completion Export", "", "", "");
}
@@ -95,26 +91,22 @@ QString RimWellPathCompletions::wellNameForExport() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
RimWellPathFractureCollection* RimWellPathCompletions::fractureCollection() const
{
CVF_ASSERT(m_fractureCollection);
return m_fractureCollection;
}
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimWellPathCompletions::hasCompletions() const
{
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
if (!fractureCollection()->fractures().empty())
{
return true;
}
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
return !fishbonesCollection()->fishbonesSubs().empty() ||
!fishbonesCollection()->wellPathCollection()->wellPaths().empty() ||
@@ -147,10 +139,8 @@ void RimWellPathCompletions::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTree
uiTreeOrdering.add(&m_fishbonesCollection);
}
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
if (!fractureCollection()->fractures().empty())
{
uiTreeOrdering.add(&m_fractureCollection);
}
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
}

6
ApplicationCode/ProjectDataModel/Completions/RimWellPathCompletions.h
View File

@@ -24,9 +24,7 @@
class RimFishbonesCollection;
class RimPerforationCollection;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
class RimWellPathFractureCollection;
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
//==================================================================================================
///
@@ -41,9 +39,7 @@ public:
RimFishbonesCollection* fishbonesCollection() const;
RimPerforationCollection* perforationCollection() const;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
RimWellPathFractureCollection* fractureCollection() const;
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
void setWellNameForExport(const QString& name);
QString wellNameForExport() const;
@@ -57,9 +53,7 @@ protected:
private:
caf::PdmChildField<RimFishbonesCollection*> m_fishbonesCollection;
caf::PdmChildField<RimPerforationCollection*> m_perforationCollection;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
caf::PdmChildField<RimWellPathFractureCollection*> m_fractureCollection;
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
caf::PdmField<QString> m_wellNameForExport;
};

10
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@@ -77,7 +77,6 @@
#include "RimWellPltPlot.h"
#include "RimWellRftPlot.h"
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
#include "RimEllipseFractureTemplate.h"
#include "RimStimPlanFractureTemplate.h"
#include "RimFractureTemplateCollection.h"
@@ -85,7 +84,6 @@
#include "RimSimWellFracture.h"
#include "RimWellPathFracture.h"
#include "RimWellPathFractureCollection.h"
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
#include "RiuMainWindow.h"
@@ -266,10 +264,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder.addSeparator();
menuBuilder.subMenuStart("Completions", QIcon(":/FishBoneGroup16x16.png"));
// Fracture commands
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
menuBuilder << "RicNewWellPathFractureFeature";
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
menuBuilder << "RicNewFishbonesSubsFeature";
menuBuilder << "RicNewPerforationIntervalFeature";
menuBuilder << "RicEditPerforationCollectionFeature";
@@ -525,7 +520,6 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
{
menuBuilder << "RicShowGridStatisticsFeature";
}
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
else if (dynamic_cast<RimSimWellFracture*>(uiItem))
{
menuBuilder << "RicNewSimWellFractureFeature";
@@ -561,8 +555,6 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder << "Separator";
menuBuilder << "RicConvertFractureTemplateUnitFeature";
}
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
if (dynamic_cast<Rim3dView*>(uiItem))
{
@@ -678,10 +670,8 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder << "RicEclipseWellShowSpheresFeature";
menuBuilder << "RicEclipseWellShowWellCellsFeature";
menuBuilder << "RicEclipseWellShowWellCellFenceFeature";
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
menuBuilder << "Separator";
menuBuilder << "RicNewSimWellFractureFeature";
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
}
menuBuilder.addSeparator();
menuBuilder << "RicCopyIntersectionsToAllViewsInCaseFeature";

3
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

@@ -254,10 +254,7 @@ RimEclipseView* RimEclipseCase::createAndAddReservoirView()
rimEclipseView->cellEdgeResult()->setResultVariable("MULT");
rimEclipseView->cellEdgeResult()->enableCellEdgeColors = false;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
rimEclipseView->fractureColors()->setDefaultResultName();
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
}
caf::PdmDocument::updateUiIconStateRecursively(rimEclipseView);

19
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@@ -71,12 +71,10 @@
#include "RivTernarySaturationOverlayItem.h"
#include "RivWellPathsPartMgr.h"
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
#include "RimFracture.h"
#include "RimFractureTemplateCollection.h"
#include "RimSimWellFracture.h"
#include "RivWellFracturePartMgr.h"
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
#include "cafCadNavigation.h"
@@ -123,11 +121,9 @@ RimEclipseView::RimEclipseView()
faultResultSettings = new RimEclipseFaultColors();
faultResultSettings.uiCapability()->setUiHidden(true);
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
CAF_PDM_InitFieldNoDefault(&fractureColors, "StimPlanColors", "Fracture", "", "", "");
fractureColors = new RimStimPlanColors();
fractureColors.uiCapability()->setUiHidden(true);
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
CAF_PDM_InitFieldNoDefault(&wellCollection, "WellCollection", "Simulation Wells", "", "", "");
wellCollection = new RimSimWellInViewCollection;
@@ -462,15 +458,11 @@ void RimEclipseView::createDisplayModel()
// NB! StimPlan legend colors must be updated before well path geometry is added to the model
// as the fracture geometry depends on the StimPlan legend colors
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
fractureColors->updateLegendData();
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
addWellPathsToModel(m_wellPathPipeVizModel.p(), currentActiveCellInfo()->geometryBoundingBox());
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
m_wellPathsPartManager->appendStaticFracturePartsToModel(m_wellPathPipeVizModel.p());
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
m_wellPathPipeVizModel->updateBoundingBoxesRecursive();
m_viewer->addStaticModelOnce(m_wellPathPipeVizModel.p());
@@ -702,7 +694,6 @@ void RimEclipseView::updateCurrentTimeStep()
}
// Sim Well Fractures
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
{
cvf::String name = "SimWellFracturesModel";
this->removeModelByName(frameScene, name);
@@ -733,7 +724,6 @@ void RimEclipseView::updateCurrentTimeStep()
simWellFracturesModelBasicList->updateBoundingBoxesRecursive();
frameScene->addModel(simWellFracturesModelBasicList.p());
}
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
}
}
@@ -770,9 +760,7 @@ void RimEclipseView::onLoadDataAndUpdate()
this->cellEdgeResult()->loadResult();
this->faultResultSettings()->customFaultResult()->loadResult();
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
this->fractureColors->loadDataAndUpdate();
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
updateMdiWindowVisibility();
@@ -786,7 +774,6 @@ void RimEclipseView::onLoadDataAndUpdate()
syncronizeWellsWithResults();
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
{
// Update simulation well fractures after well cell results are imported
@@ -797,7 +784,6 @@ void RimEclipseView::onLoadDataAndUpdate()
fracture->loadDataAndUpdate();
}
}
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
this->scheduleCreateDisplayModelAndRedraw();
}
@@ -1046,7 +1032,6 @@ void RimEclipseView::updateLegends()
this->cellEdgeResult()->legendConfig()->setAutomaticRanges(cvf::UNDEFINED_DOUBLE, cvf::UNDEFINED_DOUBLE, cvf::UNDEFINED_DOUBLE, cvf::UNDEFINED_DOUBLE);
}
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
RimLegendConfig* stimPlanLegend = fractureColors()->activeLegend();
if (stimPlanLegend)
{
@@ -1057,7 +1042,6 @@ void RimEclipseView::updateLegends()
m_viewer->addColorLegendToBottomLeftCorner(stimPlanLegend->legend());
}
}
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
}
//--------------------------------------------------------------------------------------------------
@@ -1395,8 +1379,6 @@ void RimEclipseView::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering
uiTreeOrdering.add(faultResultSettings());
uiTreeOrdering.add(wellCollection());
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
RimProject* project = RiaApplication::instance()->project();
CVF_ASSERT(project);
RimOilField* oilfield = project->activeOilField();
@@ -1408,7 +1390,6 @@ void RimEclipseView::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering
uiTreeOrdering.add(fractureColors());
}
}
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
uiTreeOrdering.add(faultCollection());
uiTreeOrdering.add(m_crossSectionCollection());

4
ApplicationCode/ProjectDataModel/RimEclipseView.h
View File

@@ -53,9 +53,7 @@ class RimFaultInViewCollection;
class RimReservoirCellResultsStorage;
class RimReservoirCellResultsStorage;
class RimSimWellInViewCollection;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
class RimStimPlanColors;
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
class RiuViewer;
class RivReservoirSimWellsPartMgr;
class RivIntersectionPartMgr;
@@ -85,9 +83,7 @@ public:
caf::PdmChildField<RimEclipseCellColors*> cellResult;
caf::PdmChildField<RimCellEdgeColors*> cellEdgeResult;
caf::PdmChildField<RimEclipseFaultColors*> faultResultSettings;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
caf::PdmChildField<RimStimPlanColors*> fractureColors;
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
caf::PdmChildField<RimSimWellInViewCollection*> wellCollection;
caf::PdmChildField<RimFaultInViewCollection*> faultCollection;

16
ApplicationCode/ProjectDataModel/RimGeoMechCase.cpp
View File

@@ -383,6 +383,22 @@ void RimGeoMechCase::addElementPropertyFiles(const std::vector<caf::FilePath>& f
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RimGeoMechCase::cohesion() const
{
return m_cohesion;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RimGeoMechCase::frictionAngleDeg() const
{
return m_frictionAngleDeg;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

3
ApplicationCode/ProjectDataModel/RimGeoMechCase.h
View File

@@ -71,6 +71,9 @@ public:
void addElementPropertyFiles(const std::vector<caf::FilePath>& filenames);
double cohesion() const;
double frictionAngleDeg() const;
// Fields:
caf::PdmChildArrayField<RimGeoMechView*> geoMechViews;

4
ApplicationCode/ProjectDataModel/RimGeoMechView.cpp
View File

@@ -40,7 +40,7 @@
#include "RimTensorResults.h"
#include "RimViewLinker.h"
#include "RiuMainWindow.h"
#include "Riu3DMainWindowTools.h"
#include "RiuSelectionManager.h"
#include "RiuViewer.h"
@@ -125,7 +125,7 @@ void RimGeoMechView::onLoadDataAndUpdate()
{
QString displayMessage = errorMessage.empty() ? "Could not open the Odb file: \n" + m_geomechCase->caseFileName() : QString::fromStdString(errorMessage);
QMessageBox::warning(RiuMainWindow::instance(),
QMessageBox::warning(Riu3DMainWindowTools::mainWindowWidget(),
"File open error",
displayMessage);
m_geomechCase = nullptr;

4
ApplicationCode/ProjectDataModel/RimGridView.cpp
View File

@@ -30,7 +30,7 @@
#include "RimViewLinker.h"
#include "RimViewLinkerCollection.h"
#include "RiuMainWindow.h"
#include "Riu3DMainWindowTools.h"
#include "cvfModel.h"
#include "cvfScene.h"
@@ -331,7 +331,7 @@ void RimGridView::fieldChangedByUi(const caf::PdmFieldHandle* changedField, cons
//--------------------------------------------------------------------------------------------------
void RimGridView::selectOverlayInfoConfig()
{
RiuMainWindow::instance()->selectAsCurrentItem(m_overlayInfoConfig);
Riu3DMainWindowTools::selectAsCurrentItem(m_overlayInfoConfig);
}
//--------------------------------------------------------------------------------------------------

4
ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp
View File

@@ -36,7 +36,7 @@
#include "RimEclipseView.h"
#include "RimReservoirCellResultsStorage.h"
#include "RiuMainWindow.h"
#include "Riu3DMainWindowTools.h"
#include "cafProgressInfo.h"
@@ -173,7 +173,7 @@ void RimIdenticalGridCaseGroup::loadMainCaseAndActiveCellInfo()
RimEclipseCase* mainCase = caseCollection()->reservoirs[0];
if (!mainCase->openReserviorCase())
{
QMessageBox::warning(RiuMainWindow::instance(),
QMessageBox::warning(Riu3DMainWindowTools::mainWindowWidget(),
"Error when opening project file",
"Could not open the Eclipse Grid file: \n"+ mainCase->gridFileName() + "\n"+
"Current working directory is: \n" +

6
ApplicationCode/ProjectDataModel/RimIntersectionCollection.cpp
View File

@@ -27,7 +27,7 @@
#include "RimIntersectionBox.h"
#include "RimSimWellInView.h"
#include "RiuMainWindow.h"
#include "Riu3DMainWindowTools.h"
#include "RivIntersectionBoxPartMgr.h"
#include "RivIntersectionPartMgr.h"
@@ -177,7 +177,7 @@ void RimIntersectionCollection::appendIntersectionAndUpdate(RimIntersection* int
syncronize2dIntersectionViews();
updateConnectedEditors();
RiuMainWindow::instance()->selectAsCurrentItem(intersection);
Riu3DMainWindowTools::selectAsCurrentItem(intersection);
Rim3dView* rimView = nullptr;
firstAncestorOrThisOfType(rimView);
@@ -224,7 +224,7 @@ void RimIntersectionCollection::appendIntersectionBoxAndUpdate(RimIntersectionBo
m_intersectionBoxes.push_back(intersectionBox);
updateConnectedEditors();
RiuMainWindow::instance()->selectAsCurrentItem(intersectionBox);
Riu3DMainWindowTools::selectAsCurrentItem(intersectionBox);
Rim3dView* rimView = nullptr;
firstAncestorOrThisOfType(rimView);

9
ApplicationCode/ProjectDataModel/RimLegendConfig.cpp
View File

@@ -27,11 +27,7 @@
#include "RimEclipseCellColors.h"
#include "RimEclipseView.h"
#include "RimGeoMechResultDefinition.h"
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
#include "RimStimPlanColors.h"
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
#include "RimViewLinker.h"
#include "cafCategoryLegend.h"
@@ -208,8 +204,6 @@ void RimLegendConfig::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
view->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
}
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
// Update stim plan templates if relevant
RimStimPlanColors* stimPlanColors;
firstAncestorOrThisOfType(stimPlanColors);
@@ -217,7 +211,6 @@ void RimLegendConfig::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
{
stimPlanColors->updateStimPlanTemplates();
}
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
}
//--------------------------------------------------------------------------------------------------
@@ -775,11 +768,9 @@ QList<caf::PdmOptionItemInfo> RimLegendConfig::calculateValueOptions(const caf::
{
bool hasStimPlanParent = false;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
RimStimPlanColors* stimPlanColors = nullptr;
this->firstAncestorOrThisOfType(stimPlanColors);
if (stimPlanColors) hasStimPlanParent = true;
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
bool isCategoryResult = false;
{

12
ApplicationCode/ProjectDataModel/RimOilField.cpp
View File

@@ -22,11 +22,7 @@
#include "RimEclipseCaseCollection.h"
#include "RimFormationNamesCollection.h"
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
#include "RimFractureTemplateCollection.h"
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
#include "RimGeoMechModels.h"
#include "RimObservedData.h"
#include "RimObservedDataCollection.h"
@@ -47,18 +43,13 @@ RimOilField::RimOilField(void)
CAF_PDM_InitFieldNoDefault(&geoMechModels, "GeoMechModels", "Geo Mech Models", ":/GridModels.png", "", "");
CAF_PDM_InitFieldNoDefault(&wellPathCollection, "WellPathCollection", "Well Paths", ":/WellCollection.png", "", "");
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
CAF_PDM_InitFieldNoDefault(&fractureDefinitionCollection, "FractureDefinitionCollection", "Defenition of Fractures", "", "", "");
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
CAF_PDM_InitFieldNoDefault(&summaryCaseMainCollection,"SummaryCaseCollection","Summary Cases",":/GridModels.png","","");
CAF_PDM_InitFieldNoDefault(&formationNamesCollection,"FormationNamesCollection","Formations","","","");
CAF_PDM_InitFieldNoDefault(&observedDataCollection, "ObservedDataCollection", "Observed Data", ":/Cases16x16.png", "", "");
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
fractureDefinitionCollection = new RimFractureTemplateCollection();
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
analysisModels = new RimEclipseCaseCollection();
wellPathCollection = new RimWellPathCollection();
summaryCaseMainCollection = new RimSummaryCaseMainCollection();
@@ -73,10 +64,7 @@ RimOilField::~RimOilField(void)
{
if (wellPathCollection()) delete wellPathCollection();
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
if (fractureDefinitionCollection()) delete fractureDefinitionCollection();
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
if (geoMechModels()) delete geoMechModels();
if (analysisModels()) delete analysisModels();
if (summaryCaseMainCollection()) delete summaryCaseMainCollection();

15
ApplicationCode/ProjectDataModel/RimProject.cpp
View File

@@ -37,13 +37,8 @@
#include "RimEclipseCaseCollection.h"
#include "RimFlowPlotCollection.h"
#include "RimFormationNamesCollection.h"
#include "RimSummaryCalculationCollection.h"
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
#include "RimFractureTemplateCollection.h"
#include "RimFractureTemplate.h"
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
#include "RimFractureTemplateCollection.h"
#include "RimGeoMechCase.h"
#include "RimGeoMechModels.h"
#include "RimGridSummaryCase.h"
@@ -56,6 +51,7 @@
#include "RimPltPlotCollection.h"
#include "RimRftPlotCollection.h"
#include "RimScriptCollection.h"
#include "RimSummaryCalculationCollection.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryCrossPlotCollection.h"
#include "RimSummaryPlotCollection.h"
@@ -484,10 +480,8 @@ void RimProject::setProjectFileNameAndUpdateDependencies(const QString& fileName
oilField->summaryCaseMainCollection()->updateFilePathsFromProjectPath(newProjectPath, oldProjectPath);
}
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
CVF_ASSERT(oilField->fractureDefinitionCollection());
oilField->fractureDefinitionCollection()->updateFilePathsFromProjectPath(newProjectPath, oldProjectPath);
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
}
{
@@ -937,7 +931,6 @@ std::vector<RimGeoMechCase*> RimProject::geoMechCases() const
return cases;
}
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
//--------------------------------------------------------------------------------------------------
///
@@ -973,7 +966,6 @@ std::vector<RimFractureTemplate*> RimProject::allFractureTemplates() const
}
return templates;
}
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
//--------------------------------------------------------------------------------------------------
///
@@ -1058,10 +1050,7 @@ void RimProject::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QS
if (oilField->geoMechModels()) uiTreeOrdering.add(oilField->geoMechModels());
if (oilField->wellPathCollection()) uiTreeOrdering.add(oilField->wellPathCollection());
if (oilField->formationNamesCollection()) uiTreeOrdering.add(oilField->formationNamesCollection());
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
if (oilField->fractureDefinitionCollection()) uiTreeOrdering.add(oilField->fractureDefinitionCollection());
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
}
uiTreeOrdering.add(scriptCollection());

2
ApplicationCode/ProjectDataModel/RimProject.h
View File

@@ -138,10 +138,8 @@ public:
std::vector<RimGeoMechCase*> geoMechCases() const;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
std::vector<RimFractureTemplateCollection*> allFractureTemplateCollections() const;
std::vector<RimFractureTemplate*> allFractureTemplates() const;
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
protected:
// Overridden methods

30
ApplicationCode/ProjectDataModel/RimSimWellInView.cpp
View File

@@ -20,32 +20,28 @@
#include "RimSimWellInView.h"
#include "RigSimulationWellCenterLineCalculator.h"
#include "RigActiveCellInfo.h"
#include "RigCell.h"
#include "RigEclipseCaseData.h"
#include "RigMainGrid.h"
#include "RigSimWellData.h"
#include "RigSimulationWellCenterLineCalculator.h"
#include "RimCellRangeFilterCollection.h"
#include "RimEclipseCase.h"
#include "RimEclipseView.h"
#include "RimIntersectionCollection.h"
#include "RimSimWellInViewCollection.h"
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
#include "RimSimWellFractureCollection.h"
#include "RimPropertyFilterCollection.h"
#include "RimSimWellFracture.h"
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
#include "RimSimWellFractureCollection.h"
#include "RimSimWellInViewCollection.h"
#include "RiuMainWindow.h"
#include "RivReservoirViewPartMgr.h"
#include "cafPdmUiTreeOrdering.h"
#include "cvfMath.h"
#include "RigCell.h"
#include "RimEclipseCase.h"
#include "RigEclipseCaseData.h"
#include "RigMainGrid.h"
#include "RigActiveCellInfo.h"
#include "RimPropertyFilterCollection.h"
CAF_PDM_SOURCE_INIT(RimSimWellInView, "Well");
@@ -72,18 +68,14 @@ RimSimWellInView::RimSimWellInView()
CAF_PDM_InitField(&showWellCells, "ShowWellCells", false, "Well Cells", "", "", "");
CAF_PDM_InitField(&showWellCellFence, "ShowWellCellFence", false, "Well Cell Fence", "", "", "");
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
CAF_PDM_InitFieldNoDefault(&simwellFractureCollection, "FractureCollection", "Fractures", "", "", "");
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
name.uiCapability()->setUiHidden(true);
name.uiCapability()->setUiReadOnly(true);
m_resultWellIndex = cvf::UNDEFINED_SIZE_T;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
simwellFractureCollection= new RimSimWellFractureCollection();
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
}
//--------------------------------------------------------------------------------------------------
@@ -91,9 +83,7 @@ RimSimWellInView::RimSimWellInView()
//--------------------------------------------------------------------------------------------------
RimSimWellInView::~RimSimWellInView()
{
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
if (simwellFractureCollection()) delete simwellFractureCollection();
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
}
//--------------------------------------------------------------------------------------------------
@@ -389,13 +379,11 @@ void RimSimWellInView::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering
//--------------------------------------------------------------------------------------------------
void RimSimWellInView::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/)
{
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
for (RimSimWellFracture* fracture : simwellFractureCollection()->simwellFractures())
{
uiTreeOrdering.add(fracture);
}
uiTreeOrdering.skipRemainingChildren(true);
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
const RimEclipseView* reservoirView = nullptr;
this->firstAncestorOrThisOfType(reservoirView);

5
ApplicationCode/ProjectDataModel/RimSimWellInView.h
View File

@@ -36,10 +36,7 @@ class RigSimWellData;
class RigWellResultFrame;
struct RigWellResultPoint;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
class RimSimWellFractureCollection;
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
//==================================================================================================
///
@@ -93,9 +90,7 @@ public:
caf::PdmField<bool> showWellCells;
caf::PdmField<bool> showWellCellFence;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
caf::PdmChildField<RimSimWellFractureCollection*> simwellFractureCollection;
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
protected:

4
ApplicationCode/ProjectDataModel/RimSimWellInViewCollection.cpp
View File

@@ -32,10 +32,8 @@
#include "RimProject.h"
#include "RimSimWellInView.h"
#include "RimWellAllocationPlot.h"
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
#include "RimSimWellFracture.h"
#include "RimSimWellFractureCollection.h"
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
#include "RiuMainWindow.h"
@@ -462,7 +460,6 @@ void RimSimWellInViewCollection::fieldChangedByUi(const caf::PdmFieldHandle* cha
if (m_reservoirView) m_reservoirView->scheduleCreateDisplayModelAndRedraw();
}
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
if (&wellPipeCoordType == changedField)
{
for (RimSimWellInView* w : wells)
@@ -473,7 +470,6 @@ void RimSimWellInViewCollection::fieldChangedByUi(const caf::PdmFieldHandle* cha
}
}
}
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
}
//--------------------------------------------------------------------------------------------------

35
ApplicationCode/ProjectDataModel/RimTensorResults.cpp
View File

@@ -36,7 +36,8 @@ namespace caf
void AppEnum< RimTensorResults::TensorColors >::setUp()
{
addItem(RimTensorResults::WHITE_GRAY_BLACK , "WHITE_GRAY_BLACK", "White, Gray, Black");
addItem(RimTensorResults::MAGENTA_BROWN_BLACK, "MAGENTA_BROWN_BLACK", "Magenta, Brown, Black");
addItem(RimTensorResults::ORANGE_BLUE_WHITE, "ORANGE_BLUE_WHITE", "Orange, Blue, White");
addItem(RimTensorResults::MAGENTA_BROWN_GRAY, "MAGENTA_BROWN_GRAY", "Magenta, Brown, Gray");
addItem(RimTensorResults::RESULT_COLORS, "RESULT_COLORS", "Result Colors");
setDefault(RimTensorResults::WHITE_GRAY_BLACK);
@@ -226,7 +227,7 @@ void RimTensorResults::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
std::vector<std::string> fieldCompNames = getResultMetaDataForUIFieldSetting();
if (m_resultPositionTypeUiField() == m_resultPositionType())
{
m_resultFieldNameUiField = m_resultFieldName();
m_resultFieldNameUiField = uiFieldName(m_resultFieldName());
}
else
{
@@ -237,7 +238,7 @@ void RimTensorResults::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
if (changedField == &m_resultFieldNameUiField)
{
m_resultPositionType = m_resultPositionTypeUiField;
m_resultFieldName = m_resultFieldNameUiField;
m_resultFieldName = fieldNameFromUi(m_resultFieldNameUiField);
}
if (changedField == &m_showTensors)
{
@@ -319,7 +320,7 @@ void RimTensorResults::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering
void RimTensorResults::initAfterRead()
{
m_resultPositionTypeUiField = m_resultPositionType;
m_resultFieldNameUiField = m_resultFieldName();
m_resultFieldNameUiField = uiFieldName(m_resultFieldName());
}
//--------------------------------------------------------------------------------------------------
@@ -336,3 +337,29 @@ void RimTensorResults::defineEditorAttribute(const caf::PdmFieldHandle* field, Q
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimTensorResults::uiFieldName(const QString& fieldName)
{
if (fieldName == "NE")
{
return QString("E");
}
return fieldName;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimTensorResults::fieldNameFromUi(const QString& uiFieldName)
{
if (uiFieldName == "E")
{
return QString("NE");
}
return uiFieldName;
}

6
ApplicationCode/ProjectDataModel/RimTensorResults.h
View File

@@ -43,7 +43,8 @@ public:
enum TensorColors
{
WHITE_GRAY_BLACK,
MAGENTA_BROWN_BLACK,
ORANGE_BLUE_WHITE,
MAGENTA_BROWN_GRAY,
RESULT_COLORS
};
@@ -82,6 +83,9 @@ private:
virtual void initAfterRead() override;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
static QString uiFieldName(const QString& fieldName);
static QString fieldNameFromUi(const QString& uiFieldName);
private:
caf::PdmField<bool> m_showTensors;

8
ApplicationCode/ProjectDataModel/RimWellLogFile.cpp
View File

@@ -29,7 +29,7 @@
#include "RigWellLogFile.h"
#include "RiuMainWindow.h"
#include "Riu3DMainWindowTools.h"
#include "cafPdmUiDateEditor.h"
@@ -124,9 +124,9 @@ RimWellLogFile* RimWellLogFile::readWellLogFile(const QString& logFilePath)
displayMessage += errorMessage;
}
QMessageBox::warning(RiuMainWindow::instance(),
"File open error",
displayMessage);
QMessageBox::warning(Riu3DMainWindowTools::mainWindowWidget(),
"File open error",
displayMessage);
delete wellLogFile;
wellLogFile = nullptr;

4
ApplicationCode/ProjectDataModel/RimWellPath.cpp
View File

@@ -261,26 +261,22 @@ const RimWellPathCompletions* RimWellPath::completions() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
RimWellPathFractureCollection* RimWellPath::fractureCollection()
{
CVF_ASSERT(m_completions);
return m_completions->fractureCollection();
}
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
const RimWellPathFractureCollection * RimWellPath::fractureCollection() const
{
CVF_ASSERT(m_completions);
return m_completions->fractureCollection();
}
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/ProjectDataModel/RimWellPath.h
View File

@@ -48,9 +48,7 @@ class RimPerforationCollection;
class RimWellPathCompletions;
class RigWellPathFormations;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
class RimWellPathFractureCollection;
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
//==================================================================================================
///
@@ -110,10 +108,8 @@ public:
const RimPerforationCollection* perforationIntervalCollection() const;
const RimWellPathCompletions* completions() const;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
RimWellPathFractureCollection* fractureCollection();
const RimWellPathFractureCollection* fractureCollection() const;
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
RigWellPath* wellPathGeometry();
const RigWellPath* wellPathGeometry() const;

12
ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp
View File

@@ -39,7 +39,7 @@
#include "RimWellPath.h"
#include "RimPerforationCollection.h"
#include "RiuMainWindow.h"
#include "Riu3DMainWindowTools.h"
#include "RifWellPathFormationsImporter.h"
#include "RifWellPathImporter.h"
@@ -138,7 +138,7 @@ void RimWellPathCollection::readWellPathFiles()
QString errorMessage;
if (!wellPaths[wpIdx]->readWellPathFile(&errorMessage, m_wellPathImporter))
{
QMessageBox::warning(RiuMainWindow::instance(),
QMessageBox::warning(Riu3DMainWindowTools::mainWindowWidget(),
"File open error",
errorMessage);
}
@@ -159,7 +159,7 @@ void RimWellPathCollection::readWellPathFiles()
displayMessage += errorMessage;
}
QMessageBox::warning(RiuMainWindow::instance(),
QMessageBox::warning(Riu3DMainWindowTools::mainWindowWidget(),
"File open error",
displayMessage);
}
@@ -367,7 +367,7 @@ void RimWellPathCollection::addWellPathFormations(const QStringList& filePaths)
if (fileReadSuccess)
{
QMessageBox::information(RiuMainWindow::instance(), "Well Picks Import", outputMessage);
QMessageBox::information(Riu3DMainWindowTools::mainWindowWidget(), "Well Picks Import", outputMessage);
RiaLogging::info(outputMessage);
}
@@ -489,7 +489,7 @@ void RimWellPathCollection::readWellPathFormationFiles()
QString errorMessage;
if (!wellPaths[wpIdx]->readWellPathFormationsFile(&errorMessage, m_wellPathFormationsImporter))
{
QMessageBox::warning(RiuMainWindow::instance(),
QMessageBox::warning(Riu3DMainWindowTools::mainWindowWidget(),
"File open error",
errorMessage);
}
@@ -511,7 +511,7 @@ void RimWellPathCollection::reloadAllWellPathFormations()
QString errorMessage;
if (!wellPaths[wpIdx]->reloadWellPathFormationsFile(&errorMessage, m_wellPathFormationsImporter))
{
QMessageBox::warning(RiuMainWindow::instance(),
QMessageBox::warning(Riu3DMainWindowTools::mainWindowWidget(),
"File open error",
errorMessage);
}

20
ApplicationCode/ProjectDataModel/Summary/RimObservedDataCollection.cpp
View File

@@ -31,7 +31,7 @@
#include "RimObservedEclipseUserData.h"
#include "RimSummaryObservedDataFile.h"
#include "RiuMainPlotWindow.h"
#include "RiuPlotMainWindowTools.h"
#include "cafUtils.h"
#include "cafPdmSettings.h"
@@ -130,12 +130,9 @@ RimObservedData* RimObservedDataCollection::createAndAddRsmObservedDataFromFile(
errorText->append(observedData->errorMessagesFromReader());
}
RiuMainPlotWindow* mainPlotWindow = RiaApplication::instance()->getOrCreateAndShowMainPlotWindow();
if (mainPlotWindow)
{
mainPlotWindow->selectAsCurrentItem(observedData);
mainPlotWindow->setExpanded(observedData);
}
RiuPlotMainWindowTools::showPlotMainWindow();
RiuPlotMainWindowTools::selectAsCurrentItem(observedData);
RiuPlotMainWindowTools::setExpanded(observedData);
this->updateConnectedEditors();
caf::PdmUiObjectEditorHandle::updateUiAllObjectEditors();
@@ -192,12 +189,9 @@ RimObservedData* RimObservedDataCollection::createAndAddCvsObservedDataFromFile(
return nullptr;
}
RiuMainPlotWindow* mainPlotWindow = RiaApplication::instance()->getOrCreateAndShowMainPlotWindow();
if (mainPlotWindow)
{
mainPlotWindow->selectAsCurrentItem(userData);
mainPlotWindow->setExpanded(userData);
}
RiuPlotMainWindowTools::showPlotMainWindow();
RiuPlotMainWindowTools::selectAsCurrentItem(userData);
RiuPlotMainWindowTools::setExpanded(userData);
this->updateConnectedEditors();
caf::PdmUiObjectEditorHandle::updateUiAllObjectEditors();

12
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
View File

@@ -34,7 +34,7 @@
#include "RimSummaryPlotNameHelper.h"
#include "RimSummaryTimeAxisProperties.h"
#include "RiuMainPlotWindow.h"
#include "RiuPlotMainWindowTools.h"
#include "RiuSummaryQwtPlot.h"
#include "cvfBase.h"
@@ -176,24 +176,24 @@ RimSummaryTimeAxisProperties* RimSummaryPlot::timeAxisProperties()
//--------------------------------------------------------------------------------------------------
void RimSummaryPlot::selectAxisInPropertyEditor(int axis)
{
RiuMainPlotWindow* plotwindow = RiaApplication::instance()->getOrCreateAndShowMainPlotWindow();
RiuPlotMainWindowTools::showPlotMainWindow();
if (axis == QwtPlot::yLeft)
{
plotwindow->selectAsCurrentItem(m_leftYAxisProperties);
RiuPlotMainWindowTools::selectAsCurrentItem(m_leftYAxisProperties);
}
else if (axis == QwtPlot::yRight)
{
plotwindow->selectAsCurrentItem(m_rightYAxisProperties);
RiuPlotMainWindowTools::selectAsCurrentItem(m_rightYAxisProperties);
}
else if (axis == QwtPlot::xBottom)
{
if (m_isCrossPlot)
{
plotwindow->selectAsCurrentItem(m_bottomAxisProperties);
RiuPlotMainWindowTools::selectAsCurrentItem(m_bottomAxisProperties);
}
else
{
plotwindow->selectAsCurrentItem(m_timeAxisProperties);
RiuPlotMainWindowTools::selectAsCurrentItem(m_timeAxisProperties);
}
}
}