Merge remote-tracking branch 'origin/next'

Author: Geode-solutions robot

include/geode/inspector/criterion/adjacency/brep_meshes_adjacency.hpp

@@ -45,11 +45,11 @@ namespace geode
     {
         InspectionIssuesMap< PolygonEdge >
             surfaces_edges_with_wrong_adjacencies{
-                "BRep Surface mesh with wrong adjacencies on polygon edges"
+                "BRep Surface mesh with polygon edges adjacencies issues"
             };
         InspectionIssuesMap< PolyhedronFacet >
             blocks_facets_with_wrong_adjacencies{
-                "BRep Block mesh with wrong adjacencies on polyhedron facets"
+                "BRep Block mesh with polyhedron facets adjacencies issues"
             };
 
         [[nodiscard]] std::string string() const;

include/geode/inspector/criterion/adjacency/section_meshes_adjacency.hpp

@@ -45,7 +45,7 @@ namespace geode
     {
         InspectionIssuesMap< PolygonEdge >
             surfaces_edges_with_wrong_adjacencies{
-                "Section Surface mesh with wrong adjacencies on polygon edges"
+                "Section Surface mesh polygon edges adjacencies issues"
             };
 
         [[nodiscard]] std::string string() const;

src/geode/inspector/criterion/adjacency/brep_meshes_adjacency.cpp

@@ -28,6 +28,9 @@
 #include <geode/basic/logger.hpp>
 #include <geode/basic/pimpl_impl.hpp>
 
+#include <geode/mesh/core/solid_mesh.hpp>
+
+#include <geode/model/helpers/component_mesh_polygons.hpp>
 #include <geode/model/mixin/core/block.hpp>
 #include <geode/model/representation/core/brep.hpp>
 
@@ -78,11 +81,43 @@ namespace geode
                     inspector.polyhedron_facets_with_wrong_adjacency();
                 wrong_adjacencies.set_description(
                     absl::StrCat( "Block with uuid ", block.id().string(),
-                        " wrong polyhedron facets adjacencies" ) );
+                        " polyhedron facets adjacencies issues" ) );
+                const auto& mesh = block.mesh();
+                for( const auto polyhedron_id : Range{ mesh.nb_polyhedra() } )
+                {
+                    for( const auto facet_id :
+                        LRange{ mesh.nb_polyhedron_facets( polyhedron_id ) } )
+                    {
+                        const PolyhedronFacet polyhedron_facet{ polyhedron_id,
+                            facet_id };
+                        if( mesh.is_polyhedron_facet_on_border(
+                                polyhedron_facet )
+                            && !polyhedron_facet_is_on_a_surface(
+                                block, polyhedron_facet ) )
+                        {
+                            wrong_adjacencies.add_issue( polyhedron_facet,
+                                absl::StrCat( "Local facet ", facet_id,
+                                    " of polyhedron ", polyhedron_id,
+                                    " has no adjacencies but is not part of a "
+                                    "model Surface." ) );
+                        }
+                    }
+                }
                 components_wrong_adjacencies.add_issues_to_map(
                     block.id(), std::move( wrong_adjacencies ) );
             }
         }
+
+    private:
+        bool polyhedron_facet_is_on_a_surface( const Block3D& block,
+            const PolyhedronFacet& polyhedron_facet ) const
+        {
+            const auto facet_unique_vertices =
+                polygon_unique_vertices( model(), block, polyhedron_facet );
+            return !detail::surface_component_mesh_polygons(
+                model(), facet_unique_vertices )
+                        .empty();
+        }
     };
 
     BRepComponentMeshesAdjacency::BRepComponentMeshesAdjacency(

src/geode/inspector/criterion/internal/component_meshes_adjacency.cpp

@@ -27,12 +27,28 @@
 
 #include <geode/mesh/core/surface_mesh.hpp>
 
+#include <geode/model/helpers/component_mesh_edges.hpp>
 #include <geode/model/mixin/core/surface.hpp>
 #include <geode/model/representation/core/brep.hpp>
 #include <geode/model/representation/core/section.hpp>
 
 #include <geode/inspector/criterion/adjacency/surface_adjacency.hpp>
 
+namespace
+{
+    template < typename Model >
+    bool polygon_edge_is_on_a_line( const Model& model,
+        const geode::Surface< Model::dim >& surface,
+        const geode::PolygonEdge& polygon_edge )
+    {
+        const auto edge_unique_vertices =
+            geode::edge_unique_vertices( model, surface, polygon_edge );
+        return !geode::detail::line_component_mesh_edges(
+            model, edge_unique_vertices )
+                    .empty();
+    }
+} // namespace
+
 namespace geode
 {
     template < typename Model >
@@ -54,9 +70,27 @@ namespace geode
                 surface.mesh()
             };
             auto issues = inspector.polygon_edges_with_wrong_adjacency();
-            issues.set_description(
-                absl::StrCat( "Surface ", surface.id().string(),
-                    " polygon edges with wrong adjacencies." ) );
+            issues.set_description( absl::StrCat( "Surface ",
+                surface.id().string(), " polygon edges adjacency issues." ) );
+            const auto& mesh = surface.mesh();
+            for( const auto polygon_id : Range{ mesh.nb_polygons() } )
+            {
+                for( const auto edge_id :
+                    LRange{ mesh.nb_polygon_edges( polygon_id ) } )
+                {
+                    const PolygonEdge polygon_edge{ polygon_id, edge_id };
+                    if( mesh.is_edge_on_border( polygon_edge )
+                        && !polygon_edge_is_on_a_line(
+                            model_, surface, polygon_edge ) )
+                    {
+                        issues.add_issue( polygon_edge,
+                            absl::StrCat( "Local edge ", edge_id,
+                                " of polygon ", polygon_id,
+                                " has no adjacencies but is not part of a "
+                                "model Line." ) );
+                    }
+                }
+            }
             components_wrong_adjacencies.add_issues_to_map(
                 surface.id(), std::move( issues ) );
         }

src/geode/inspector/topology/brep_surfaces_topology.cpp

@@ -68,7 +68,6 @@ namespace
 
 namespace geode
 {
-
     std::string BRepSurfacesTopologyInspectionResult::string() const
     {
         std::string message;
@@ -391,27 +390,29 @@ namespace geode
                 continue;
             }
             const auto& surface = brep_.surface( cmv.component_id.id() );
-            if( !surface.mesh().is_vertex_on_border( cmv.vertex ) )
+            if( surface.mesh().is_vertex_on_border( cmv.vertex ) )
+            {
+                continue;
+            }
+            for( const auto& line_id : line_uuids )
             {
-                for( const auto& line_id : line_uuids )
+                const auto& line = brep_.line( line_id );
+                if( brep_.is_boundary( line, surface )
+                    || brep_.is_internal( line, surface ) )
                 {
-                    const auto& line = brep_.line( line_id );
-                    if( brep_.is_boundary( line, surface )
-                        || brep_.is_internal( line, surface ) )
-                    {
-                        return absl::StrCat( "Unique vertex with index ",
-                            unique_vertex_index,
-                            " is part of a line and of surface with "
-                            "uuid '",
-                            cmv.component_id.id().string(),
-                            "' but the associated vertex in the "
-                            "surface mesh is not on the mesh border." );
-                    }
+                    return absl::StrCat( "Unique vertex with index ",
+                        unique_vertex_index,
+                        " is part of a line and of surface with "
+                        "uuid '",
+                        cmv.component_id.id().string(),
+                        "' but the associated vertex in the "
+                        "surface mesh is not on the mesh border." );
                 }
             }
         }
         return std::nullopt;
     }
+
     BRepSurfacesTopologyInspectionResult
         BRepSurfacesTopology::inspect_surfaces_topology() const
     {