v2.14.0.0

.github/workflows/github-actions.yml

@@ -4,7 +4,7 @@ jobs:
   windows-2022-staticLink-cs:
     runs-on: windows-2022
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: zlib install
         run: |
           Invoke-WebRequest https://zlib.net/current/zlib.tar.gz -OutFile ${{ runner.temp }}\zlib.tar.gz
@@ -82,8 +82,8 @@ jobs:
       CC: ${{ matrix.cc }}
       CXX: ${{ matrix.cxx }}
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/checkout@v5
+      - uses: actions/setup-java@v5
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '11'
@@ -125,13 +125,13 @@ jobs:
     name: Build wheels on windows-latest
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Stub `setup.py` check
         # It will be generated during CMake run
         # https://github.com/pypa/cibuildwheel/issues/1139
         run: touch python/setup.py
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.21.3
+        uses: pypa/cibuildwheel@v3.2.1
         env:
           CIBW_BUILD: cp38-win_amd64 cp39-win_amd64 cp310-win_amd64 cp311-win_amd64 cp312-win_amd64 cp313-win_amd64
           CIBW_ARCHS: auto64
@@ -158,13 +158,14 @@ jobs:
     name: Build wheels on ubuntu-latest
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Stub `setup.py` check
         # It will be generated during CMake run
         # https://github.com/pypa/cibuildwheel/issues/1139
         run: touch python/setup.py
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.21.3
+        # Cannot use a more recent version than v2.22.0 because of fetappi wheel which uses AVRO which cannot be built with GNU 14.
+        uses: pypa/cibuildwheel@v2.22.0
         env:
           CIBW_BUILD: cp38-manylinux_* cp39-manylinux_* cp310-manylinux_* cp311-manylinux_* cp312-manylinux_* cp313-manylinux_*
           CIBW_ARCHS: auto64
@@ -195,13 +196,13 @@ jobs:
     name: Build wheels on macos-14
     runs-on: macos-14
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Stub `setup.py` check
         # It will be generated during CMake run
         # https://github.com/pypa/cibuildwheel/issues/1139
         run: touch python/setup.py
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.21.3
+        uses: pypa/cibuildwheel@v3.2.1
         env:
           CIBW_BUILD: cp38-macosx_* cp39-macosx_* cp310-macosx_* cp311-macosx_* cp312-macosx_* cp313-macosx_*
           CIBW_ARCHS: auto64
@@ -247,7 +248,7 @@ jobs:
     runs-on: ubuntu-22.04    
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: APT install
         run: |
           sudo apt update
@@ -267,7 +268,7 @@ jobs:
   ubuntu-latest-valgrind-unitTest:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: APT install
         run: |
           sudo apt update
@@ -291,7 +292,7 @@ jobs:
     runs-on: ubuntu-22.04    
     steps:
       - uses: mymindstorm/setup-emsdk@v11
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Verify
         run: emcc -v
       - name: "Set environmental variables"
@@ -352,7 +353,7 @@ jobs:
           emmake make -j8 fesapi-wasm
           emmake make -j8 fesapi-wasm-node
       - name: 'Upload Artifact'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: fesapi-mjs
           path: |

CMakeLists.txt

@@ -12,7 +12,7 @@ set (FESAPI_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
 
 # version mechanism
 set (Fesapi_VERSION_MAJOR 2)
-set (Fesapi_VERSION_MINOR 13)
+set (Fesapi_VERSION_MINOR 14)
 set (Fesapi_VERSION_PATCH 0)
 set (Fesapi_VERSION_TWEAK 0)
 
@@ -64,14 +64,14 @@ ELSE()
 	ENDIF()
 	IF(HDF5_PREFER_PARALLEL)
 		if(NOT HDF5_IS_PARALLEL)
-			message(FATAL_ERROR
-				"Parallel HDF5 required but only serial version found!"
+			message(WARNING
+				"Parallel HDF5 is preferred but only serial version found!"
 			)
 		ENDIF()
 	ELSE()
 		IF(HDF5_IS_PARALLEL)
-			message(FATAL_ERROR
-				"Serial HDF5 required but only parallel version found!"
+			message(WARNING
+				"Serial HDF5 is preferred but only parallel version found!"
 			)
 		ENDIF()
 	ENDIF()

NOTICE

@@ -1,4 +1,4 @@
-   Copyright 2018 F2I-CONSULTING
+   Copyright 2018-2025 F2I-CONSULTING
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

cmake/FesapiJavaExample.java

@@ -477,7 +477,7 @@ private static void serializeBoundaries(DataObjectRepository repo, AbstractHdfPr
 			fesapi.DoubleArray_setitem(prop1Values, 14, 351);
 			fesapi.DoubleArray_setitem(prop1Values, 15, 352);
 
-			contProp1.pushBackDoubleHdf5Array2dOfValues(prop1Values, 2, 8, hdfProxy);
+			contProp1.pushBackDoubleArray2dOfValues(prop1Values, 2, 8, hdfProxy);
 		}
 		finally {
 			fesapi.delete_DoubleArray(prop1Values);
@@ -497,7 +497,7 @@ private static void serializeIjkGrid(DataObjectRepository repo, AbstractHdfProxy
 		try {
 			fesapi.UInt16Array_setitem(propValues, 0, 0);
 			fesapi.UInt16Array_setitem(propValues, 1, 1);
-			discreteProp1.pushBackUInt16Hdf5Array3dOfValues(propValues, 2, 1, 1, hdfProxy, 1111);
+			discreteProp1.pushBackUInt16Array3dOfValues(propValues, 2, 1, 1, hdfProxy, 1111);
 		}
 		finally {
 			fesapi.delete_UInt16Array(propValues);
@@ -510,7 +510,7 @@ private static void serializeIjkGrid(DataObjectRepository repo, AbstractHdfProxy
 		try {
 			fesapi.UInt16Array_setitem(propValues, 0, 10);
 			fesapi.UInt16Array_setitem(propValues, 1, 11);
-			discreteProp2.pushBackUInt16Hdf5Array3dOfValues(propValues, 2, 1, 1, hdfProxy, 1111);
+			discreteProp2.pushBackUInt16Array3dOfValues(propValues, 2, 1, 1, hdfProxy, 1111);
 		}
 		finally {
 			fesapi.delete_UInt16Array(propValues);
@@ -588,7 +588,7 @@ private static void serializeGraphicalInformationSet(DataObjectRepository repo,
 		try {
 			fesapi.UInt16Array_setitem(propValues, 0, 10);
 			fesapi.UInt16Array_setitem(propValues, 1, 11);
-			discreteProp2.pushBackUInt16Hdf5Array3dOfValues(propValues, 2, 1, 1, hdfProxy, 1111);
+			discreteProp2.pushBackUInt16Array3dOfValues(propValues, 2, 1, 1, hdfProxy, 1111);
 		}
 		finally {
 			fesapi.delete_UInt16Array(propValues);
@@ -625,7 +625,7 @@ private static void serializeGraphicalInformationSet(DataObjectRepository repo,
 		finally {
 			fesapi.delete_DoubleArray(values);
 		}
-		contColMapContProp.pushBackDoubleHdf5Array2dOfValues(values, numPointInFastestDirection, numPointsInSlowestDirection, hdfProxy);
+		contColMapContProp.pushBackDoubleArray2dOfValues(values, numPointInFastestDirection, numPointsInSlowestDirection, hdfProxy);
 
 		ContinuousColorMap contColMap = repo.createContinuousColorMap("a207faa2-963e-48d6-b3ad-53f6c1fc4dd4", "Continuous color map", resqml22__InterpolationDomain.rgb, resqml22__InterpolationMethod.linear);
 		SWIGTYPE_p_unsigned_char contColMapRgbColors = fesapi.new_UInt8Array(6);

cmake/nsDefinitions.h

@@ -37,8 +37,8 @@ under the License.
 /** @namespace	${FESAPI_WITSML2_1_NS} @brief The ${FESAPI_WITSML2_1_NS} namespace. */
 #define WITSML2_1_NS ${FESAPI_WITSML2_1_NS}
 
-/** @namespace	${FESAPI_PRODML2_1_NS} @brief The ${FESAPI_PRODML2_1_NS} namespace. */
-#define PRODML2_2_NS ${FESAPI_PRODML2_2_NS}
+/** @namespace	${FESAPI_PRODML2_3_NS} @brief The ${FESAPI_PRODML2_3_NS} namespace. */
+#define PRODML2_3_NS ${FESAPI_PRODML2_3_NS}
 
 /** @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}. */
 #define EML2_NS ${FESAPI_EML2_NS}

cmake/pyproject.toml.in

@@ -16,7 +16,6 @@ readme      = "README.md"
 classifiers=[
     'Development Status :: 5 - Production/Stable',
     'Intended Audience :: Developers',
-    'License :: OSI Approved :: Apache Software License',
     'Operating System :: Microsoft :: Windows',
     'Operating System :: POSIX :: Linux',
     'Operating System :: MacOS',
@@ -29,9 +28,10 @@ classifiers=[
     'Programming Language :: Python :: 3.12',
     'Topic :: Software Development',
     'Topic :: Software Development :: Libraries',
-    'Topic :: Software Development :: Libraries :: Application Frameworks ',
+    'Topic :: Software Development :: Libraries :: Application Frameworks',
     'Topic :: File Formats',
 ]
+license = {text = "Apache-2.0"}
 keywords = [
     "energistics",
     "resqml",

cmake/swigCsInclude.i

@@ -888,8 +888,8 @@ ${COMMENT_END}
 ${COMMENT_START}
 		case DataObjectName.FLUIDBOUNDARYINTERPRETATION : return new F2iConsulting.Fesapi.${FESAPI_RESQML2_2_NS}.FluidBoundaryInterpretation(cPtr, owner);
 ${COMMENT_END}
-		case DataObjectName.FLUIDCHARACTERIZATION : return new F2iConsulting.Fesapi.${FESAPI_PRODML2_2_NS}.FluidCharacterization(cPtr, owner);
-		case DataObjectName.FLUIDSYSTEM : return new F2iConsulting.Fesapi.${FESAPI_PRODML2_2_NS}.FluidSystem(cPtr, owner);
+		case DataObjectName.FLUIDCHARACTERIZATION : return new F2iConsulting.Fesapi.${FESAPI_PRODML2_3_NS}.FluidCharacterization(cPtr, owner);
+		case DataObjectName.FLUIDSYSTEM : return new F2iConsulting.Fesapi.${FESAPI_PRODML2_3_NS}.FluidSystem(cPtr, owner);
 		case DataObjectName.FRONTIERFEATURE : return new F2iConsulting.Fesapi.${FESAPI_RESQML2_0_1_NS}.FrontierFeature(cPtr, owner);
 		case DataObjectName.GENETICBOUNDARYFEATURE :
 			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}
 		case DataObjectName.SUBREPRESENTATION : return resqml2_instantiateSubRepresentation(cPtr, owner);
 		case DataObjectName.TECTONICBOUNDARYFEATURE : return new F2iConsulting.Fesapi.${FESAPI_RESQML2_0_1_NS}.TectonicBoundaryFeature(cPtr, owner);
 		case DataObjectName.TIMESERIES : return eml2_instantiateTimeSeries(cPtr, owner);
-		case DataObjectName.TIMESERIESDATA : return new F2iConsulting.Fesapi.${FESAPI_PRODML2_2_NS}.TimeSeriesData(cPtr, owner);
+		case DataObjectName.TIMESERIESDATA : return new F2iConsulting.Fesapi.${FESAPI_PRODML2_3_NS}.TimeSeriesData(cPtr, owner);
 		case DataObjectName.TRAJECTORY : return new F2iConsulting.Fesapi.${FESAPI_WITSML2_1_NS}.Trajectory(cPtr, owner);
 		case DataObjectName.TRIANGULATEDSETREPRESENTATION : return resqml2_instantiateTriangulatedSetRepresentation(cPtr, owner);
 		case DataObjectName.TRUNCATEDIJKGRIDREPRESENTATION : return resqml2_instantiateConcreteIjkGridRepresentation(cPtr, owner);

cmake/swigJavaInclude.i

@@ -888,8 +888,8 @@ ${COMMENT_END}
 ${COMMENT_START}
 		case FLUIDBOUNDARYINTERPRETATION : return new com.f2i_consulting.fesapi.${FESAPI_RESQML2_2_NS}.Resqml22_FluidBoundaryInterpretation(cPtr, owner);
 ${COMMENT_END}
-		case FLUIDCHARACTERIZATION : return new com.f2i_consulting.fesapi.${FESAPI_PRODML2_2_NS}.FluidCharacterization(cPtr, owner);
-		case FLUIDSYSTEM : return new com.f2i_consulting.fesapi.${FESAPI_PRODML2_2_NS}.FluidSystem(cPtr, owner);
+		case FLUIDCHARACTERIZATION : return new com.f2i_consulting.fesapi.${FESAPI_PRODML2_3_NS}.FluidCharacterization(cPtr, owner);
+		case FLUIDSYSTEM : return new com.f2i_consulting.fesapi.${FESAPI_PRODML2_3_NS}.FluidSystem(cPtr, owner);
 		case FRONTIERFEATURE : return new com.f2i_consulting.fesapi.${FESAPI_RESQML2_0_1_NS}.Resqml20_FrontierFeature(cPtr, owner);
 		case GENETICBOUNDARYFEATURE :
 			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}
 		case SUBREPRESENTATION : return resqml2_instantiateSubRepresentation(cPtr, owner);
 		case TECTONICBOUNDARYFEATURE : return new com.f2i_consulting.fesapi.${FESAPI_RESQML2_0_1_NS}.Resqml20_TectonicBoundaryFeature(cPtr, owner);
 		case TIMESERIES : return eml2_instantiateTimeSeries(cPtr, owner);
-		case TIMESERIESDATA : return new com.f2i_consulting.fesapi.${FESAPI_PRODML2_2_NS}.TimeSeriesData(cPtr, owner);
+		case TIMESERIESDATA : return new com.f2i_consulting.fesapi.${FESAPI_PRODML2_3_NS}.TimeSeriesData(cPtr, owner);
 		case TRAJECTORY : return new com.f2i_consulting.fesapi.${FESAPI_WITSML2_1_NS}.Witsml21_Trajectory(cPtr, owner);
 		case TRIANGULATEDSETREPRESENTATION : return resqml2_instantiateTriangulatedSetRepresentation(cPtr, owner);
 		case TRUNCATEDIJKGRIDREPRESENTATION : return resqml2_instantiateConcreteIjkGridRepresentation(cPtr, owner);

cmake/swigPythonInclude.i.in

@@ -35,7 +35,7 @@ namespace COMMON_NS
 					if (xmlNs == "resqml20") return "${FESAPI_RESQML2_0_1_NS}";
 					else if (xmlNs == "resqml22") return "${FESAPI_RESQML2_2_NS}";
 					else if (xmlNs == "witsml21") return "${FESAPI_WITSML2_1_NS}";
-					else if (xmlNs == "prodml22") return "${FESAPI_PRODML2_2_NS}";
+					else if (xmlNs == "prodml23") return "${FESAPI_PRODML2_3_NS}";
 					else if (xmlNs == "eml23") return "${FESAPI_EML2_3_NS}";
 				}();
 
@@ -76,7 +76,7 @@ namespace EML2_NS
 					if (xmlNs == "resqml20") return "${FESAPI_RESQML2_0_1_NS}";
 					else if (xmlNs == "resqml22") return "${FESAPI_RESQML2_2_NS}";
 					else if (xmlNs == "witsml21") return "${FESAPI_WITSML2_1_NS}";
-					else if (xmlNs == "prodml22") return "${FESAPI_PRODML2_2_NS}";
+					else if (xmlNs == "prodml23") return "${FESAPI_PRODML2_3_NS}";
 					else if (xmlNs == "eml23") return "${FESAPI_EML2_3_NS}";
 				}();
 

doc/Doxyfile.in

@@ -2444,7 +2444,7 @@ EXPAND_AS_DEFINED      = COMMON_NS \
                          RESQML2_0_1_NS \
                          RESQML2_2_NS \
                          WITSML2_1_NS \
-                         PRODML2_2_NS \
+                         PRODML2_3_NS \
                          EML2_NS \
                          EML2_0_NS \
                          EML2_3_NS