Skip to content

Commit 8ad484b

Browse files
philippeVerneyphilippeVerney
authored
v2.14.0.0
2 parents a34abc0 + 4933fe1 commit 8ad484b

193 files changed

Lines changed: 83277 additions & 81109 deletions

File tree

Some content is hidden

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

‎.github/workflows/github-actions.yml‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jobs:
44
windows-2022-staticLink-cs:
55
runs-on: windows-2022
66
steps:
7-
- uses: actions/checkout@v4
7+
- uses: actions/checkout@v5
88
- name: zlib install
99
run: |
1010
Invoke-WebRequest https://zlib.net/current/zlib.tar.gz -OutFile ${{ runner.temp }}\zlib.tar.gz
@@ -82,8 +82,8 @@ jobs:
8282
CC: ${{ matrix.cc }}
8383
CXX: ${{ matrix.cxx }}
8484
steps:
85-
- uses: actions/checkout@v4
86-
- uses: actions/setup-java@v4
85+
- uses: actions/checkout@v5
86+
- uses: actions/setup-java@v5
8787
with:
8888
distribution: 'temurin' # See 'Supported distributions' for available options
8989
java-version: '11'
@@ -125,13 +125,13 @@ jobs:
125125
name: Build wheels on windows-latest
126126
runs-on: windows-latest
127127
steps:
128-
- uses: actions/checkout@v4
128+
- uses: actions/checkout@v5
129129
- name: Stub `setup.py` check
130130
# It will be generated during CMake run
131131
# https://github.com/pypa/cibuildwheel/issues/1139
132132
run: touch python/setup.py
133133
- name: Build wheels
134-
uses: pypa/cibuildwheel@v2.21.3
134+
uses: pypa/cibuildwheel@v3.2.1
135135
env:
136136
CIBW_BUILD: cp38-win_amd64 cp39-win_amd64 cp310-win_amd64 cp311-win_amd64 cp312-win_amd64 cp313-win_amd64
137137
CIBW_ARCHS: auto64
@@ -158,13 +158,14 @@ jobs:
158158
name: Build wheels on ubuntu-latest
159159
runs-on: ubuntu-latest
160160
steps:
161-
- uses: actions/checkout@v4
161+
- uses: actions/checkout@v5
162162
- name: Stub `setup.py` check
163163
# It will be generated during CMake run
164164
# https://github.com/pypa/cibuildwheel/issues/1139
165165
run: touch python/setup.py
166166
- name: Build wheels
167-
uses: pypa/cibuildwheel@v2.21.3
167+
# Cannot use a more recent version than v2.22.0 because of fetappi wheel which uses AVRO which cannot be built with GNU 14.
168+
uses: pypa/cibuildwheel@v2.22.0
168169
env:
169170
CIBW_BUILD: cp38-manylinux_* cp39-manylinux_* cp310-manylinux_* cp311-manylinux_* cp312-manylinux_* cp313-manylinux_*
170171
CIBW_ARCHS: auto64
@@ -195,13 +196,13 @@ jobs:
195196
name: Build wheels on macos-14
196197
runs-on: macos-14
197198
steps:
198-
- uses: actions/checkout@v4
199+
- uses: actions/checkout@v5
199200
- name: Stub `setup.py` check
200201
# It will be generated during CMake run
201202
# https://github.com/pypa/cibuildwheel/issues/1139
202203
run: touch python/setup.py
203204
- name: Build wheels
204-
uses: pypa/cibuildwheel@v2.21.3
205+
uses: pypa/cibuildwheel@v3.2.1
205206
env:
206207
CIBW_BUILD: cp38-macosx_* cp39-macosx_* cp310-macosx_* cp311-macosx_* cp312-macosx_* cp313-macosx_*
207208
CIBW_ARCHS: auto64
@@ -247,7 +248,7 @@ jobs:
247248
runs-on: ubuntu-22.04
248249
steps:
249250
- name: Checkout
250-
uses: actions/checkout@v4
251+
uses: actions/checkout@v5
251252
- name: APT install
252253
run: |
253254
sudo apt update
@@ -267,7 +268,7 @@ jobs:
267268
ubuntu-latest-valgrind-unitTest:
268269
runs-on: ubuntu-latest
269270
steps:
270-
- uses: actions/checkout@v4
271+
- uses: actions/checkout@v5
271272
- name: APT install
272273
run: |
273274
sudo apt update
@@ -291,7 +292,7 @@ jobs:
291292
runs-on: ubuntu-22.04
292293
steps:
293294
- uses: mymindstorm/setup-emsdk@v11
294-
- uses: actions/checkout@v4
295+
- uses: actions/checkout@v5
295296
- name: Verify
296297
run: emcc -v
297298
- name: "Set environmental variables"
@@ -352,7 +353,7 @@ jobs:
352353
emmake make -j8 fesapi-wasm
353354
emmake make -j8 fesapi-wasm-node
354355
- name: 'Upload Artifact'
355-
uses: actions/upload-artifact@v3
356+
uses: actions/upload-artifact@v4
356357
with:
357358
name: fesapi-mjs
358359
path: |

‎CMakeLists.txt‎

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

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

@@ -64,14 +64,14 @@ ELSE()
6464
ENDIF()
6565
IF(HDF5_PREFER_PARALLEL)
6666
if(NOT HDF5_IS_PARALLEL)
67-
message(FATAL_ERROR
68-
"Parallel HDF5 required but only serial version found!"
67+
message(WARNING
68+
"Parallel HDF5 is preferred but only serial version found!"
6969
)
7070
ENDIF()
7171
ELSE()
7272
IF(HDF5_IS_PARALLEL)
73-
message(FATAL_ERROR
74-
"Serial HDF5 required but only parallel version found!"
73+
message(WARNING
74+
"Serial HDF5 is preferred but only parallel version found!"
7575
)
7676
ENDIF()
7777
ENDIF()

‎NOTICE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2018 F2I-CONSULTING
1+
Copyright 2018-2025 F2I-CONSULTING
22

33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.

‎cmake/FesapiJavaExample.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ private static void serializeBoundaries(DataObjectRepository repo, AbstractHdfPr
477477
fesapi.DoubleArray_setitem(prop1Values, 14, 351);
478478
fesapi.DoubleArray_setitem(prop1Values, 15, 352);
479479

480-
contProp1.pushBackDoubleHdf5Array2dOfValues(prop1Values, 2, 8, hdfProxy);
480+
contProp1.pushBackDoubleArray2dOfValues(prop1Values, 2, 8, hdfProxy);
481481
}
482482
finally {
483483
fesapi.delete_DoubleArray(prop1Values);
@@ -497,7 +497,7 @@ private static void serializeIjkGrid(DataObjectRepository repo, AbstractHdfProxy
497497
try {
498498
fesapi.UInt16Array_setitem(propValues, 0, 0);
499499
fesapi.UInt16Array_setitem(propValues, 1, 1);
500-
discreteProp1.pushBackUInt16Hdf5Array3dOfValues(propValues, 2, 1, 1, hdfProxy, 1111);
500+
discreteProp1.pushBackUInt16Array3dOfValues(propValues, 2, 1, 1, hdfProxy, 1111);
501501
}
502502
finally {
503503
fesapi.delete_UInt16Array(propValues);
@@ -510,7 +510,7 @@ private static void serializeIjkGrid(DataObjectRepository repo, AbstractHdfProxy
510510
try {
511511
fesapi.UInt16Array_setitem(propValues, 0, 10);
512512
fesapi.UInt16Array_setitem(propValues, 1, 11);
513-
discreteProp2.pushBackUInt16Hdf5Array3dOfValues(propValues, 2, 1, 1, hdfProxy, 1111);
513+
discreteProp2.pushBackUInt16Array3dOfValues(propValues, 2, 1, 1, hdfProxy, 1111);
514514
}
515515
finally {
516516
fesapi.delete_UInt16Array(propValues);
@@ -588,7 +588,7 @@ private static void serializeGraphicalInformationSet(DataObjectRepository repo,
588588
try {
589589
fesapi.UInt16Array_setitem(propValues, 0, 10);
590590
fesapi.UInt16Array_setitem(propValues, 1, 11);
591-
discreteProp2.pushBackUInt16Hdf5Array3dOfValues(propValues, 2, 1, 1, hdfProxy, 1111);
591+
discreteProp2.pushBackUInt16Array3dOfValues(propValues, 2, 1, 1, hdfProxy, 1111);
592592
}
593593
finally {
594594
fesapi.delete_UInt16Array(propValues);
@@ -625,7 +625,7 @@ private static void serializeGraphicalInformationSet(DataObjectRepository repo,
625625
finally {
626626
fesapi.delete_DoubleArray(values);
627627
}
628-
contColMapContProp.pushBackDoubleHdf5Array2dOfValues(values, numPointInFastestDirection, numPointsInSlowestDirection, hdfProxy);
628+
contColMapContProp.pushBackDoubleArray2dOfValues(values, numPointInFastestDirection, numPointsInSlowestDirection, hdfProxy);
629629

630630
ContinuousColorMap contColMap = repo.createContinuousColorMap("a207faa2-963e-48d6-b3ad-53f6c1fc4dd4", "Continuous color map", resqml22__InterpolationDomain.rgb, resqml22__InterpolationMethod.linear);
631631
SWIGTYPE_p_unsigned_char contColMapRgbColors = fesapi.new_UInt8Array(6);

‎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/pyproject.toml.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ readme = "README.md"
1616
classifiers=[
1717
'Development Status :: 5 - Production/Stable',
1818
'Intended Audience :: Developers',
19-
'License :: OSI Approved :: Apache Software License',
2019
'Operating System :: Microsoft :: Windows',
2120
'Operating System :: POSIX :: Linux',
2221
'Operating System :: MacOS',
@@ -29,9 +28,10 @@ classifiers=[
2928
'Programming Language :: Python :: 3.12',
3029
'Topic :: Software Development',
3130
'Topic :: Software Development :: Libraries',
32-
'Topic :: Software Development :: Libraries :: Application Frameworks ',
31+
'Topic :: Software Development :: Libraries :: Application Frameworks',
3332
'Topic :: File Formats',
3433
]
34+
license = {text = "Apache-2.0"}
3535
keywords = [
3636
"energistics",
3737
"resqml",

‎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

0 commit comments

Comments
 (0)