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 renaming of RimView into dev

Browse Source
This commit is contained in:
Jacob Støren
2018-01-09 10:46:41 +01:00
parent cb6d49a611 68b5a0e019
commit 2dbc907934
12 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp
View File

@@ -1369,10 +1369,18 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::calculateDerivedResult(in
if(resVarAddr.resultPosType == RIG_ELEMENT_NODAL_FACE )
{
if (resVarAddr.componentName == "Pazi" || resVarAddr.componentName == "Pinc" )
if (resVarAddr.componentName == "Pazi" || resVarAddr.componentName == "Pinc")
{
return calculateSurfaceAngles(partIndex, resVarAddr);
else
}
else if (resVarAddr.componentName.empty())
{
return nullptr;
}
else
{
return calculateSurfaceAlignedStress(partIndex, resVarAddr);
}
}
if (resVarAddr.fieldName == "SE" && resVarAddr.componentName == "SFI")

3
ApplicationCode/GeoMech/GeoMechDataModel/RigFemResultAddress.h
View File

@@ -66,7 +66,8 @@ public:
|| resultPosType == RIG_ELEMENT_NODAL
|| resultPosType == RIG_INTEGRATION_POINT
|| resultPosType == RIG_ELEMENT_NODAL_FACE
|| resultPosType == RIG_FORMATION_NAMES;
|| resultPosType == RIG_FORMATION_NAMES
|| resultPosType == RIG_ELEMENT;
bool isFieldValid = fieldName != "";
return isTypeValid && isFieldValid;

3
ApplicationCode/GeoMech/GeoMechDataModel/RigFemResultPosEnum.h
View File

@@ -24,5 +24,6 @@ enum RigFemResultPosEnum {
RIG_ELEMENT_NODAL,
RIG_INTEGRATION_POINT,
RIG_ELEMENT_NODAL_FACE,
RIG_FORMATION_NAMES
RIG_FORMATION_NAMES,
RIG_ELEMENT
};

2
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@@ -176,6 +176,8 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder << "Separator";
menuBuilder << "RicNewViewFeature";
menuBuilder << "Separator";
menuBuilder << "RicImportElementPropertyFeature";
menuBuilder << "Separator";
}
else if (dynamic_cast<RimIdenticalGridCaseGroup*>(uiItem))
{

10
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

@@ -91,9 +91,9 @@ RimEclipseCase::RimEclipseCase()
m_filesContainingFaults_OBSOLETE.xmlCapability()->setIOWritable(false);
m_filesContainingFaults_OBSOLETE.uiCapability()->setUiHidden(true);
CAF_PDM_InitField(&caseName, "CaseName", QString(), "Obsolete", "", "" ,"");
caseName.xmlCapability()->setIOWritable(false);
caseName.uiCapability()->setUiHidden(true);
CAF_PDM_InitField(&m_caseName_OBSOLETE, "CaseName", QString(), "Obsolete", "", "" ,"");
m_caseName_OBSOLETE.xmlCapability()->setIOWritable(false);
m_caseName_OBSOLETE.uiCapability()->setUiHidden(true);
// Init
@@ -210,9 +210,9 @@ void RimEclipseCase::initAfterRead()
riv->setEclipseCase(this);
}
if (caseUserDescription().isEmpty() && !caseName().isEmpty())
if (caseUserDescription().isEmpty() && !m_caseName_OBSOLETE().isEmpty())
{
caseUserDescription = caseName;
caseUserDescription = m_caseName_OBSOLETE;
}
}

2
ApplicationCode/ProjectDataModel/RimEclipseCase.h
View File

@@ -135,7 +135,7 @@ private:
// Obsolete fields
protected:
caf::PdmField<QString> caseName;
caf::PdmField<QString> m_caseName_OBSOLETE;
private:
caf::PdmField<std::vector<QString> > m_filesContainingFaults_OBSOLETE;

6
ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp
View File

@@ -92,8 +92,6 @@ RimEclipseResultCase::RimEclipseResultCase()
m_activeCellInfoIsReadFromFile = false;
m_gridAndWellDataIsReadFromFile = false;
m_caseName = "";
}
//--------------------------------------------------------------------------------------------------
@@ -574,9 +572,9 @@ void RimEclipseResultCase::initAfterRead()
// Convert from old (9.0.2) way of storing the case file
if (caseFileName().isEmpty())
{
if (!this->caseName().isEmpty() && !caseDirectory().isEmpty())
if (!this->m_caseName_OBSOLETE().isEmpty() && !caseDirectory().isEmpty())
{
caseFileName = QDir::fromNativeSeparators(caseDirectory()) + "/" + caseName() + ".EGRID";
caseFileName = QDir::fromNativeSeparators(caseDirectory()) + "/" + m_caseName_OBSOLETE() + ".EGRID";
}
}
}

5
ApplicationCode/ProjectDataModel/RimEclipseResultCase.h
View File

@@ -65,8 +65,6 @@ public:
RifReaderEclipseRft* rftReader();
QString caseName() const { return m_caseName; }
protected:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);
@@ -90,12 +88,9 @@ private:
caf::PdmChildArrayField<RimFlowDiagSolution*> m_flowDiagSolutions;
caf::PdmField<QString> m_sourSimFileName;
QString m_caseName;
// Obsolete field
caf::PdmField<QString> caseDirectory;
bool m_gridAndWellDataIsReadFromFile;
bool m_activeCellInfoIsReadFromFile;
};

11
ApplicationCode/ProjectDataModel/RimGeoMechCase.cpp
View File

@@ -60,6 +60,7 @@ RimGeoMechCase::RimGeoMechCase(void)
CAF_PDM_InitField(&m_cohesion, "CaseCohesion", 10.0, "Cohesion", "", "Used to calculate the SE:SFI result", "");
CAF_PDM_InitField(&m_frictionAngleDeg, "FrctionAngleDeg", 30.0, "Friction Angle [Deg]", "", "Used to calculate the SE:SFI result", "");
CAF_PDM_InitFieldNoDefault(&m_elementPropertyFileNames, "ElementPropertyFileNames", "Element Property Files", "", "", "");
}
//--------------------------------------------------------------------------------------------------
@@ -470,10 +471,12 @@ void RimGeoMechCase::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
uiOrdering.add(&caseId);
uiOrdering.add(&m_caseFileName);
auto group = uiOrdering.addNewGroup("Case Options");
group->add(&activeFormationNames);
group->add(&m_cohesion);
group->add(&m_frictionAngleDeg);
caf::PdmUiGroup* caseGroup = uiOrdering.addNewGroup("Case Options");
caseGroup->add(&activeFormationNames);
caseGroup->add(&m_cohesion);
caseGroup->add(&m_frictionAngleDeg);
caf::PdmUiGroup* elmPropGroup = uiOrdering.addNewGroup("Element Properties");
elmPropGroup->add(&m_elementPropertyFileNames);
}

1
ApplicationCode/ProjectDataModel/RimGeoMechCase.h
View File

@@ -89,4 +89,5 @@ private:
caf::PdmField<QString> m_caseFileName;
caf::PdmField<double> m_cohesion;
caf::PdmField<double> m_frictionAngleDeg;
caf::PdmField<std::vector<QString> > m_elementPropertyFileNames;
};

1
ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp
View File

@@ -45,6 +45,7 @@ void caf::AppEnum< RigFemResultPosEnum >::setUp()
addItem(RIG_INTEGRATION_POINT,"INTEGRATION_POINT","Integration Point");
addItem(RIG_ELEMENT_NODAL_FACE, "ELEMENT_NODAL_FACE", "Element Nodal On Face");
addItem(RIG_FORMATION_NAMES, "FORMATION_NAMES", "Formation Names");
addItem(RIG_ELEMENT, "ELEMENT", "Element");
setDefault(RIG_NODAL);
}
}

2
ApplicationCode/ProjectDataModel/RimWellLogRftCurve.cpp
View File

@@ -258,7 +258,7 @@ QString RimWellLogRftCurve::createCurveAutoName()
if (m_eclipseResultCase)
{
name.push_back(m_eclipseResultCase->caseName());
name.push_back(m_eclipseResultCase->caseUserDescription());
}
if (wellLogChannelName() != caf::AppEnum<RifEclipseRftAddress::RftWellLogChannelType>::text(RifEclipseRftAddress::NONE))
{