Merge pull request #1112 from Geode-solutions/feat/computation_grid_output

fix(convert_grid): Updated code to current grid usage.

Author: MelchiorSchuh

src/geode/mesh/helpers/convert_solid_mesh.cpp

@@ -246,28 +246,18 @@ namespace
             to_densify[cell_id] = true;
         }
         geode::GenericMapping< geode::index_t > old2new_mapping;
-        for( const auto k : geode::Range{ grid.nb_cells_in_direction( 2 ) } )
+        for( const auto cell_id : geode::Range{ grid.nb_cells() } )
         {
-            for( const auto j :
-                geode::Range{ grid.nb_cells_in_direction( 1 ) } )
+            if( to_densify[cell_id] )
             {
-                for( const auto i :
-                    geode::Range{ grid.nb_cells_in_direction( 0 ) } )
-                {
-                    const auto cell_id = grid.cell_index( { i, j, k } );
-                    if( to_densify[cell_id] )
-                    {
-                        continue;
-                    }
-                    const auto vertices =
-                        grid_cell_vertices( grid, { i, j, k } );
-                    const auto hex_id =
-                        builder.create_hexahedron( { vertices[0], vertices[1],
-                            vertices[3], vertices[2], vertices[4], vertices[5],
-                            vertices[7], vertices[6] } );
-                    old2new_mapping.map( cell_id, hex_id );
-                }
+                continue;
             }
+            const auto cell_indices = grid.cell_indices( cell_id );
+            const auto vertices = grid_cell_vertices( grid, cell_indices );
+            const auto hex_id = builder.create_hexahedron(
+                { vertices[0], vertices[1], vertices[3], vertices[2],
+                    vertices[4], vertices[5], vertices[7], vertices[6] } );
+            old2new_mapping.map( cell_id, hex_id );
         }
         for( const auto cell_index : geode::Indices{ cells_to_densify } )
         {

src/geode/mesh/helpers/convert_surface_mesh.cpp

@@ -189,22 +189,18 @@ namespace
             to_densify[cell_id] = true;
         }
         geode::GenericMapping< geode::index_t > old2new_mapping;
-        for( const auto j : geode::Range{ grid.nb_cells_in_direction( 1 ) } )
+        for( const auto cell_id : geode::Range{ grid.nb_cells() } )
         {
-            for( const auto i :
-                geode::Range{ grid.nb_cells_in_direction( 0 ) } )
+            if( to_densify[cell_id] )
             {
-                const auto cell_id = grid.cell_index( { i, j } );
-                if( to_densify[cell_id] )
-                {
-                    continue;
-                }
-                for( const auto triangle_id :
-                    create_triangles_from_diagonal_pattern(
-                        builder, grid, { i, j } ) )
-                {
-                    old2new_mapping.map( cell_id, triangle_id );
-                }
+                continue;
+            }
+            const auto cell_indices = grid.cell_indices( cell_id );
+            for( const auto triangle_id :
+                create_triangles_from_diagonal_pattern(
+                    builder, grid, cell_indices ) )
+            {
+                old2new_mapping.map( cell_id, triangle_id );
             }
         }
         for( const auto cell_index : geode::Indices{ cells_to_densify } )