V18

bindings/python/src/implicit/representation/builder/implicit_structural_model_builder.hpp

@@ -27,9 +27,9 @@
 
 namespace geode
 {
     void define_implicit_structural_model_builder( pybind11::module& module )
     {
         pybind11::class_< ImplicitStructuralModelBuilder,
             StructuralModelBuilder >( module, "ImplicitStructuralModelBuilder" )
             .def( pybind11::init< ImplicitStructuralModel& >() )
             .def( "copy",
@@ -50,6 +50,9 @@
             .def( "set_horizon_implicit_value",
                 &ImplicitStructuralModelBuilder::set_horizon_implicit_value )
             .def( "horizons_stack_builder",
-                &ImplicitStructuralModelBuilder::horizons_stack_builder );
+                &ImplicitStructuralModelBuilder::horizons_stack_builder )
+            .def( "import_old_implicit_attribute_values_from_attribute_name",
+                &ImplicitStructuralModelBuilder::
+                    import_old_implicit_attribute_values_from_attribute_name );
     }
 } // namespace geode

bindings/python/src/implicit/representation/builder/stratigraphic_model_builder.hpp

@@ -27,9 +27,9 @@
 
 namespace geode
 {
     void define_stratigraphic_model_builder( pybind11::module& module )
     {
         pybind11::class_< StratigraphicModelBuilder, StructuralModelBuilder >(
             module, "StratigraphicModelBuilder" )
             .def( pybind11::init< StratigraphicModel& >() )
             .def( "copy",
@@ -43,6 +43,13 @@
             .def( "set_stratigraphic_location",
                 &StratigraphicModelBuilder::set_stratigraphic_location )
             .def( "set_stratigraphic_coordinates",
-                &StratigraphicModelBuilder::set_stratigraphic_coordinates );
+                &StratigraphicModelBuilder::set_stratigraphic_coordinates )
+            .def(
+                "import_old_stratigraphic_attribute_values_from_attribute_name",
+                &StratigraphicModelBuilder::
+                    import_old_stratigraphic_attribute_values_from_attribute_name )
+            .def( "copy_stratigraphic_attribute_values",
+                &StratigraphicModelBuilder::
+                    copy_stratigraphic_attribute_values );
     }
 } // namespace geode

bindings/python/src/implicit/representation/core/helpers.hpp

@@ -30,11 +30,11 @@
 #include <geode/geosciences/implicit/representation/core/stratigraphic_model.hpp>
 #include <geode/geosciences/implicit/representation/core/stratigraphic_section.hpp>
 
 namespace geode
 {
     namespace detail
     {
         void define_implicit_model_helpers( pybind11::module& module )
         {
             module
                 .def( "rescale_model_implicit_value",
@@ -67,15 +67,14 @@
                 .def( "horizon_id_from_name_2d", &horizon_id_from_name< 2 > )
                 .def( "horizon_id_from_name_3d", &horizon_id_from_name< 3 > )
                 .def( "implicit_section_from_cross_section_scalar_field",
-                    []( CrossSection& model, std::string_view attribute_name ) {
+                    []( CrossSection& model, const uuid& attribute_id ) {
                         return implicit_section_from_cross_section_scalar_field(
-                            model.clone(), attribute_name );
+                            model.clone(), attribute_id );
                     } )
                 .def( "implicit_model_from_structural_model_scalar_field",
-                    []( StructuralModel& model,
-                        std::string_view attribute_name ) {
+                    []( StructuralModel& model, const uuid& attribute_id ) {
                         return implicit_model_from_structural_model_scalar_field(
-                            model.clone(), attribute_name );
+                            model.clone(), attribute_id );
                     } )
                 .def( "stratigraphic_model_from_implicit_model_and_coords",
                     []( ImplicitStructuralModel& implicit_model,

bindings/python/src/implicit/representation/core/stratigraphic_model.hpp

@@ -33,15 +33,19 @@
 
 namespace geode
 {
     void define_stratigraphic_model( pybind11::module& module )
     {
         pybind11::class_< StratigraphicModel, ImplicitStructuralModel,
             pybind11::smart_holder >( module, "StratigraphicModel" )
             .def( pybind11::init<>() )
             .def( pybind11::init( []( ImplicitStructuralModel& model ) {
+                Logger::info( "Converting ImplicitStructuralModel to "
+                              "StratigraphicModel" );
                 return StratigraphicModel{ model.clone() };
             } ) )
             .def( pybind11::init( []( StructuralModel& model ) {
+                Logger::info(
+                    "Converting StructuralModel to StratigraphicModel" );
                 return StratigraphicModel{ model.clone() };
             } ) )
             .def( "stratigraphic_coordinates_from_vertex_id",
@@ -72,6 +76,8 @@
             .def( "native_extension", &StratigraphicModel::native_extension )
             .def( "stratigraphic_model_component",
                 &StratigraphicModel::component,
-                pybind11::return_value_policy::reference );
+                pybind11::return_value_policy::reference )
+            .def( "stratigraphic_location_attribute_id",
+                &StratigraphicModel::stratigraphic_location_attribute_id );
     }
 } // namespace geode

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

@@ -37,7 +37,7 @@ def add_faults(model, builder):
         raise ValueError("[Test] Addition of a Fault in CrossSection is not correct")
 
     fault1 = builder.add_fault()
-    builder.set_fault_name(fault1, "fault1")
+    builder.set_fault_name(model.fault(fault1), "fault1")
     if model.nb_faults() != 2:
         raise ValueError("[Test] Number of faults in CrossSection should be 2")
     if model.fault(fault1).name() != "fault1":
@@ -54,7 +54,7 @@ def add_horizons(model, builder):
 
     horizon1 = builder.add_horizon()
     horizon2 = builder.add_horizon()
-    builder.set_horizon_name(horizon2, "horizon2")
+    builder.set_horizon_name(model.horizon(horizon2),"horizon2")
     if model.nb_horizons() != 3:
         raise ValueError("[Test] Number of horizons in CrossSection should be 3")
     if model.horizon(horizon2).name() != "horizon2":
@@ -65,7 +65,7 @@ def add_fault_blocks(model, builder):
     fault_block0 = builder.add_fault_block()
     fault_block1 = builder.add_fault_block()
     builder.add_fault_block()
-    builder.set_fault_block_name(fault_block1, "hanging_wall")
+    builder.set_fault_block_name(model.fault_block(fault_block1),  "hanging_wall")
     if model.nb_fault_blocks() != 3:
         raise ValueError("[Test] Number of fault blocks in CrossSection should be 3")
     builder.remove_fault_block(model.fault_block(fault_block0))
@@ -79,7 +79,7 @@ def add_stratigraphic_units(model, builder):
     stratigraphic_unit0 = builder.add_stratigraphic_unit()
     stratigraphic_unit1 = builder.add_stratigraphic_unit()
     builder.add_stratigraphic_unit()
-    builder.set_stratigraphic_unit_name(stratigraphic_unit1, "cretaceous")
+    builder.set_stratigraphic_unit_name(model.stratigraphic_unit(stratigraphic_unit1), "cretaceous")
     if model.nb_stratigraphic_units() != 3:
         raise ValueError(
             "[Test] Number of stratigraphic_units in CrossSection should be 3"
@@ -341,14 +341,14 @@ def modify_model(model, builder):
     for horizon in model.horizons():
         horizons_ids.append(horizon.id())
         builder.set_horizon_contact_type(
-            horizon.id(), geosciences.Horizon2D.CONTACT_TYPE.TOPOGRAPHY
+            horizon, geosciences.Horizon2D.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.Fault2D.FAULT_TYPE.LISTRIC)
+        builder.set_fault_type(fault, geosciences.Fault2D.FAULT_TYPE.LISTRIC)
         if fault.has_type() == False:
             raise ValueError("[Test] All faults should have a type")
 

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

@@ -37,7 +37,7 @@ def add_faults(model, builder):
         raise ValueError("[Test] Addition of a Fault in StructuralModel is not correct")
 
     fault1 = builder.add_fault()
-    builder.set_fault_name(fault1, "fault1")
+    builder.set_fault_name(model.fault(fault1), "fault1")
     if model.nb_faults() != 2:
         raise ValueError("[Test] Number of faults in StructuralModel should be 2")
     if model.fault(fault1).name() != "fault1":
@@ -46,7 +46,7 @@ def add_faults(model, builder):
     for fault in model.faults():
         name = fault.name()
         if name is not None:
-            builder.set_fault_name(fault.id(), "new_" + name)
+            builder.set_fault_name(fault, "new_" + name)
     if model.fault(fault1).name() != "new_fault1":
         raise ValueError("[Test] Wrong modified Fault name")
 
@@ -63,7 +63,7 @@ def add_horizons(model, builder):
 
     horizon1 = builder.add_horizon()
     horizon2 = builder.add_horizon()
-    builder.set_horizon_name(horizon2, "horizon2")
+    builder.set_horizon_name(model.horizon(horizon2), "horizon2")
     if model.nb_horizons() != 3:
         raise ValueError("[Test] Number of horizons in StructuralModel should be 3")
     if model.horizon(horizon2).name() != "horizon2":
@@ -72,7 +72,7 @@ def add_horizons(model, builder):
     for horizon in model.horizons():
         name = horizon.name()
         if name is not None:
-            builder.set_horizon_name(horizon.id(), "new_" + name)
+            builder.set_horizon_name(horizon, "new_" + name)
     if model.horizon(horizon2).name() != "new_horizon2":
         raise ValueError("[Test] Wrong modified Horizon name")
 
@@ -212,14 +212,14 @@ def modify_model(model, builder):
     for horizon in model.horizons():
         horizons_ids.append(horizon.id())
         builder.set_horizon_contact_type(
-            horizon.id(), geosciences.Horizon3D.CONTACT_TYPE.TOPOGRAPHY
+            horizon, 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, geosciences.Fault3D.FAULT_TYPE.LISTRIC)
         if fault.has_type() == False:
             raise ValueError("[Test] All faults should have a type")
 

bindings/python/tests/implicit/test-py-stratigraphic-model.py

@@ -141,6 +141,9 @@ def test_save_stratigraphic_surfaces(model):
     data_dir = os.path.abspath(os.path.join(test_dir, "../../../../tests/data"))
     structural_model = geode_exp.load_structural_model(data_dir + "/vri2.og_strm")
     stratigraphic_model = geode_imp.StratigraphicModel(structural_model)
-
+    builder_implicit = geode_imp.ImplicitStructuralModelBuilder(stratigraphic_model)
+    builder_implicit.import_old_implicit_attribute_values_from_attribute_name("geode_implicit_attribute")
+    builder_stratigraphic = geode_imp.StratigraphicModelBuilder(stratigraphic_model)
+    builder_stratigraphic.import_old_stratigraphic_attribute_values_from_attribute_name("geode_stratigraphic_location")
     test_model(stratigraphic_model)
     test_save_stratigraphic_surfaces(stratigraphic_model)

bindings/python/tests/implicit/test-py-stratigraphic-section.py

@@ -43,9 +43,12 @@ def import_section_with_stratigraphy():
 
     for surface in stratigraphic_section.surfaces():
         mesh = surface.mesh()
-        scalar_attribute = mesh.vertex_attribute_manager().find_attribute_double(
+        scalar_attributes = mesh.vertex_attribute_manager().attribute_ids_matching_name(
             "curvature_min"
         )
+        scalar_attribute = mesh.vertex_attribute_manager().find_read_only_attribute_double(
+            scalar_attributes[0]
+        )
         for vertex_id in range(mesh.nb_vertices()):
             model_builder.set_stratigraphic_coordinates(
                 surface,

include/geode/geosciences/explicit/geometry/geographic_coordinate_system.hpp

@@ -36,7 +36,7 @@
 
 namespace geode
 {
     struct opengeode_geosciences_explicit_api GeographicCoordinateSystemInfo
     {
         GeographicCoordinateSystemInfo( std::string authority_in,
             std::string code_in,
@@ -59,7 +59,7 @@
         {
             archive.ext( *this,
                 Growable< Archive, GeographicCoordinateSystemInfo >{
                     { []( Archive& a, GeographicCoordinateSystemInfo& info ) {
                         a.text1b( info.authority, info.authority.max_size() );
                         a.text1b( info.code, info.code.max_size() );
                         a.text1b( info.name, info.name.max_size() );
@@ -72,7 +72,7 @@
     };
 
     template < index_t dimension >
     class GeographicCoordinateSystem
         : public AttributeCoordinateReferenceSystem< dimension >
     {
         friend class bitsery::Access;
@@ -80,6 +80,11 @@
     public:
         GeographicCoordinateSystem(
             AttributeManager& manager, GeographicCoordinateSystemInfo info );
+
+        GeographicCoordinateSystem( AttributeManager& manager,
+            const uuid& uuid,
+            GeographicCoordinateSystemInfo info );
+
         ~GeographicCoordinateSystem();
 
         [[nodiscard]] static GeographicCoordinateSystem< dimension >

include/geode/geosciences/explicit/mixin/builder/fault_blocks_builder.hpp

@@ -41,7 +41,8 @@ namespace geode
     public:
         void load_fault_blocks( std::string_view directory );
 
-        void set_fault_block_name( const uuid& id, std::string_view name );
+        void set_fault_block_name(
+            const FaultBlock< dimension >& fault_block, std::string_view name );
 
     protected:
         explicit FaultBlocksBuilder( FaultBlocks< dimension >& fault_blocks )

include/geode/geosciences/explicit/mixin/builder/faults_builder.hpp

@@ -41,10 +41,11 @@ namespace geode
     public:
         void load_faults( std::string_view directory );
 
-        void set_fault_type( const uuid& fault_id,
+        void set_fault_type( const Fault< dimension >& fault,
             typename Fault< dimension >::FAULT_TYPE type );
 
-        void set_fault_name( const uuid& id, std::string_view name );
+        void set_fault_name(
+            const Fault< dimension >& fault, std::string_view name );
 
     protected:
         explicit FaultsBuilder( Faults< dimension >& faults )

include/geode/geosciences/explicit/mixin/builder/horizons_builder.hpp

@@ -44,9 +44,10 @@ namespace geode
         void load_horizons( std::string_view directory );
 
         void set_horizon_contact_type(
-            const uuid& horizon_id, CONTACT_TYPE contact_type );
+            const Horizon< dimension >& horizon, CONTACT_TYPE contact_type );
 
-        void set_horizon_name( const uuid& id, std::string_view name );
+        void set_horizon_name(
+            const Horizon< dimension >& horizon, std::string_view name );
 
     protected:
         explicit HorizonsBuilder( Horizons< dimension >& horizons )

include/geode/geosciences/explicit/mixin/builder/stratigraphic_units_builder.hpp

@@ -42,7 +42,8 @@ namespace geode
         void load_stratigraphic_units( std::string_view directory );
 
         void set_stratigraphic_unit_name(
-            const uuid& id, std::string_view name );
+            const StratigraphicUnit< dimension >& stratigraphic_unit,
+            std::string_view name );
 
     protected:
         explicit StratigraphicUnitsBuilder(

include/geode/geosciences/explicit/mixin/core/fault.hpp

@@ -43,14 +43,16 @@
      * This component is described by a fault type.
      */
     template < index_t dimension >
     class Fault final : public Component< dimension >
     {
         OPENGEODE_DISABLE_COPY( Fault );
+
+    public:
         PASSKEY( Faults< dimension >, FaultsKey );
         PASSKEY( FaultsBuilder< dimension >, FaultsBuilderKey );
 
     public:
         enum struct FAULT_TYPE
         {
             /// Default value - No fault type defined
             no_type,
@@ -80,12 +82,12 @@
         [[nodiscard]] FAULT_TYPE type() const;
 
     public:
         Fault( FaultsKey ) : Fault() {}
         Fault( FAULT_TYPE type, FaultsKey ) : Fault( type ) {}
 
         void set_type( FAULT_TYPE type, FaultsBuilderKey );
 
         void set_fault_name( std::string_view name, FaultsBuilderKey )
         {
             this->set_name( name );
         }

include/geode/geosciences/explicit/mixin/core/fault_block.hpp

@@ -44,12 +44,12 @@ namespace geode
     class FaultBlock final : public Component< dimension >
     {
         OPENGEODE_DISABLE_COPY( FaultBlock );
-        PASSKEY( FaultBlocks< dimension >, FaultBlocksKey );
-        PASSKEY( FaultBlocksBuilder< dimension >, FaultBlocksBuilderKey );
 
         friend class bitsery::Access;
 
     public:
+        PASSKEY( FaultBlocks< dimension >, FaultBlocksKey );
+        PASSKEY( FaultBlocksBuilder< dimension >, FaultBlocksBuilderKey );
         FaultBlock( FaultBlock&& other ) noexcept;
         ~FaultBlock();
 

include/geode/geosciences/explicit/mixin/core/fault_blocks.hpp

@@ -42,9 +42,9 @@ namespace geode
     class opengeode_geosciences_explicit_api FaultBlocks
     {
         OPENGEODE_DISABLE_COPY( FaultBlocks );
-        PASSKEY( FaultBlocksBuilder< dimension >, FaultBlocksBuilderKey );
 
     public:
+        PASSKEY( FaultBlocksBuilder< dimension >, FaultBlocksBuilderKey );
         using Builder = FaultBlocksBuilder< dimension >;
         using Type = FaultBlock< dimension >;
 

include/geode/geosciences/explicit/mixin/core/faults.hpp

@@ -42,9 +42,9 @@ namespace geode
     class opengeode_geosciences_explicit_api Faults
     {
         OPENGEODE_DISABLE_COPY( Faults );
-        PASSKEY( FaultsBuilder< dimension >, FaultsBuilderKey );
 
     public:
+        PASSKEY( FaultsBuilder< dimension >, FaultsBuilderKey );
         using Builder = FaultsBuilder< dimension >;
         using Type = Fault< dimension >;
 

include/geode/geosciences/explicit/mixin/core/horizon.hpp

@@ -46,6 +46,8 @@ namespace geode
     class Horizon final : public Component< dimension >
     {
         OPENGEODE_DISABLE_COPY( Horizon );
+
+    public:
         PASSKEY( HorizonsBuilder< dimension >, HorizonsBuilderKey );
         PASSKEY( Horizons< dimension >, HorizonsKey );
 

include/geode/geosciences/explicit/mixin/core/horizons.hpp

@@ -42,9 +42,9 @@ namespace geode
     class Horizons
     {
         OPENGEODE_DISABLE_COPY( Horizons );
-        PASSKEY( HorizonsBuilder< dimension >, HorizonsBuilderKey );
 
     public:
+        PASSKEY( HorizonsBuilder< dimension >, HorizonsBuilderKey );
         using Builder = HorizonsBuilder< dimension >;
         using Type = Horizon< dimension >;
         using CONTACT_TYPE = typename Horizon< dimension >::CONTACT_TYPE;

include/geode/geosciences/explicit/mixin/core/stratigraphic_unit.hpp

@@ -43,6 +43,8 @@ namespace geode
     class StratigraphicUnit final : public Component< dimension >
     {
         OPENGEODE_DISABLE_COPY( StratigraphicUnit );
+
+    public:
         PASSKEY( StratigraphicUnits< dimension >, StratigraphicUnitsKey );
         PASSKEY( StratigraphicUnitsBuilder< dimension >,
             StratigraphicUnitsBuilderKey );

include/geode/geosciences/explicit/mixin/core/stratigraphic_units.hpp

@@ -42,10 +42,10 @@ namespace geode
     class opengeode_geosciences_explicit_api StratigraphicUnits
     {
         OPENGEODE_DISABLE_COPY( StratigraphicUnits );
-        PASSKEY( StratigraphicUnitsBuilder< dimension >,
-            StratigraphicUnitsBuilderKey );
 
     public:
+        PASSKEY( StratigraphicUnitsBuilder< dimension >,
+            StratigraphicUnitsBuilderKey );
         using Builder = StratigraphicUnitsBuilder< dimension >;
         using Type = StratigraphicUnit< dimension >;