Skip to content

Commit 04b034f

Browse files
philippeVerneyphilippeVerney
committed
Shift from PRODML2.2 support to PRODML2.3 support
Bump gsoap to version 2.8.139E
1 parent b16e1e5 commit 04b034f

49 files changed

Lines changed: 80430 additions & 79172 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ set (FESAPI_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
1212

1313
# version mechanism
1414
set (Fesapi_VERSION_MAJOR 2)
15-
set (Fesapi_VERSION_MINOR 13)
16-
set (Fesapi_VERSION_PATCH 1)
15+
set (Fesapi_VERSION_MINOR 14)
16+
set (Fesapi_VERSION_PATCH 0)
1717
set (Fesapi_VERSION_TWEAK 0)
1818

1919
set (Fesapi_VERSION ${Fesapi_VERSION_MAJOR}.${Fesapi_VERSION_MINOR}.${Fesapi_VERSION_PATCH}.${Fesapi_VERSION_TWEAK})

‎cmake/nsDefinitions.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ under the License.
3737
/** @namespace ${FESAPI_WITSML2_1_NS} @brief The ${FESAPI_WITSML2_1_NS} namespace. */
3838
#define WITSML2_1_NS ${FESAPI_WITSML2_1_NS}
3939

40-
/** @namespace ${FESAPI_PRODML2_1_NS} @brief The ${FESAPI_PRODML2_1_NS} namespace. */
41-
#define PRODML2_2_NS ${FESAPI_PRODML2_2_NS}
40+
/** @namespace ${FESAPI_PRODML2_3_NS} @brief The ${FESAPI_PRODML2_3_NS} namespace. */
41+
#define PRODML2_3_NS ${FESAPI_PRODML2_3_NS}
4242

4343
/** @namespace ${FESAPI_EML2_NS} @brief The ${FESAPI_EML2_NS} namespace. This namespaces contains classes to handle data objects that exist in various EML v2.*. The classes of this namespace should be favored, when possible, instead of the classes of the namespace ${FESAPI_EML2_0_NS}, ${FESAPI_EML2_1_NS}, ${FESAPI_EML2_2_NS} and ${FESAPI_EML2_3_NS}. */
4444
#define EML2_NS ${FESAPI_EML2_NS}

‎cmake/swigCsInclude.i‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -888,8 +888,8 @@ ${COMMENT_END}
888888
${COMMENT_START}
889889
case DataObjectName.FLUIDBOUNDARYINTERPRETATION : return new F2iConsulting.Fesapi.${FESAPI_RESQML2_2_NS}.FluidBoundaryInterpretation(cPtr, owner);
890890
${COMMENT_END}
891-
case DataObjectName.FLUIDCHARACTERIZATION : return new F2iConsulting.Fesapi.${FESAPI_PRODML2_2_NS}.FluidCharacterization(cPtr, owner);
892-
case DataObjectName.FLUIDSYSTEM : return new F2iConsulting.Fesapi.${FESAPI_PRODML2_2_NS}.FluidSystem(cPtr, owner);
891+
case DataObjectName.FLUIDCHARACTERIZATION : return new F2iConsulting.Fesapi.${FESAPI_PRODML2_3_NS}.FluidCharacterization(cPtr, owner);
892+
case DataObjectName.FLUIDSYSTEM : return new F2iConsulting.Fesapi.${FESAPI_PRODML2_3_NS}.FluidSystem(cPtr, owner);
893893
case DataObjectName.FRONTIERFEATURE : return new F2iConsulting.Fesapi.${FESAPI_RESQML2_0_1_NS}.FrontierFeature(cPtr, owner);
894894
case DataObjectName.GENETICBOUNDARYFEATURE :
895895
F2iConsulting.Fesapi.${FESAPI_RESQML2_0_1_NS}.GeneticBoundaryFeature result = new F2iConsulting.Fesapi.${FESAPI_RESQML2_0_1_NS}.GeneticBoundaryFeature(cPtr, owner);
@@ -950,7 +950,7 @@ ${COMMENT_END}
950950
case DataObjectName.SUBREPRESENTATION : return resqml2_instantiateSubRepresentation(cPtr, owner);
951951
case DataObjectName.TECTONICBOUNDARYFEATURE : return new F2iConsulting.Fesapi.${FESAPI_RESQML2_0_1_NS}.TectonicBoundaryFeature(cPtr, owner);
952952
case DataObjectName.TIMESERIES : return eml2_instantiateTimeSeries(cPtr, owner);
953-
case DataObjectName.TIMESERIESDATA : return new F2iConsulting.Fesapi.${FESAPI_PRODML2_2_NS}.TimeSeriesData(cPtr, owner);
953+
case DataObjectName.TIMESERIESDATA : return new F2iConsulting.Fesapi.${FESAPI_PRODML2_3_NS}.TimeSeriesData(cPtr, owner);
954954
case DataObjectName.TRAJECTORY : return new F2iConsulting.Fesapi.${FESAPI_WITSML2_1_NS}.Trajectory(cPtr, owner);
955955
case DataObjectName.TRIANGULATEDSETREPRESENTATION : return resqml2_instantiateTriangulatedSetRepresentation(cPtr, owner);
956956
case DataObjectName.TRUNCATEDIJKGRIDREPRESENTATION : return resqml2_instantiateConcreteIjkGridRepresentation(cPtr, owner);

‎cmake/swigJavaInclude.i‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -888,8 +888,8 @@ ${COMMENT_END}
888888
${COMMENT_START}
889889
case FLUIDBOUNDARYINTERPRETATION : return new com.f2i_consulting.fesapi.${FESAPI_RESQML2_2_NS}.Resqml22_FluidBoundaryInterpretation(cPtr, owner);
890890
${COMMENT_END}
891-
case FLUIDCHARACTERIZATION : return new com.f2i_consulting.fesapi.${FESAPI_PRODML2_2_NS}.FluidCharacterization(cPtr, owner);
892-
case FLUIDSYSTEM : return new com.f2i_consulting.fesapi.${FESAPI_PRODML2_2_NS}.FluidSystem(cPtr, owner);
891+
case FLUIDCHARACTERIZATION : return new com.f2i_consulting.fesapi.${FESAPI_PRODML2_3_NS}.FluidCharacterization(cPtr, owner);
892+
case FLUIDSYSTEM : return new com.f2i_consulting.fesapi.${FESAPI_PRODML2_3_NS}.FluidSystem(cPtr, owner);
893893
case FRONTIERFEATURE : return new com.f2i_consulting.fesapi.${FESAPI_RESQML2_0_1_NS}.Resqml20_FrontierFeature(cPtr, owner);
894894
case GENETICBOUNDARYFEATURE :
895895
com.f2i_consulting.fesapi.${FESAPI_RESQML2_0_1_NS}.Resqml20_GeneticBoundaryFeature result = new com.f2i_consulting.fesapi.${FESAPI_RESQML2_0_1_NS}.Resqml20_GeneticBoundaryFeature(cPtr, owner);
@@ -950,7 +950,7 @@ ${COMMENT_END}
950950
case SUBREPRESENTATION : return resqml2_instantiateSubRepresentation(cPtr, owner);
951951
case TECTONICBOUNDARYFEATURE : return new com.f2i_consulting.fesapi.${FESAPI_RESQML2_0_1_NS}.Resqml20_TectonicBoundaryFeature(cPtr, owner);
952952
case TIMESERIES : return eml2_instantiateTimeSeries(cPtr, owner);
953-
case TIMESERIESDATA : return new com.f2i_consulting.fesapi.${FESAPI_PRODML2_2_NS}.TimeSeriesData(cPtr, owner);
953+
case TIMESERIESDATA : return new com.f2i_consulting.fesapi.${FESAPI_PRODML2_3_NS}.TimeSeriesData(cPtr, owner);
954954
case TRAJECTORY : return new com.f2i_consulting.fesapi.${FESAPI_WITSML2_1_NS}.Witsml21_Trajectory(cPtr, owner);
955955
case TRIANGULATEDSETREPRESENTATION : return resqml2_instantiateTriangulatedSetRepresentation(cPtr, owner);
956956
case TRUNCATEDIJKGRIDREPRESENTATION : return resqml2_instantiateConcreteIjkGridRepresentation(cPtr, owner);

‎cmake/swigPythonInclude.i.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace COMMON_NS
3535
if (xmlNs == "resqml20") return "${FESAPI_RESQML2_0_1_NS}";
3636
else if (xmlNs == "resqml22") return "${FESAPI_RESQML2_2_NS}";
3737
else if (xmlNs == "witsml21") return "${FESAPI_WITSML2_1_NS}";
38-
else if (xmlNs == "prodml22") return "${FESAPI_PRODML2_2_NS}";
38+
else if (xmlNs == "prodml23") return "${FESAPI_PRODML2_3_NS}";
3939
else if (xmlNs == "eml23") return "${FESAPI_EML2_3_NS}";
4040
}();
4141

@@ -76,7 +76,7 @@ namespace EML2_NS
7676
if (xmlNs == "resqml20") return "${FESAPI_RESQML2_0_1_NS}";
7777
else if (xmlNs == "resqml22") return "${FESAPI_RESQML2_2_NS}";
7878
else if (xmlNs == "witsml21") return "${FESAPI_WITSML2_1_NS}";
79-
else if (xmlNs == "prodml22") return "${FESAPI_PRODML2_2_NS}";
79+
else if (xmlNs == "prodml23") return "${FESAPI_PRODML2_3_NS}";
8080
else if (xmlNs == "eml23") return "${FESAPI_EML2_3_NS}";
8181
}();
8282

‎doc/Doxyfile.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2444,7 +2444,7 @@ EXPAND_AS_DEFINED = COMMON_NS \
24442444
RESQML2_0_1_NS \
24452445
RESQML2_2_NS \
24462446
WITSML2_1_NS \
2447-
PRODML2_2_NS \
2447+
PRODML2_3_NS \
24482448
EML2_NS \
24492449
EML2_0_NS \
24502450
EML2_3_NS

‎example/example.cpp‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2124,9 +2124,9 @@ void serializeRockFluidOrganization(COMMON_NS::DataObjectRepository & repo, EML2
21242124
*/
21252125
}
21262126

2127-
PRODML2_2_NS::FluidSystem* serializeFluidSystem(COMMON_NS::DataObjectRepository & repo)
2127+
PRODML2_3_NS::FluidSystem* serializeFluidSystem(COMMON_NS::DataObjectRepository & repo)
21282128
{
2129-
PRODML2_2_NS::FluidSystem* fluidSystem = repo.createFluidSystem("e8ae6cf8-c4a4-40bf-a3c7-5bf5d0a5b1dd", "Fluid system Region 1",
2129+
PRODML2_3_NS::FluidSystem* fluidSystem = repo.createFluidSystem("e8ae6cf8-c4a4-40bf-a3c7-5bf5d0a5b1dd", "Fluid system Region 1",
21302130
std::numeric_limits<double>::quiet_NaN(), gsoap_eml2_3::eml23__ThermodynamicTemperatureUom::degF, std::numeric_limits<double>::quiet_NaN(), gsoap_eml2_3::eml23__PressureUom::psi,
21312131
gsoap_eml2_3::prodml22__ReservoirFluidKind::black_x0020oil, std::numeric_limits<double>::quiet_NaN(), gsoap_eml2_3::eml23__VolumePerVolumeUom::ft3_x002fbbl);
21322132

@@ -2144,9 +2144,9 @@ PRODML2_2_NS::FluidSystem* serializeFluidSystem(COMMON_NS::DataObjectRepository
21442144
return fluidSystem;
21452145
}
21462146

2147-
void serializeOilFluidCharacCharacterization(COMMON_NS::DataObjectRepository & repo, PRODML2_2_NS::FluidSystem* fluidSystem = nullptr)
2147+
void serializeOilFluidCharacCharacterization(COMMON_NS::DataObjectRepository & repo, PRODML2_3_NS::FluidSystem* fluidSystem = nullptr)
21482148
{
2149-
PRODML2_2_NS::FluidCharacterization* oilFluidCharac = repo.createFluidCharacterization("656aa27f-5373-4c7f-9469-a57890e2b5d8", "Oil Fluid Characterization");
2149+
PRODML2_3_NS::FluidCharacterization* oilFluidCharac = repo.createFluidCharacterization("656aa27f-5373-4c7f-9469-a57890e2b5d8", "Oil Fluid Characterization");
21502150
oilFluidCharac->setRockFluidUnit(oilColumnInterp);
21512151
oilFluidCharac->pushBackModel();
21522152

@@ -2262,9 +2262,9 @@ void serializeOilFluidCharacCharacterization(COMMON_NS::DataObjectRepository & r
22622262
}
22632263
}
22642264

2265-
void serializeGasFluidCharacCharacterization(COMMON_NS::DataObjectRepository & repo, PRODML2_2_NS::FluidSystem* fluidSystem = nullptr)
2265+
void serializeGasFluidCharacCharacterization(COMMON_NS::DataObjectRepository & repo, PRODML2_3_NS::FluidSystem* fluidSystem = nullptr)
22662266
{
2267-
PRODML2_2_NS::FluidCharacterization* gasFluidCharac = repo.createFluidCharacterization("5ea0eeb2-a287-4a2e-9362-1d2491e491b2", "Gas Fluid Characterization");
2267+
PRODML2_3_NS::FluidCharacterization* gasFluidCharac = repo.createFluidCharacterization("5ea0eeb2-a287-4a2e-9362-1d2491e491b2", "Gas Fluid Characterization");
22682268
gasFluidCharac->setRockFluidUnit(gasCapInterp);
22692269
gasFluidCharac->pushBackModel();
22702270

@@ -2289,9 +2289,9 @@ void serializeGasFluidCharacCharacterization(COMMON_NS::DataObjectRepository & r
22892289
}
22902290
}
22912291

2292-
void serializeWaterFluidCharacCharacterization(COMMON_NS::DataObjectRepository & repo, PRODML2_2_NS::FluidSystem* fluidSystem = nullptr)
2292+
void serializeWaterFluidCharacCharacterization(COMMON_NS::DataObjectRepository & repo, PRODML2_3_NS::FluidSystem* fluidSystem = nullptr)
22932293
{
2294-
PRODML2_2_NS::FluidCharacterization* waterFluidCharac = repo.createFluidCharacterization("8bea1d3f-9599-4a45-b88c-8196aef3f397", "Water Fluid Characterization");
2294+
PRODML2_3_NS::FluidCharacterization* waterFluidCharac = repo.createFluidCharacterization("8bea1d3f-9599-4a45-b88c-8196aef3f397", "Water Fluid Characterization");
22952295
waterFluidCharac->setRockFluidUnit(aquiferInterp);
22962296
waterFluidCharac->pushBackModel();
22972297

@@ -2307,16 +2307,16 @@ void serializeWaterFluidCharacCharacterization(COMMON_NS::DataObjectRepository &
23072307
}
23082308
}
23092309

2310-
void serializeTabularFluidCharacterization(COMMON_NS::DataObjectRepository & repo, PRODML2_2_NS::FluidSystem* fluidSystem = nullptr)
2310+
void serializeTabularFluidCharacterization(COMMON_NS::DataObjectRepository & repo, PRODML2_3_NS::FluidSystem* fluidSystem = nullptr)
23112311
{
23122312
serializeOilFluidCharacCharacterization(repo, fluidSystem);
23132313
serializeGasFluidCharacCharacterization(repo, fluidSystem);
23142314
serializeWaterFluidCharacCharacterization(repo, fluidSystem);
23152315
}
23162316

2317-
void serializeCompositionalFluidCharacterization(COMMON_NS::DataObjectRepository & repo, PRODML2_2_NS::FluidSystem* fluidSystem = nullptr)
2317+
void serializeCompositionalFluidCharacterization(COMMON_NS::DataObjectRepository & repo, PRODML2_3_NS::FluidSystem* fluidSystem = nullptr)
23182318
{
2319-
PRODML2_2_NS::FluidCharacterization* fluidCharac = repo.createFluidCharacterization("6f5f6146-6f8b-4222-b322-9dbef1e7e4cf", "my compositional Fluid Characterization");
2319+
PRODML2_3_NS::FluidCharacterization* fluidCharac = repo.createFluidCharacterization("6f5f6146-6f8b-4222-b322-9dbef1e7e4cf", "my compositional Fluid Characterization");
23202320

23212321
fluidCharac->pushBackFormationWater("h2o");
23222322
fluidCharac->setFormationWaterSpecificGravity(0, 1.02);
@@ -2333,8 +2333,8 @@ void serializeCompositionalFluidCharacterization(COMMON_NS::DataObjectRepository
23332333
fluidCharac->setModelName(0, "F2I Good Oil No. 4 EOS Demonstration");
23342334
fluidCharac->setModelReferenceTemperature(0, 60, gsoap_eml2_3::eml23__ThermodynamicTemperatureUom::degF);
23352335

2336-
PRODML2_2_NS::PvtSpecification* spec = fluidCharac->initModelSpecification(0, PRODML2_2_NS::FluidCharacterization::SrkEos);
2337-
PRODML2_2_NS::CompositionalSpecification* srkEosSpec = dynamic_cast<PRODML2_2_NS::CompositionalSpecification*>(spec);
2336+
PRODML2_3_NS::PvtSpecification* spec = fluidCharac->initModelSpecification(0, PRODML2_3_NS::FluidCharacterization::SrkEos);
2337+
PRODML2_3_NS::CompositionalSpecification* srkEosSpec = dynamic_cast<PRODML2_3_NS::CompositionalSpecification*>(spec);
23382338
srkEosSpec->pushBackCoefficient(1, gsoap_eml2_3::prodml22__PvtModelParameterKind::a1);
23392339
srkEosSpec->setMixingRule(gsoap_eml2_3::prodml22__MixingRule::classical);
23402340
srkEosSpec->pushBackFluidComponentProperty("h2o");
@@ -2352,7 +2352,7 @@ void serializeCompositionalFluidCharacterization(COMMON_NS::DataObjectRepository
23522352

23532353
void serializeTimeSeriesData(COMMON_NS::DataObjectRepository & repo)
23542354
{
2355-
PRODML2_2_NS::TimeSeriesData* timeSeriesData = repo.createTimeSeriesData("25d2e0d8-dffa-414d-b7cd-f871cb436781", "my Time Series Data");
2355+
PRODML2_3_NS::TimeSeriesData* timeSeriesData = repo.createTimeSeriesData("25d2e0d8-dffa-414d-b7cd-f871cb436781", "my Time Series Data");
23562356

23572357
timeSeriesData->pushBackKeywordValue(gsoap_eml2_3::prodml22__TimeSeriesKeyword::asset_x0020identifier, "prodml://f2i-consulting.com/manifold(HDR01)");
23582358
timeSeriesData->pushBackKeywordValue(gsoap_eml2_3::prodml22__TimeSeriesKeyword::flow, "production");
@@ -2503,7 +2503,7 @@ bool serialize(const string& filePath)
25032503
serializeActivities(&repo);
25042504
serializeRepresentationSetRepresentation(&repo, hdfProxy);
25052505
serializeRockFluidOrganization(repo, hdfProxy);
2506-
PRODML2_2_NS::FluidSystem* fluidSystem = serializeFluidSystem(repo);
2506+
PRODML2_3_NS::FluidSystem* fluidSystem = serializeFluidSystem(repo);
25072507
serializeTabularFluidCharacterization(repo, fluidSystem);
25082508
serializeCompositionalFluidCharacterization(repo);
25092509
serializeTimeSeriesData(repo);
@@ -3021,9 +3021,9 @@ void deserializeRockFluidOrganization(COMMON_NS::DataObjectRepository & repo)
30213021

30223022
void deserializeFluidCharacterization(COMMON_NS::DataObjectRepository & repo)
30233023
{
3024-
std::vector<PRODML2_2_NS::FluidCharacterization*> fluidCharacterization = repo.getDataObjects<PRODML2_2_NS::FluidCharacterization>();
3024+
std::vector<PRODML2_3_NS::FluidCharacterization*> fluidCharacterization = repo.getDataObjects<PRODML2_3_NS::FluidCharacterization>();
30253025
for (size_t fcIndex = 0; fcIndex < fluidCharacterization.size(); ++fcIndex) {
3026-
PRODML2_2_NS::FluidCharacterization* fc = fluidCharacterization[fcIndex];
3026+
PRODML2_3_NS::FluidCharacterization* fc = fluidCharacterization[fcIndex];
30273027
showAllMetadata(fc);
30283028
RESQML2_NS::RockFluidUnitInterpretation* rfu = fc->getRockFluidUnit();
30293029
if (rfu != nullptr) {
@@ -3057,10 +3057,10 @@ void deserializeFluidCharacterization(COMMON_NS::DataObjectRepository & repo)
30573057
}
30583058
if (fc->hasModelRemark(modelIndex)) { cout << "Remark: " << fc->getModelRemark(modelIndex) << std::endl; }
30593059

3060-
PRODML2_2_NS::PvtSpecification* spec = fc->getModelSpecification(modelIndex);
3060+
PRODML2_3_NS::PvtSpecification* spec = fc->getModelSpecification(modelIndex);
30613061
if (spec != nullptr) {
3062-
if (dynamic_cast<PRODML2_2_NS::CompositionalSpecification*>(spec) != nullptr) {
3063-
PRODML2_2_NS::CompositionalSpecification* compoSpec = static_cast<PRODML2_2_NS::CompositionalSpecification*>(spec);
3062+
if (dynamic_cast<PRODML2_3_NS::CompositionalSpecification*>(spec) != nullptr) {
3063+
PRODML2_3_NS::CompositionalSpecification* compoSpec = static_cast<PRODML2_3_NS::CompositionalSpecification*>(spec);
30643064
for (unsigned int coeffIndex = 0; coeffIndex < compoSpec->getCoefficientCount(); ++coeffIndex) {
30653065
cout << "coeff value: " << compoSpec->getCoefficientValue(coeffIndex) << std::endl;
30663066
cout << "coeff kind: " << static_cast<int>(compoSpec->getCoefficientKind(coeffIndex)) << std::endl;
@@ -3088,9 +3088,9 @@ void deserializeFluidCharacterization(COMMON_NS::DataObjectRepository & repo)
30883088

30893089
void deserializeTimeSeriesData(COMMON_NS::DataObjectRepository & repo)
30903090
{
3091-
std::vector<PRODML2_2_NS::TimeSeriesData*> timeSeriesDataSet = repo.getDataObjects<PRODML2_2_NS::TimeSeriesData>();
3091+
std::vector<PRODML2_3_NS::TimeSeriesData*> timeSeriesDataSet = repo.getDataObjects<PRODML2_3_NS::TimeSeriesData>();
30923092
for (size_t timeSeriesDataSetIdx = 0; timeSeriesDataSetIdx < timeSeriesDataSet.size(); ++timeSeriesDataSetIdx) {
3093-
PRODML2_2_NS::TimeSeriesData* tsd = timeSeriesDataSet[timeSeriesDataSetIdx];
3093+
PRODML2_3_NS::TimeSeriesData* tsd = timeSeriesDataSet[timeSeriesDataSetIdx];
30943094
showAllMetadata(tsd);
30953095

30963096
for (unsigned int i = 0; i < tsd->getKeywordCount(); ++i) {

‎src/CMakeLists.txt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ set (RESQML_PREFIX_2_0_1 "resqml2_0_1")
3434
set (RESQML_PREFIX_2_2 "resqml2_2")
3535
set (WITSML_PREFIX_2 "witsml2")
3636
set (WITSML_PREFIX_2_1 "witsml2_1")
37-
set (PRODML_PREFIX_2_2 "prodml2_2")
37+
set (PRODML_PREFIX_2_3 "prodml2_3")
3838
set (EML_PREFIX_2 "eml2")
3939
set (EML_PREFIX_2_0 "eml2_0")
4040
set (EML_PREFIX_2_3 "eml2_3")
@@ -125,7 +125,7 @@ set (WITH_PYTHON_WRAPPING OFF CACHE BOOL "Compile the swig cpp generated file fo
125125
# Namespaces definitions
126126
set (FESAPI_COMMON_NS common CACHE STRING "Namespace for common objects")
127127

128-
set (FESAPI_PRODML2_2_NS prodml2_2 CACHE STRING "Namespace for prodml2_2 objects")
128+
set (FESAPI_PRODML2_3_NS prodml2_3 CACHE STRING "Namespace for prodml2_3 objects")
129129

130130
set (FESAPI_RESQML2_NS resqml2 CACHE STRING "Namespace for resqml2 objects")
131131
set (FESAPI_RESQML2_0_1_NS resqml2_0_1 CACHE STRING "Namespace for resqml2_0_1 objects")
@@ -150,7 +150,7 @@ if (WITH_RESQML2_2)
150150
include(${CMAKE_CURRENT_SOURCE_DIR}/${RESQML_PREFIX_2_2}/CMakeLists.txt)
151151
endif (WITH_RESQML2_2)
152152

153-
include(${CMAKE_CURRENT_SOURCE_DIR}/${PRODML_PREFIX_2_2}/CMakeLists.txt)
153+
include(${CMAKE_CURRENT_SOURCE_DIR}/${PRODML_PREFIX_2_3}/CMakeLists.txt)
154154

155155
include(${CMAKE_CURRENT_SOURCE_DIR}/${WITSML_PREFIX_2}/CMakeLists.txt)
156156
include(${CMAKE_CURRENT_SOURCE_DIR}/${WITSML_PREFIX_2_1}/CMakeLists.txt)
@@ -177,8 +177,8 @@ list(APPEND ALL_SOURCES_AND_HEADERS
177177
${FESAPI_WITSML_2_HEADERS}
178178
${FESAPI_WITSML_2_1_SOURCES}
179179
${FESAPI_WITSML_2_1_HEADERS}
180-
${FESAPI_PRODML_2_2_SOURCES}
181-
${FESAPI_PRODML_2_2_HEADERS}
180+
${FESAPI_PRODML_2_3_SOURCES}
181+
${FESAPI_PRODML_2_3_HEADERS}
182182
${FESAPI_EML_2_SOURCES}
183183
${FESAPI_EML_2_HEADERS}
184184
${FESAPI_EML_2_0_SOURCES}
@@ -221,7 +221,7 @@ if (WIN32)
221221

222222
source_group ("${WITSML_PREFIX_2_1}" FILES ${FESAPI_WITSML_2_1_SOURCES} ${FESAPI_WITSML_2_1_HEADERS})
223223

224-
source_group ("${PRODML_PREFIX_2_2}" FILES ${FESAPI_PRODML_2_2_SOURCES} ${FESAPI_PRODML_2_2_HEADERS})
224+
source_group ("${PRODML_PREFIX_2_3}" FILES ${FESAPI_PRODML_2_3_SOURCES} ${FESAPI_PRODML_2_3_HEADERS})
225225

226226
source_group ("${EML_PREFIX_2}" FILES ${FESAPI_EML_2_SOURCES} ${FESAPI_EML_2_HEADERS})
227227

@@ -343,8 +343,8 @@ if (NOT WITH_PYTHON_WRAPPING AND NOT WITH_DOTNET_WRAPPING AND NOT WITH_JAVA_WRAP
343343

344344
# PRODML headers
345345
INSTALL (
346-
FILES ${FESAPI_PRODML_2_2_HEADERS}
347-
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fesapi/${PRODML_PREFIX_2_2}/
346+
FILES ${FESAPI_PRODML_2_3_HEADERS}
347+
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fesapi/${PRODML_PREFIX_2_3}/
348348
COMPONENT fesapi_headers
349349
)
350350

‎src/common/DataObjectReference.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ DataObjectReference::DataObjectReference(AbstractObject const * dataObj)
2929
if (ns == "resqml20" || ns == "eml20") {
3030
dor20 = dataObj->newResqmlReference();
3131
}
32-
else if (ns == "witsml21" || ns == "prodml22" || ns == "resqml22" || ns == "eml23") {
32+
else if (ns == "witsml21" || ns == "prodml23" || ns == "resqml22" || ns == "eml23") {
3333
dor23 = dataObj->newEml23Reference();
3434
}
3535
}

0 commit comments

Comments
 (0)