Merge pull request #314 from F2I-Consulting/v2.7.0.0

V2.7.0.0
F2I-Consulting · Apr 17, 2023 · 694c171 · 694c171
2 parents 9746a78 + 8e53442
commit 694c171
Show file tree

Hide file tree

Showing 356 changed files with 677,540 additions and 1,103,103 deletions.
diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
@@ -185,6 +185,7 @@ jobs:
         run: |
           ${{ github.workspace }}/../build/test/unitTest
   webassembly:
+    if: false
     runs-on: ubuntu-20.04    
     steps:
       - uses: mymindstorm/setup-emsdk@v11
@@ -229,8 +230,9 @@ jobs:
           FESAPI_BUILD_DIR: fesapi_build
         run: |
           cd ${{ github.workspace }}
-          wget https://gist.github.com/untereiner/3af2e52fbd135235457d2a707d5480d4/raw/7f7e0706b3421593c4c617b9703e5a90e30bfa51/gsoap_wasm.patch
-          git apply gsoap_wasm.patch
+          # see https://sourceforge.net/p/gsoap2/bugs/1301/
+          #wget https://gist.github.com/untereiner/3af2e52fbd135235457d2a707d5480d4/raw/7f7e0706b3421593c4c617b9703e5a90e30bfa51/gsoap_wasm.patch
+          #git apply gsoap_wasm.patch
           mkdir -p fesapi_build
           cd fesapi_build
           LDFLAGS="-s USE_ZLIB=1 -s USE_BOOST_HEADERS=1" emcmake cmake ../ \

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,7 +10,7 @@ set (FESAPI_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
 
 # version mechanism
 set (Fesapi_VERSION_MAJOR 2)
-set (Fesapi_VERSION_MINOR 6)
+set (Fesapi_VERSION_MINOR 7)
 set (Fesapi_VERSION_PATCH 0)
 set (Fesapi_VERSION_TWEAK 0)
 
@@ -157,10 +157,7 @@ set (WITH_RESQML2_2 OFF CACHE BOOL "Compile RESQML2.2 experimental support. Don'
 
 list(APPEND FESAPI_PROXIES_SOURCES
 	${FESAPI_ROOT_DIR}/src/proxies/envC.cpp
-	${FESAPI_ROOT_DIR}/src/proxies/gsoap_witsml1_4C.cpp
 	${FESAPI_ROOT_DIR}/src/proxies/gsoap_resqml2_0_1C.cpp
-	${FESAPI_ROOT_DIR}/src/proxies/gsoap_eml2_1C.cpp
-	${FESAPI_ROOT_DIR}/src/proxies/gsoap_eml2_2C.cpp
 	${FESAPI_ROOT_DIR}/src/proxies/gsoap_eml2_3C.cpp
 	${FESAPI_ROOT_DIR}/src/proxies/namespace.cpp
 	${FESAPI_ROOT_DIR}/src/proxies/stdsoap2.cpp
@@ -169,14 +166,8 @@ list(APPEND FESAPI_PROXIES_SOURCES
 list(APPEND FESAPI_PROXIES_HEADERS
 	${FESAPI_ROOT_DIR}/src/proxies/envH.h
 	${FESAPI_ROOT_DIR}/src/proxies/envStub.h
-	${FESAPI_ROOT_DIR}/src/proxies/gsoap_witsml1_4H.h
-	${FESAPI_ROOT_DIR}/src/proxies/gsoap_witsml1_4Stub.h
 	${FESAPI_ROOT_DIR}/src/proxies/gsoap_resqml2_0_1H.h
 	${FESAPI_ROOT_DIR}/src/proxies/gsoap_resqml2_0_1Stub.h
-	${FESAPI_ROOT_DIR}/src/proxies/gsoap_eml2_1H.h
-	${FESAPI_ROOT_DIR}/src/proxies/gsoap_eml2_1Stub.h
-	${FESAPI_ROOT_DIR}/src/proxies/gsoap_eml2_2H.h
-	${FESAPI_ROOT_DIR}/src/proxies/gsoap_eml2_2Stub.h
 	${FESAPI_ROOT_DIR}/src/proxies/gsoap_eml2_3H.h
 	${FESAPI_ROOT_DIR}/src/proxies/gsoap_eml2_3Stub.h
 	${FESAPI_ROOT_DIR}/src/proxies/stdsoap2.h

diff --git a/cmake/FesapiJavaExample.java b/cmake/FesapiJavaExample.java
diff --git a/cmake/Program.cs b/cmake/Program.cs
@@ -21,7 +21,7 @@ private static void serializeIjkGrid(DataObjectRepository repo)
             ContinuousProperty propertyCompute = repo.createContinuousProperty(
                 ijkGrid, "9d0a717f-2cd3-4d43-9cbf-3484105ed384", "slab prop compute min max",
                 1,
-                resqml22__IndexableElement.cells,
+                eml23__IndexableElement.cells,
                 resqml20__ResqmlUom.m,
                 propertyKind);
             propertyCompute.pushBackHdf5Array3dOfValues(AbstractObject.numericalDatatypeEnum.FLOAT, 2, 3, 4);
@@ -74,7 +74,7 @@ private static void serializeIjkGrid(DataObjectRepository repo)
             DiscreteProperty discretePropertyCompute = repo.createDiscreteProperty(
                 ijkGrid, "50935c31-93ec-4084-8891-6e9f130c49c3", "testing discrete prop",
                 1,
-                resqml22__IndexableElement.cells,
+                eml23__IndexableElement.cells,
                 resqml20__ResqmlPropertyKind.index);
             discretePropertyCompute.pushBackHdf5Array3dOfValues(AbstractObject.numericalDatatypeEnum.INT64, 2, 3, 4, 9999);
 
@@ -126,9 +126,9 @@ private static void serialize()
                 LocalDepth3dCrs crs = repo.createLocalDepth3dCrs(Guid.NewGuid().ToString(), "UTF8 Crs title : éàç : олег1", 0.0, 0.0, 0.0, 0.0, eml20__LengthUom.m, 5215, eml20__LengthUom.m, "Unknown", false);
                 repo.setDefaultCrs(crs);
                 Console.WriteLine("Serialize : CRS title is " + crs.getTitle());
-                Well well = repo.createWell("1425632e-3c22-4845-b431-ecd36da0671e", "Well");
+                Well well = repo.createWell("1425632e-3c22-4845-b431-ecd36da0671e", "Well", false);
                 well.setNameLegal("Legal Name");
-                well.setWaterDepth(0.0, eml21__LengthUom._0_x002e1_x0020ft);
+                well.setWaterDepth(0.0, eml23__LengthUom._0_x002e1_x0020ft);
                 well.setTimeZone(true, 0, 0);
                 Console.WriteLine("Serialize : Well title is " + well.getTitle());
 
@@ -143,7 +143,7 @@ private static void serialize()
                 WellboreInterpretation wellbore1Interp1 = repo.createWellboreInterpretation(wellbore1, "dc7840fe-e5a3-4b53-a1df-18040bc4d0c0", "Wellbore1 Interp1", false);
 
                 // Representation
-                F2iConsulting.Fesapi.${FESAPI_RESQML2_NS}.MdDatum mdInfo = repo.createMdDatum("36e91de5-7833-4b6d-90d0-1d643c0adece", "md Info", repo.getDefaultCrs(), eml23__WellboreDatumReference.mean_x0020sea_x0020level, 275, 75, 0);
+                F2iConsulting.Fesapi.${FESAPI_RESQML2_NS}.MdDatum mdInfo = repo.createMdDatum("36e91de5-7833-4b6d-90d0-1d643c0adece", "md Info", repo.getDefaultCrs(), eml23__ReferencePointKind.mean_x0020sea_x0020level, 275, 75, 0);
 
                 //Geometry	
                 WellboreTrajectoryRepresentation w1i1TrajRep = repo.createWellboreTrajectoryRepresentation(wellbore1Interp1, "acd2cdcf-bb5d-48da-bd0e-9aeff3e52180", "Wellbore1 Interp1 TrajRep", mdInfo);

diff --git a/cmake/nsDefinitions.h b/cmake/nsDefinitions.h
@@ -33,30 +33,18 @@ under the License.
 /** @namespace	${FESAPI_WITSML2_NS} @brief The ${FESAPI_WITSML2_NS} namespace.  This namespaces contains classes to handle data objects that exist in various WITSML v2.*. The classes of this namespace should be favored, when possible, instead of the classes of the lower level namespaces. */
 #define WITSML2_NS ${FESAPI_WITSML2_NS}
 
-/** @namespace	${FESAPI_WITSML1_4_NS} @brief The ${FESAPI_WITSML1_4_NS} namespace. */
-#define WITSML1_4_NS ${FESAPI_WITSML1_4_NS}
-
-/** @namespace	${FESAPI_WITSML2_0_NS} @brief The ${FESAPI_WITSML2_0_NS} namespace. */
-#define WITSML2_0_NS ${FESAPI_WITSML2_0_NS}
-
 /** @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_1_NS ${FESAPI_PRODML2_1_NS}
+#define PRODML2_2_NS ${FESAPI_PRODML2_2_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}
 
 /** @namespace	${FESAPI_EML2_0_NS} @brief The ${FESAPI_EML2_0_NS} namespace. */
 #define EML2_0_NS ${FESAPI_EML2_0_NS}
 
-/** @namespace	${FESAPI_EML2_1_NS} @brief The ${FESAPI_EML2_1_NS} namespace. */
-#define EML2_1_NS ${FESAPI_EML2_1_NS}
-
-/** @namespace	${FESAPI_EML2_2_NS} @brief The ${FESAPI_EML2_2_NS} namespace. */
-#define EML2_2_NS ${FESAPI_EML2_2_NS}
-
 /** @namespace	${FESAPI_EML2_3_NS} @brief The ${FESAPI_EML2_3_NS} namespace. */
 #define EML2_3_NS ${FESAPI_EML2_3_NS}