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

#1087 - pre-proto - Moving enum for unit system to RimDefines, and establishing default unit system for fracture template collection (used when creating new templates).

Browse Source
This commit is contained in:
astridkbjorke
2017-02-16 15:22:03 +01:00
parent 86bd033fa8
commit fa638243ab
10 changed files with 42 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationCode/FileInterface/RifEclipseExportTools.cpp
View File

@@ -19,6 +19,7 @@
#include "RifEclipseExportTools.h"
#include "RiaApplication.h"
#include "RigEclipseCaseData.h"
#include "RigFracture.h"
#include "RigFracture.h"
#include "RigMainGrid.h"
@@ -149,14 +150,14 @@ bool RifEclipseExportTools::unitsMatchCaseAndFractures(RimEclipseCase* caseToApp
{
if (fracture->attachedFractureDefinition())
{
if ((fracture->attachedFractureDefinition()->fractureTemplateUnit) == RimFractureTemplate::UNITS_METRIC)
if ((fracture->attachedFractureDefinition()->fractureTemplateUnit) == RimDefines::UNITS_METRIC)
{
if (!(caseUnit == RigEclipseCaseData::UNITS_METRIC))
{
unitsMatch = false;
}
}
else if ((fracture->attachedFractureDefinition()->fractureTemplateUnit) == RimFractureTemplate::UNITS_FIELD)
else if ((fracture->attachedFractureDefinition()->fractureTemplateUnit) == RimDefines::UNITS_FIELD)
{
if (!(caseUnit == RigEclipseCaseData::UNITS_FIELD))
{