fix(Library): better handle exception and library

Author: BotellaA

CMakeLists.txt

@@ -34,6 +34,12 @@ find_package(OpenGeode REQUIRED CONFIG)
 find_package(Async++ REQUIRED CONFIG)
 find_package(GDAL REQUIRED CONFIG)
 
+install(
+    FILES include/geode/geosciences/project.hpp
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/geode/geosciences
+    COMPONENT public
+)
+
 #------------------------------------------------------------------------------------------------
 # Configure the OpenGeode-Geosciences libraries
 add_subdirectory(src/geode)

bindings/python/tests/explicit/test-py-cross-section.py

@@ -31,7 +31,7 @@
 import opengeode_geosciences_py_explicit as geosciences
 
 if __name__ == "__main__":
-    geosciences.GeosciencesExplicitLibrary.initialize()
+    geosciences.OpenGeodeGeosciencesExplicitLibrary.initialize()
 
     infos = geosciences.GeographicCoordinateSystem3D.geographic_coordinate_systems()
     if len(infos) != 13181:

bindings/python/tests/explicit/test-py-geographic-coordinate-system.py

@@ -22,8 +22,9 @@
 import os
 import sys
 import platform
+
 if sys.version_info >= (3, 8, 0) and platform.system() == "Windows":
-    for path in [x.strip() for x in os.environ['PATH'].split(';') if x]:
+    for path in [x.strip() for x in os.environ["PATH"].split(";") if x]:
         os.add_dll_directory(path)
 
 import opengeode
@@ -33,14 +34,12 @@
 def add_faults(model, builder):
     fault0 = builder.add_fault()
     if model.fault(fault0).has_type():
-        raise ValueError(
-            "[Test] Addition of a Fault in StructuralModel is not correct")
+        raise ValueError("[Test] Addition of a Fault in StructuralModel is not correct")
 
     fault1 = builder.add_fault()
     builder.set_fault_name(fault1, "fault1")
     if model.nb_faults() != 2:
-        raise ValueError(
-            "[Test] Number of faults in StructuralModel should be 2")
+        raise ValueError("[Test] Number of faults in StructuralModel should be 2")
     if model.fault(fault1).name() != "fault1":
         raise ValueError("[Test] Wrong Fault name")
 
@@ -54,16 +53,19 @@ def add_faults(model, builder):
 
 def add_horizons(model, builder):
     horizon0 = builder.add_horizon()
-    if model.horizon(horizon0).contact_type()!=geosciences.Horizon3D.CONTACT_TYPE.CONFORMAL:
+    if (
+        model.horizon(horizon0).contact_type()
+        != geosciences.Horizon3D.CONTACT_TYPE.CONFORMAL
+    ):
         raise ValueError(
-            "[Test] Addition of a Horizon in StructuralModel is not correct")
+            "[Test] Addition of a Horizon in StructuralModel is not correct"
+        )
 
     horizon1 = builder.add_horizon()
     horizon2 = builder.add_horizon()
     builder.set_horizon_name(horizon2, "horizon2")
     if model.nb_horizons() != 3:
-        raise ValueError(
-            "[Test] Number of horizons in StructuralModel should be 3")
+        raise ValueError("[Test] Number of horizons in StructuralModel should be 3")
     if model.horizon(horizon2).name() != "horizon2":
         raise ValueError("[Test] Wrong Horizon name")
 
@@ -82,34 +84,34 @@ def add_surfaces(builder):
 
 def do_checks(model, surface_uuids, faults_uuids, horizons_uuids):
     if model.nb_items(faults_uuids[0]) != 3:
-        raise ValueError(
-            "[Test] Number of items in fault_uuids[0] should be 3")
+        raise ValueError("[Test] Number of items in fault_uuids[0] should be 3")
     if model.nb_items(faults_uuids[1]) != 2:
-        raise ValueError(
-            "[Test] Number of items in fault_uuids[1] should be 2")
+        raise ValueError("[Test] Number of items in fault_uuids[1] should be 2")
 
     if model.nb_items(horizons_uuids[0]) != 1:
-        raise ValueError(
-            "[Test] Number of items in horizons_uuids[0] should be 1")
+        raise ValueError("[Test] Number of items in horizons_uuids[0] should be 1")
     if model.nb_items(horizons_uuids[1]) != 0:
-        raise ValueError(
-            "[Test] Number of items in horizons_uuids[1] should be 0")
+        raise ValueError("[Test] Number of items in horizons_uuids[1] should be 0")
     if model.nb_items(horizons_uuids[2]) != 3:
-        raise ValueError(
-            "[Test] Number of items in horizons_uuids[2] should be 3")
+        raise ValueError("[Test] Number of items in horizons_uuids[2] should be 3")
 
     for i in range(8):
         if i != 2:
             if model.nb_collections(surface_uuids[i]) != 1:
                 raise ValueError(
-                    "[Test] Number of collections in which surfaces_uuids[", i, "] is should be 1")
+                    "[Test] Number of collections in which surfaces_uuids[",
+                    i,
+                    "] is should be 1",
+                )
 
     if len(model.horizon_items(model.horizon(horizons_uuids[2]))) != 3:
         raise ValueError(
-            "[Test] Number of iterations on items in horizons_uuids[2] should be 3")
+            "[Test] Number of iterations on items in horizons_uuids[2] should be 3"
+        )
     if len(model.fault_items(model.fault(faults_uuids[1]))) != 2:
         raise ValueError(
-            "[Test] Number of iterations on items in faults_uuids[1] should be 2")
+            "[Test] Number of iterations on items in faults_uuids[1] should be 2"
+        )
 
 
 def build_relations_between_geometry_and_geology(model, builder):
@@ -123,39 +125,45 @@ def build_relations_between_geometry_and_geology(model, builder):
     for horizon in model.horizons():
         horizons_uuids.append(horizon.id())
 
-    builder.add_surface_in_fault(model.surface(
-        surfaces_uuids[0]), model.fault(faults_uuids[0]))
-    builder.add_surface_in_fault(model.surface(
-        surfaces_uuids[1]), model.fault(faults_uuids[0]))
-    builder.add_surface_in_fault(model.surface(
-        surfaces_uuids[2]), model.fault(faults_uuids[0]))
-    builder.add_surface_in_fault(model.surface(
-        surfaces_uuids[2]), model.fault(faults_uuids[1]))
-    builder.add_surface_in_fault(model.surface(
-        surfaces_uuids[3]), model.fault(faults_uuids[1]))
-
-    builder.add_surface_in_horizon(model.surface(
-        surfaces_uuids[4]), model.horizon(horizons_uuids[0]))
-    builder.add_surface_in_horizon(model.surface(
-        surfaces_uuids[5]), model.horizon(horizons_uuids[2]))
-    builder.add_surface_in_horizon(model.surface(
-        surfaces_uuids[6]), model.horizon(horizons_uuids[2]))
-    builder.add_surface_in_horizon(model.surface(
-        surfaces_uuids[7]), model.horizon(horizons_uuids[2]))
+    builder.add_surface_in_fault(
+        model.surface(surfaces_uuids[0]), model.fault(faults_uuids[0])
+    )
+    builder.add_surface_in_fault(
+        model.surface(surfaces_uuids[1]), model.fault(faults_uuids[0])
+    )
+    builder.add_surface_in_fault(
+        model.surface(surfaces_uuids[2]), model.fault(faults_uuids[0])
+    )
+    builder.add_surface_in_fault(
+        model.surface(surfaces_uuids[2]), model.fault(faults_uuids[1])
+    )
+    builder.add_surface_in_fault(
+        model.surface(surfaces_uuids[3]), model.fault(faults_uuids[1])
+    )
+
+    builder.add_surface_in_horizon(
+        model.surface(surfaces_uuids[4]), model.horizon(horizons_uuids[0])
+    )
+    builder.add_surface_in_horizon(
+        model.surface(surfaces_uuids[5]), model.horizon(horizons_uuids[2])
+    )
+    builder.add_surface_in_horizon(
+        model.surface(surfaces_uuids[6]), model.horizon(horizons_uuids[2])
+    )
+    builder.add_surface_in_horizon(
+        model.surface(surfaces_uuids[7]), model.horizon(horizons_uuids[2])
+    )
 
     do_checks(model, surfaces_uuids, faults_uuids, horizons_uuids)
 
 
 def check_reloaded_model(reloaded_model):
     if reloaded_model.nb_surfaces() != 8:
-        raise ValueError(
-            "[Test] Number of surfaces in reloaded model should be 8")
+        raise ValueError("[Test] Number of surfaces in reloaded model should be 8")
     if reloaded_model.nb_horizons() != 3:
-        raise ValueError(
-            "[Test] Number of horizons in reloaded model should be 3")
+        raise ValueError("[Test] Number of horizons in reloaded model should be 3")
     if reloaded_model.nb_faults() != 2:
-        raise ValueError(
-            "[Test] Number of faults in reloaded model should be 2")
+        raise ValueError("[Test] Number of faults in reloaded model should be 2")
 
 
 def test_io(model):
@@ -171,18 +179,15 @@ def test_copy(model):
     copier.copy(model)
 
     if copy.nb_surfaces() != 8:
-        raise ValueError(
-            "[Test] Number of surfaces in copied model should be 8")
+        raise ValueError("[Test] Number of surfaces in copied model should be 8")
     if copy.nb_horizons() != 3:
-        raise ValueError(
-            "[Test] Number of horizons in copied model should be 3")
+        raise ValueError("[Test] Number of horizons in copied model should be 3")
     if copy.nb_faults() != 2:
         raise ValueError("[Test] Number of faults in copied model should be 2")
     if copy.nb_fault_blocks() != 0:
-        raise ValueError(
-            "[Test] Number of fault blocks in copied model should be 0")
+        raise ValueError("[Test] Number of fault blocks in copied model should be 0")
 
-    #nb_surface_boundaries = 0
+    # nb_surface_boundaries = 0
     # for surface in copy.surfaces():
     #    nb_surface_boundaries += len( copy.boundaries( surface ) )
     # if nb_surface_boundaries != 8:
@@ -192,44 +197,42 @@ def test_copy(model):
     for fault in copy.faults():
         nb_fault_items += len(copy.fault_items(fault))
     if nb_fault_items != 5:
-        raise ValueError(
-            "[Test] Number of items in faults in copied model should be 5")
+        raise ValueError("[Test] Number of items in faults in copied model should be 5")
     nb_horizon_items = 0
     for horizon in copy.horizons():
         nb_horizon_items += len(copy.horizon_items(horizon))
     if nb_horizon_items != 4:
         raise ValueError(
-            "[Test] Number of items in stratigraphic_units in copied model should be 4")
+            "[Test] Number of items in stratigraphic_units in copied model should be 4"
+        )
 
 
 def modify_model(model, builder):
     horizons_ids = []
     for horizon in model.horizons():
         horizons_ids.append(horizon.id())
         builder.set_horizon_contact_type(
-            horizon.id(), geosciences.Horizon3D.CONTACT_TYPE.TOPOGRAPHY)
+            horizon.id(), geosciences.Horizon3D.CONTACT_TYPE.TOPOGRAPHY
+        )
 
     for horizon_id in horizons_ids:
         builder.remove_horizon(model.horizon(horizon_id))
 
     for fault in model.faults():
-        builder.set_fault_type(
-            fault.id(), geosciences.Fault3D.FAULT_TYPE.LISTRIC)
+        builder.set_fault_type(fault.id(), geosciences.Fault3D.FAULT_TYPE.LISTRIC)
         if fault.has_type() == False:
             raise ValueError("[Test] All faults should have a type")
 
     temp_id = builder.add_fault()
     builder.remove_fault(model.fault(temp_id))
     if model.nb_horizons() != 0:
-        raise ValueError(
-            "[Test] Number of horizons in modified model should be 0")
+        raise ValueError("[Test] Number of horizons in modified model should be 0")
     if model.nb_faults() != 2:
-        raise ValueError(
-            "[Test] Number of faults in modified model should be 2")
+        raise ValueError("[Test] Number of faults in modified model should be 2")
 
 
-if __name__ == '__main__':
-    geosciences.GeosciencesExplicitLibrary.initialize()
+if __name__ == "__main__":
+    geosciences.OpenGeodeGeosciencesExplicitLibrary.initialize()
     model = geosciences.StructuralModel()
     builder = geosciences.StructuralModelBuilder(model)
     add_faults(model, builder)

bindings/python/tests/explicit/test-py-structural-model.py

@@ -22,49 +22,64 @@
 import os
 import sys
 import platform
+
 if sys.version_info >= (3, 8, 0) and platform.system() == "Windows":
-    for path in [x.strip() for x in os.environ['PATH'].split(';') if x]:
+    for path in [x.strip() for x in os.environ["PATH"].split(";") if x]:
         os.add_dll_directory(path)
 
 import opengeode as geode
 import opengeode_geosciences_py_explicit
 import opengeode_geosciences_py_implicit as geode_imp
 
+
 def test_horizons_stack():
     horizons_stack = geode_imp.HorizonsStack3D()
-    stack_builder = geode_imp.HorizonsStackBuilder3D( horizons_stack )
+    stack_builder = geode_imp.HorizonsStackBuilder3D(horizons_stack)
 
     hor0 = stack_builder.add_horizon()
     hor1 = stack_builder.add_horizon()
     hor2 = stack_builder.add_horizon()
     unit0 = stack_builder.add_stratigraphic_unit()
     unit1 = stack_builder.add_stratigraphic_unit()
     if horizons_stack.nb_horizons() != 3:
-        raise ValueError( "[TEST] Stratigraphic Units Stack should have 3 horizons." )
+        raise ValueError("[TEST] Stratigraphic Units Stack should have 3 horizons.")
     if horizons_stack.nb_stratigraphic_units() != 2:
-        raise ValueError( "[TEST] Stratigraphic Units Stack should have 2 Stratigraphic Units." )
-    stack_builder.set_horizon_under( horizons_stack.horizon( hor0 ), horizons_stack.stratigraphic_unit( unit0 ) )
-    stack_builder.set_horizon_above( horizons_stack.horizon( hor1 ), horizons_stack.stratigraphic_unit( unit0 ) )
-    stack_builder.set_horizon_under( horizons_stack.horizon( hor1 ), horizons_stack.stratigraphic_unit( unit1 ) )
-    stack_builder.set_horizon_above( horizons_stack.horizon( hor2 ), horizons_stack.stratigraphic_unit( unit1 ) )
+        raise ValueError(
+            "[TEST] Stratigraphic Units Stack should have 2 Stratigraphic Units."
+        )
+    stack_builder.set_horizon_under(
+        horizons_stack.horizon(hor0), horizons_stack.stratigraphic_unit(unit0)
+    )
+    stack_builder.set_horizon_above(
+        horizons_stack.horizon(hor1), horizons_stack.stratigraphic_unit(unit0)
+    )
+    stack_builder.set_horizon_under(
+        horizons_stack.horizon(hor1), horizons_stack.stratigraphic_unit(unit1)
+    )
+    stack_builder.set_horizon_above(
+        horizons_stack.horizon(hor2), horizons_stack.stratigraphic_unit(unit1)
+    )
 
     for unit in horizons_stack.stratigraphic_units():
         unit_id = unit.id()
-        if not horizons_stack.above( unit_id ):
-            raise ValueError( "[TEST] Unit should have a horizon above." )
-        if not horizons_stack.under( unit_id ):
-            raise ValueError("[TEST] Unit should have a horizon under." )
-    if horizons_stack.above( horizons_stack.above( unit0 ) ).string() != unit1.string():
-        raise ValueError( "[TEST] Horizon 1 should be found from horizon 0." )
+        if not horizons_stack.above(unit_id):
+            raise ValueError("[TEST] Unit should have a horizon above.")
+        if not horizons_stack.under(unit_id):
+            raise ValueError("[TEST] Unit should have a horizon under.")
+    if horizons_stack.above(horizons_stack.above(unit0)).string() != unit1.string():
+        raise ValueError("[TEST] Horizon 1 should be found from horizon 0.")
 
     stack_path = "test_HorizonStack." + horizons_stack.native_extension()
-    geode_imp.save_horizons_stack3D( horizons_stack, stack_path )
-    reloaded_stack = geode_imp.load_horizons_stack3D( stack_path )
+    geode_imp.save_horizons_stack3D(horizons_stack, stack_path)
+    reloaded_stack = geode_imp.load_horizons_stack3D(stack_path)
+
+    stack_from_name_lists = geode_imp.horizons_stack_from_bottom_to_top_names_3d(
+        ["hor1", "hor2"], ["su1", "su2", "su3"]
+    )
 
-    stack_from_name_lists = geode_imp.horizons_stack_from_bottom_to_top_names_3d(["hor1","hor2"],["su1","su2","su3"])
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     print("Starting test")
-    geode_imp.GeosciencesImplicitLibrary.initialize()
+    geode_imp.OpenGeodeGeosciencesImplicitLibrary.initialize()
 
-    test_horizons_stack()
+    test_horizons_stack()