fixed tags in boundary curves, skip ci

Author: amaurigmartins

examples/tutorial3.jl

@@ -66,7 +66,7 @@ opts = FEMOptions(
     force_remesh=true,  # Force remeshing
     run_solver=true,
     overwrite_results=true,
-    preview_geo=false,  # Preview geometry
+    preview_geo=true,  # Preview geometry
     preview_mesh=false,  # Preview the mesh
     base_path=joinpath(@__DIR__, "fem_output"),
     verbosity=2,  # Verbose output

src/FEMTools/cable.jl

@@ -174,10 +174,10 @@ function _make_cablepart!(workspace::FEMWorkspace, part::AbstractCablePart,
     # Create annular shape and assign marker
     if radius_in ≈ 0
         # Solid disk
-        _, _, marker = draw_disk(x_center, y_center, radius_ext, mesh_size, num_points_circumference)
+        _, _, marker, _ = draw_disk(x_center, y_center, radius_ext, mesh_size, num_points_circumference)
     else
         # Annular shape
-        _, _, marker = draw_annular(x_center, y_center, radius_in, radius_ext, mesh_size, num_points_circumference)
+        _, _, marker, _ = draw_annular(x_center, y_center, radius_in, radius_ext, mesh_size, num_points_circumference)
     end
 
     # Create entity data
@@ -303,7 +303,7 @@ function _make_cablepart!(workspace::FEMWorkspace, part::WireArray,
     # Create wires
     for (wire_idx, (wx, wy)) in enumerate(wire_positions)
 
-        _, _, marker = draw_disk(wx, wy, radius_wire, mesh_size, num_points_circumference)
+        _, _, marker, _ = draw_disk(wx, wy, radius_wire, mesh_size, num_points_circumference)
 
         # Create wire name
         elementary_name = create_cable_elementary_name(

src/FEMTools/drawing.jl

@@ -169,10 +169,23 @@ function draw_line(x1::Number, y1::Number, x2::Number, y2::Number, mesh_size::Nu
 
     tag = gmsh.model.occ.add_line(mesh_points[1], mesh_points[end])
 
+    # Add midpoint markers between each pair of mesh points
+    segment_markers = Vector{Vector{Float64}}()
+    push!(segment_markers, marker)
+
+    if length(mesh_points) >= 2
+        # Iterate through adjacent pairs of mesh points
+        for i in 1:(num_points-1)
+            t = (i - 0.5) / (num_points - 1)  # Parametric coordinate (0.5 between points)
+            mid_x = x1 + t * (x2 - x1)
+            mid_y = y1 + t * (y2 - y1)
+            # Create marker at midpoint
+            mid_marker = [mid_x, mid_y, 0.0]
+            push!(segment_markers, mid_marker)
+        end
+    end
 
-
-
-    return tag, mesh_points, marker
+    return tag, mesh_points, segment_markers
 end
 
 """
@@ -211,13 +224,35 @@ function draw_disk(x::Number, y::Number, radius::Number, mesh_size::Number, num_
         theta_offset=0 #pi / 15
     )
 
-    # marker = [x, y + (radius / 2), 0.0]
+
     marker = [x, y + 0.99 * radius, 0.0] # A very small offset inwards the circle
     marker_tag = gmsh.model.occ.add_point(marker[1], marker[2], marker[3], mesh_size)
     gmsh.model.set_entity_name(0, marker_tag, "marker_$(round(mesh_size, sigdigits=6))")
 
+    # Add midpoint markers between each pair of mesh points
+    arc_markers = Vector{Vector{Float64}}()
+
+    if num_points >= 2
+        # Calculate the angular step between mesh points
+        theta_step = 2 * pi / num_points
+
+        # Add a midpoint marker for each arc segment
+        for i in 1:num_points
+            # Calculate midpoint theta (angle)
+            theta_mid = (i - 0.5) * theta_step
+
+            # Calculate midpoint coordinates
+            mid_x = x + radius * cos(theta_mid)
+            mid_y = y + radius * sin(theta_mid)
+
+            # Create marker at the midpoint
+            mid_marker = [mid_x, mid_y, 0.0]
+
+            push!(arc_markers, mid_marker)
+        end
+    end
 
-    return tag, mesh_points, marker
+    return tag, mesh_points, marker, arc_markers
 end
 
 
@@ -284,12 +319,34 @@ function draw_annular(x::Number, y::Number, radius_in::Number, radius_ext::Numbe
         )
     end
 
-    # marker = [x, y + ((radius_in + radius_ext) / 2), 0.0]
     marker = [x, y + (radius_in + 0.99 * (radius_ext - radius_in)), 0.0]
     marker_tag = gmsh.model.occ.add_point(marker[1], marker[2], marker[3], mesh_size)
     gmsh.model.set_entity_name(0, marker_tag, "marker_$(round(mesh_size, sigdigits=6))")
 
-    return tag, mesh_points, marker
+    # Add midpoint markers between each pair of mesh points
+    arc_markers = Vector{Vector{Float64}}()
+
+    if num_points >= 2
+        # Calculate the angular step between mesh points
+        theta_step = 2 * pi / num_points
+
+        # Add a midpoint marker for each arc segment
+        for i in 1:num_points
+            # Calculate midpoint theta (angle)
+            theta_mid = (i - 0.5) * theta_step
+
+            # Calculate midpoint coordinates
+            mid_x = x + radius_ext * cos(theta_mid)
+            mid_y = y + radius_ext * sin(theta_mid)
+
+            # Create marker at the midpoint
+            mid_marker = [mid_x, mid_y, 0.0]
+
+            push!(arc_markers, mid_marker)
+        end
+    end
+
+    return tag, mesh_points, marker, arc_markers
 end
 
 

src/FEMTools/identification.jl

@@ -32,9 +32,9 @@ this operation.
 function process_fragments(workspace::FEMWorkspace)
 
     # Get all entities
-    surfaces = gmsh.model.getEntities(2)
-    curves = gmsh.model.getEntities(1)
-    points = gmsh.model.getEntities(0)
+    surfaces = gmsh.model.get_entities(2)
+    curves = gmsh.model.get_entities(1)
+    points = gmsh.model.get_entities(0)
 
     @debug "Initial counts: $(length(surfaces)) surfaces, $(length(curves)) curves, $(length(points)) points"
 
@@ -46,8 +46,8 @@ function process_fragments(workspace::FEMWorkspace)
     end
 
     # Get updated entities after first fragmentation
-    updated_curves = gmsh.model.getEntities(1)
-    updated_points = gmsh.model.getEntities(0)
+    updated_curves = gmsh.model.get_entities(1)
+    updated_points = gmsh.model.get_entities(0)
 
     @debug "After fragmenting points onto curves: $(length(updated_curves)) curves, $(length(updated_points)) points"
 
@@ -64,9 +64,9 @@ function process_fragments(workspace::FEMWorkspace)
     gmsh.model.occ.synchronize()
 
     # Final counts
-    final_surfaces = gmsh.model.getEntities(2)
-    final_curves = gmsh.model.getEntities(1)
-    final_points = gmsh.model.getEntities(0)
+    final_surfaces = gmsh.model.get_entities(2)
+    final_curves = gmsh.model.get_entities(1)
+    final_points = gmsh.model.get_entities(0)
 
     @info "Boolean fragmentation completed"
     @debug "Before: $(length(surfaces)) surfaces, $(length(curves)) curves, $(length(points)) points"
@@ -78,7 +78,7 @@ end
 function identify_by_marker(workspace::FEMWorkspace)
 
     # Get all surfaces after fragmentation
-    all_surfaces = gmsh.model.getEntities(2)
+    all_surfaces = gmsh.model.get_entities(2)
 
     # Track statistics
     total_entities = length(workspace.unassigned_entities)
@@ -96,7 +96,7 @@ function identify_by_marker(workspace::FEMWorkspace)
         for (dim, tag) in all_surfaces
             if !(entity_data isa CurveEntity)
                 # Check if marker is inside this surface
-                if gmsh.model.isInside(dim, tag, marker) == 1
+                if gmsh.model.is_inside(dim, tag, marker) == 1
                     # Found match - create FEMEntity and add to appropriate container
                     fem_entity = FEMEntity(tag, entity_data)
 
@@ -121,7 +121,7 @@ function identify_by_marker(workspace::FEMWorkspace)
     end
 
     # Get all remaining curves after fragmentation
-    all_curves = gmsh.model.getEntities(1)
+    all_curves = gmsh.model.get_entities(1)
 
     # Update keys to avoid modifying dict during iteration
     markers = collect(keys(workspace.unassigned_entities))
@@ -134,7 +134,7 @@ function identify_by_marker(workspace::FEMWorkspace)
 
         for (dim, tag) in all_curves
             # Check if marker is inside this curve
-            if gmsh.model.isInside(dim, tag, marker) == 1
+            if gmsh.model.is_inside(dim, tag, marker) == 1
                 # Found match - create FEMEntity and add to appropriate container
                 fem_entity = FEMEntity(tag, entity_data)
 

src/FEMTools/space.jl

@@ -40,11 +40,11 @@ function make_space_geometry(workspace::FEMWorkspace)
     # Create inner domain disk
     num_points_circumference = formulation.points_per_circumference
     @debug "Creating inner domain disk with radius $(domain_radius) m"
-    _, _, air_region_marker = draw_disk(x_center, y_center, domain_radius, mesh_size_domain, num_points_circumference)
+    _, _, air_region_marker, domain_boundary_markers = draw_disk(x_center, y_center, domain_radius, mesh_size_domain, num_points_circumference)
 
     # Create outer domain annular region
     @debug "Creating outer domain annular region with radius $(domain_radius_inf) m"
-    _, _, air_infshell_marker = draw_annular(x_center, y_center, domain_radius, domain_radius_inf, mesh_size_inf, num_points_circumference)
+    _, _, air_infshell_marker, domain_infty_markers = draw_annular(x_center, y_center, domain_radius, domain_radius_inf, mesh_size_inf, num_points_circumference)
 
     # Get earth model from workspace
     earth_props = workspace.problem_def.earth_props
@@ -153,12 +153,26 @@ function make_space_geometry(workspace::FEMWorkspace)
         earth_material
     )
 
-    # Add surfaces to the workspace
+    # Add curves to the workspace
     workspace.unassigned_entities[air_boundary_marker] = air_boundary_entity
     workspace.unassigned_entities[air_infty_marker] = air_infty_entity
     workspace.unassigned_entities[earth_boundary_marker] = earth_boundary_entity
     workspace.unassigned_entities[earth_infty_marker] = earth_infty_entity
 
+    @debug "Domain boundary markers:"
+    for point_marker in domain_boundary_markers
+        target_entity = point_marker[2] > 0 ? air_boundary_entity : earth_boundary_entity
+        workspace.unassigned_entities[point_marker] = target_entity
+        @debug "  Point $point_marker: ($(point_marker[1]), $(point_marker[2]), $(point_marker[3]))"
+    end
+
+    @debug "Domain -> infinity markers:"
+    for point_marker in domain_infty_markers
+        target_entity = point_marker[2] > 0 ? air_infty_entity : earth_infty_entity
+        workspace.unassigned_entities[point_marker] = target_entity
+        @debug "  Point $point_marker: ($(point_marker[1]), $(point_marker[2]), $(point_marker[3]))"
+    end
+
     # Add physical groups to the workspace
     register_physical_group!(workspace, air_region_tag, air_material)
     register_physical_group!(workspace, earth_region_tag, earth_material)
@@ -202,7 +216,7 @@ function make_space_geometry(workspace::FEMWorkspace)
     num_elements = formulation.elements_per_length_interfaces
     earth_interface_mesh_size = _calc_mesh_size(0, domain_radius, earth_material, num_elements, workspace)
 
-    _, _, earth_interface_marker = draw_line(-domain_radius_inf, 0.0, domain_radius_inf, 0.0, earth_interface_mesh_size, round(Int, domain_radius))
+    _, _, earth_interface_markers = draw_line(-domain_radius_inf, 0.0, domain_radius_inf, 0.0, earth_interface_mesh_size, round(Int, domain_radius))
 
     # Create physical tag for the earth interface
     interface_idx = 1  # Earth interface index
@@ -228,6 +242,7 @@ function make_space_geometry(workspace::FEMWorkspace)
     mesh_size_min = earth_interface_mesh_size / 100 #characteristic_len / workspace.formulation.elements_per_length_insulator
     mesh_size_max = earth_interface_mesh_size
     transition_mesh = collect(LinRange(mesh_size_min, mesh_size_max, n_regions))
+    # TODO: Transition regions should be parametric and specified by the user in the formulation
     _, _, earth_transition_markers = draw_transition_region(cx, cy, transition_radii, transition_mesh, num_points_circumference)
 
     # Register transition regions in the workspace
@@ -246,7 +261,14 @@ function make_space_geometry(workspace::FEMWorkspace)
     @info "Transition regions created"
 
     # Add interface to the workspace
-    workspace.unassigned_entities[earth_interface_marker] = earth_interface_entity
+    @debug "Domain -> infinity markers:"
+    for point_marker in earth_interface_markers
+        workspace.unassigned_entities[point_marker] = earth_interface_entity
+        @debug "  Point $point_marker: ($(point_marker[1]), $(point_marker[2]), $(point_marker[3]))"
+    end
+
+
+
     @info "Earth interfaces created"
 
 end