Skip to content

Commit

Permalink
SWIG Port of RESQML Wellbore from WITSML well getter
Browse files Browse the repository at this point in the history
  • Loading branch information
philippeVerney committed Jun 2, 2023
1 parent 6e30da6 commit e47f072
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 9 deletions.
4 changes: 3 additions & 1 deletion src/resqml2/AbstractProperty.h
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ namespace RESQML2_NS
/**
* Checks if this property has at least one realization index. Realization index is used if the property is
* the result of a multi-realization process.
* Reamrk : v2.0.1 is constrained to have a maximum of one realisation index
* Remark : v2.0.1 is constrained to have a maximum of one realisation index
*
* @returns True if the property has at least one realization index, false if not.
*/
Expand All @@ -216,6 +216,7 @@ namespace RESQML2_NS
* Gets the realization index of this property. Realization index is used if the property is the
* result of a multi-realization process. You should have checked before that this property
* actually has a realization index.
* Remark : v2.0.1 is constrained to have a maximum of one realisation index
*
* @exception std::invalid_argument If this property has actually no realization index.
*
Expand All @@ -242,6 +243,7 @@ namespace RESQML2_NS
* @exception std::logic_error If no supported gSOAP proxy is available.
*
* @param realizationIndices The realization indices to set to this property.
* Remark : v2.0.1 is constrained to have a maximum of one realisation index
* @param [in,out] hdfProxy (Optional) The HDF proxy where to store @p
* realizationIndices values. If @p nullptr (default), then
* the repository default HDF proxy will be used.
Expand Down
2 changes: 1 addition & 1 deletion src/witsml2/Well.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ under the License.

using namespace WITSML2_NS;

std::vector<RESQML2_NS::WellboreFeature *> Well::getResqmlWellboreFeatures() const
std::vector<RESQML2_NS::WellboreFeature *> Well::getResqmlWellboreFeatureSet() const
{
return getRepository()->getSourceObjects<RESQML2_NS::WellboreFeature>(this);
}
Expand Down
8 changes: 1 addition & 7 deletions src/witsml2/Well.h
Original file line number Diff line number Diff line change
Expand Up @@ -181,13 +181,7 @@ namespace WITSML2_NS
*/
DLL_IMPORT_OR_EXPORT virtual unsigned int geLocationCount() const = 0;

/**
* Gets resqml wellbore features
*
* @returns Null if it fails, else the RESQML wellbore features.
*/
DLL_IMPORT_OR_EXPORT std::vector<RESQML2_NS::WellboreFeature *> getResqmlWellboreFeatures() const;

GETTER_DATAOBJECTS(RESQML2_NS::WellboreFeature, ResqmlWellboreFeature)
GETTER_DATAOBJECTS(WITSML2_NS::Wellbore, Wellbore)
GETTER_DATAOBJECTS(WITSML2_1_NS::WellCompletion, Wellcompletion)

Expand Down
1 change: 1 addition & 0 deletions swig/swigWitsml2Include.i
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,7 @@ namespace WITSML2_NS
* @returns An int.
*/unsigned int geLocationCount() const;

SWIG_GETTER_DATAOBJECTS(RESQML2_NS::WellboreFeature, ResqmlWellboreFeature)
SWIG_GETTER_DATAOBJECTS(WITSML2_NS::Wellbore, Wellbore)
SWIG_GETTER_DATAOBJECTS(WITSML2_1_NS::WellCompletion, Wellcompletion)
};
Expand Down

0 comments on commit e47f072

Please sign in to comment.