OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-25 22:50:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

#14912 Reject duplicate generated Python enum names

Browse Source
This commit is contained in:
Kristian Bendiksen committed 2026-10-23 15:21:23 +02:00
1 parent a3cd973da0
commit 5b229cdf32
20 files changed
+223 -121
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/ProjectDataModel/Completions/RimCompletionEnums.h
+47
View File
@@ -0,0 +1,47 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2026- Equinor ASA
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
// FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#pragma once
namespace RimCompletionEnums
{
enum class ReferenceMDType
{
AUTO_REFERENCE_MD = 0,
MANUAL_REFERENCE_MD
};
enum class PressureDropType
{
HYDROSTATIC,
HYDROSTATIC_FRICTION,
HYDROSTATIC_FRICTION_ACCELERATION
};
enum class LengthAndDepthType
{
ABS,
INC
};
enum NonDarcyFlowType
{
NON_DARCY_NONE,
NON_DARCY_COMPUTED,
NON_DARCY_USER_DEFINED,
};
} // namespace RimCompletionEnums
ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplate.cpp
-10
View File
@@ -78,16 +78,6 @@ void caf::AppEnum<RimFractureTemplate::WidthEnum>::setUp()
setDefault( RimFractureTemplate::WIDTH_FROM_FRACTURE );
}
template <>
void caf::AppEnum<RimFractureTemplate::NonDarcyFlowEnum>::setUp()
{
addItem( RimFractureTemplate::NON_DARCY_NONE, "None", "None" );
addItem( RimFractureTemplate::NON_DARCY_COMPUTED, "Computed", "Compute D-factor" );
addItem( RimFractureTemplate::NON_DARCY_USER_DEFINED, "UserDefined", "User Defined D-factor" );
setDefault( RimFractureTemplate::NON_DARCY_NONE );
}
template <>
void caf::AppEnum<RimFractureTemplate::BetaFactorEnum>::setUp()
{
ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplate.h
+6 -6
View File
@@ -18,6 +18,8 @@
#pragma once
#include "RimCompletionEnums.h"
#include "RiaDefines.h"
#include "cafAppEnum.h"
@@ -115,12 +117,10 @@ public:
BETA_FACTOR_FROM_FRACTURE,
};
enum NonDarcyFlowEnum
{
NON_DARCY_NONE,
NON_DARCY_COMPUTED,
NON_DARCY_USER_DEFINED,
};
using NonDarcyFlowEnum = RimCompletionEnums::NonDarcyFlowType;
static constexpr NonDarcyFlowEnum NON_DARCY_NONE = RimCompletionEnums::NON_DARCY_NONE;
static constexpr NonDarcyFlowEnum NON_DARCY_COMPUTED = RimCompletionEnums::NON_DARCY_COMPUTED;
static constexpr NonDarcyFlowEnum NON_DARCY_USER_DEFINED = RimCompletionEnums::NON_DARCY_USER_DEFINED;
public:
RimFractureTemplate();
ApplicationLibCode/ProjectDataModel/Completions/RimMswCompletionParameters.cpp
+13 -13
View File
@@ -37,28 +37,28 @@
namespace caf
{
template <>
void RimMswCompletionParameters::ReferenceMDEnum::setUp()
void AppEnum<RimCompletionEnums::ReferenceMDType>::setUp()
{
addItem( RimMswCompletionParameters::ReferenceMDType::AUTO_REFERENCE_MD, "GridEntryPoint", "Grid Entry Point", { "GridIntersectionRefMD" } );
addItem( RimMswCompletionParameters::ReferenceMDType::MANUAL_REFERENCE_MD, "UserDefined", "User Defined", { "ManualRefMD" } );
setDefault( RimMswCompletionParameters::ReferenceMDType::AUTO_REFERENCE_MD );
addItem( RimCompletionEnums::ReferenceMDType::AUTO_REFERENCE_MD, "GridEntryPoint", "Grid Entry Point", { "GridIntersectionRefMD" } );
addItem( RimCompletionEnums::ReferenceMDType::MANUAL_REFERENCE_MD, "UserDefined", "User Defined", { "ManualRefMD" } );
setDefault( RimCompletionEnums::ReferenceMDType::AUTO_REFERENCE_MD );
}
template <>
void RimMswCompletionParameters::PressureDropEnum::setUp()
void AppEnum<RimCompletionEnums::PressureDropType>::setUp()
{
addItem( RimMswCompletionParameters::PressureDropType::HYDROSTATIC, "H--", "Hydrostatic" );
addItem( RimMswCompletionParameters::PressureDropType::HYDROSTATIC_FRICTION, "HF-", "Hydrostatic + Friction" );
addItem( RimMswCompletionParameters::PressureDropType::HYDROSTATIC_FRICTION_ACCELERATION, "HFA", "Hydrostatic + Friction + Acceleration" );
setDefault( RimMswCompletionParameters::PressureDropType::HYDROSTATIC_FRICTION );
addItem( RimCompletionEnums::PressureDropType::HYDROSTATIC, "H--", "Hydrostatic" );
addItem( RimCompletionEnums::PressureDropType::HYDROSTATIC_FRICTION, "HF-", "Hydrostatic + Friction" );
addItem( RimCompletionEnums::PressureDropType::HYDROSTATIC_FRICTION_ACCELERATION, "HFA", "Hydrostatic + Friction + Acceleration" );
setDefault( RimCompletionEnums::PressureDropType::HYDROSTATIC_FRICTION );
}
template <>
void RimMswCompletionParameters::LengthAndDepthEnum::setUp()
void AppEnum<RimCompletionEnums::LengthAndDepthType>::setUp()
{
addItem( RimMswCompletionParameters::LengthAndDepthType::INC, "INC", "Incremental" );
addItem( RimMswCompletionParameters::LengthAndDepthType::ABS, "ABS", "Absolute" );
setDefault( RimMswCompletionParameters::LengthAndDepthType::ABS );
addItem( RimCompletionEnums::LengthAndDepthType::INC, "INC", "Incremental" );
addItem( RimCompletionEnums::LengthAndDepthType::ABS, "ABS", "Absolute" );
setDefault( RimCompletionEnums::LengthAndDepthType::ABS );
}
template <>
ApplicationLibCode/ProjectDataModel/Completions/RimMswCompletionParameters.h
+4 -18
View File
@@ -18,6 +18,7 @@
#pragma once
#include "RiaDefines.h"
#include "RimCompletionEnums.h"
#include "cafPdmChildField.h"
#include "cafPdmField.h"
@@ -34,24 +35,9 @@ class RimMswCompletionParameters : public caf::PdmObject
CAF_PDM_HEADER_INIT;
public:
enum class ReferenceMDType
{
AUTO_REFERENCE_MD = 0,
MANUAL_REFERENCE_MD
};
enum class PressureDropType
{
HYDROSTATIC,
HYDROSTATIC_FRICTION,
HYDROSTATIC_FRICTION_ACCELERATION
};
enum class LengthAndDepthType
{
ABS,
INC
};
using ReferenceMDType = RimCompletionEnums::ReferenceMDType;
using PressureDropType = RimCompletionEnums::PressureDropType;
using LengthAndDepthType = RimCompletionEnums::LengthAndDepthType;
enum class DiameterRoughnessMode
{
ApplicationLibCode/ProjectDataModel/Completions/RimNonDarcyPerforationParameters.cpp
+5 -5
View File
@@ -28,13 +28,13 @@
namespace caf
{
template <>
void caf::AppEnum<RimNonDarcyPerforationParameters::NonDarcyFlowEnum>::setUp()
void caf::AppEnum<RimCompletionEnums::NonDarcyFlowType>::setUp()
{
addItem( RimNonDarcyPerforationParameters::NON_DARCY_NONE, "None", "None" );
addItem( RimNonDarcyPerforationParameters::NON_DARCY_COMPUTED, "Computed", "Compute D-factor" );
addItem( RimNonDarcyPerforationParameters::NON_DARCY_USER_DEFINED, "UserDefined", "User Defined D-factor" );
addItem( RimCompletionEnums::NON_DARCY_NONE, "None", "None" );
addItem( RimCompletionEnums::NON_DARCY_COMPUTED, "Computed", "Compute D-factor" );
addItem( RimCompletionEnums::NON_DARCY_USER_DEFINED, "UserDefined", "User Defined D-factor" );
setDefault( RimNonDarcyPerforationParameters::NON_DARCY_NONE );
setDefault( RimCompletionEnums::NON_DARCY_NONE );
}
} // namespace caf
ApplicationLibCode/ProjectDataModel/Completions/RimNonDarcyPerforationParameters.h
+6 -6
View File
@@ -17,6 +17,8 @@
/////////////////////////////////////////////////////////////////////////////////
#pragma once
#include "RimCompletionEnums.h"
#include "cafPdmField.h"
#include "cafPdmObject.h"
#include "cafPdmUiGroup.h"
@@ -26,12 +28,10 @@ class RimNonDarcyPerforationParameters : public caf::PdmObject
CAF_PDM_HEADER_INIT;
public:
enum NonDarcyFlowEnum
{
NON_DARCY_NONE,
NON_DARCY_COMPUTED,
NON_DARCY_USER_DEFINED,
};
using NonDarcyFlowEnum = RimCompletionEnums::NonDarcyFlowType;
static constexpr NonDarcyFlowEnum NON_DARCY_NONE = RimCompletionEnums::NON_DARCY_NONE;
static constexpr NonDarcyFlowEnum NON_DARCY_COMPUTED = RimCompletionEnums::NON_DARCY_COMPUTED;
static constexpr NonDarcyFlowEnum NON_DARCY_USER_DEFINED = RimCompletionEnums::NON_DARCY_USER_DEFINED;
RimNonDarcyPerforationParameters();
~RimNonDarcyPerforationParameters() override;
ApplicationLibCode/ProjectDataModel/Completions/RimSegmentCollection.cpp
-8
View File
@@ -43,14 +43,6 @@ namespace caf
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
template <>
void RimSegmentCollection::ReferenceMDEnum::setUp()
{
addItem( RimSegmentCollection::ReferenceMDType::AUTO_REFERENCE_MD, "GridEntryPoint", "Grid Entry Point", { "GridIntersectionRefMD" } );
addItem( RimSegmentCollection::ReferenceMDType::MANUAL_REFERENCE_MD, "UserDefined", "User Defined", { "ManualRefMD" } );
setDefault( RimSegmentCollection::ReferenceMDType::AUTO_REFERENCE_MD );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
ApplicationLibCode/ProjectDataModel/Completions/RimSegmentCollection.h
+2 -5
View File
@@ -18,6 +18,7 @@
#pragma once
#include "RiaDefines.h"
#include "RimCompletionEnums.h"
#include "cafPdmChildArrayField.h"
#include "cafPdmField.h"
@@ -41,11 +42,7 @@ class RimSegmentCollection : public caf::PdmObject
CAF_PDM_HEADER_INIT;
public:
enum class ReferenceMDType
{
AUTO_REFERENCE_MD = 0,
MANUAL_REFERENCE_MD
};
using ReferenceMDType = RimCompletionEnums::ReferenceMDType;
enum class CompsegsSegmentNumberType
{
ApplicationLibCode/ProjectDataModel/Completions/RimWellPathCompletionSettings.cpp
-17
View File
@@ -74,23 +74,6 @@ void RimWellPathCompletionSettings::HydrostaticDensityEnum::setUp()
setDefault( RimWellPathCompletionSettings::SEGMENTED );
}
template <>
void RimWellPathCompletionSettings::PressureDropEnum::setUp()
{
addItem( RimWellPathCompletionSettings::PressureDropType::HYDROSTATIC, "H--", "Hydrostatic" );
addItem( RimWellPathCompletionSettings::PressureDropType::HYDROSTATIC_FRICTION, "HF-", "Hydrostatic + Friction" );
addItem( RimWellPathCompletionSettings::PressureDropType::HYDROSTATIC_FRICTION_ACCELERATION, "HFA", "Hydrostatic + Friction + Acceleration" );
setDefault( RimWellPathCompletionSettings::PressureDropType::HYDROSTATIC_FRICTION );
}
template <>
void RimWellPathCompletionSettings::LengthAndDepthEnum::setUp()
{
addItem( RimWellPathCompletionSettings::LengthAndDepthType::INC, "INC", "Incremental" );
addItem( RimWellPathCompletionSettings::LengthAndDepthType::ABS, "ABS", "Absolute" );
setDefault( RimWellPathCompletionSettings::LengthAndDepthType::ABS );
}
} // namespace caf
namespace
ApplicationLibCode/ProjectDataModel/Completions/RimWellPathCompletionSettings.h
+4 -11
View File
@@ -17,6 +17,8 @@
/////////////////////////////////////////////////////////////////////////////////
#pragma once
#include "RimCompletionEnums.h"
#include "cafPdmChildField.h"
#include "cafPdmField.h"
#include "cafPdmObject.h"
@@ -65,19 +67,10 @@ public:
};
using HydrostaticDensityEnum = caf::AppEnum<HydrostaticDensity>;
enum class PressureDropType
{
HYDROSTATIC,
HYDROSTATIC_FRICTION,
HYDROSTATIC_FRICTION_ACCELERATION
};
using PressureDropType = RimCompletionEnums::PressureDropType;
using PressureDropEnum = caf::AppEnum<PressureDropType>;
enum class LengthAndDepthType
{
ABS,
INC
};
using LengthAndDepthType = RimCompletionEnums::LengthAndDepthType;
using LengthAndDepthEnum = caf::AppEnum<LengthAndDepthType>;
public:
ApplicationLibCode/ProjectDataModel/WellEvents/RimWellEventEnums.h
+27
View File
@@ -0,0 +1,27 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2026- Equinor ASA
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
// FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#pragma once
namespace RimWellEventEnums
{
enum class State
{
OPEN,
SHUT
};
} // namespace RimWellEventEnums
ApplicationLibCode/ProjectDataModel/WellEvents/RimWellEventPerf.cpp
+4 -4
View File
@@ -27,11 +27,11 @@
namespace caf
{
template <>
void caf::AppEnum<RimWellEventPerf::State>::setUp()
void caf::AppEnum<RimWellEventEnums::State>::setUp()
{
addItem( RimWellEventPerf::State::OPEN, "OPEN", "Open" );
addItem( RimWellEventPerf::State::SHUT, "SHUT", "Shut" );
setDefault( RimWellEventPerf::State::OPEN );
addItem( RimWellEventEnums::State::OPEN, "OPEN", "Open" );
addItem( RimWellEventEnums::State::SHUT, "SHUT", "Shut" );
setDefault( RimWellEventEnums::State::OPEN );
}
} // namespace caf
ApplicationLibCode/ProjectDataModel/WellEvents/RimWellEventPerf.h
+3 -5
View File
@@ -18,6 +18,8 @@
#pragma once
#include "RimWellEventEnums.h"
#include "RimWellEvent.h"
#include "cafAppEnum.h"
@@ -36,11 +38,7 @@ class RimWellEventPerf : public RimWellEvent
CAF_PDM_HEADER_INIT;
public:
enum class State
{
OPEN,
SHUT
};
using State = RimWellEventEnums::State;
RimWellEventPerf();
~RimWellEventPerf() override;
ApplicationLibCode/ProjectDataModel/WellEvents/RimWellEventValve.cpp
-8
View File
@@ -26,14 +26,6 @@
namespace caf
{
template <>
void caf::AppEnum<RimWellEventValve::State>::setUp()
{
addItem( RimWellEventValve::State::OPEN, "OPEN", "Open" );
addItem( RimWellEventValve::State::SHUT, "SHUT", "Shut" );
setDefault( RimWellEventValve::State::OPEN );
}
template <>
void caf::AppEnum<RimWellEventValve::ValveType>::setUp()
{
ApplicationLibCode/ProjectDataModel/WellEvents/RimWellEventValve.h
+3 -5
View File
@@ -18,6 +18,8 @@
#pragma once
#include "RimWellEventEnums.h"
#include "RimWellEvent.h"
#include "cafAppEnum.h"
@@ -36,11 +38,7 @@ class RimWellEventValve : public RimWellEvent
CAF_PDM_HEADER_INIT;
public:
enum class State
{
OPEN,
SHUT
};
using State = RimWellEventEnums::State;
enum class ValveType
{