added mass distribution

Author: PatrickRoel

data/TUDELFT_V3_KITE/struc_geometry_all_in_surfplan.yaml

@@ -8,12 +8,17 @@ kcu_mass: 8.4
 # properties kite
 pressure: 0.3      #[bar]
 canopy_stiffness: 5000
+canopy_density: 170 #g/m2
+mass_without_bridles: 11 #kg
+
 ## Material properties':
 dyneema:
   density: 724
   youngs_modulus: 550000000
   damping_per_stiffness: 0.0
 
+
+
 fixed_point_indices: !!seq [0] # node indices that are fixed in space (0-based)
 
 ###########################':
@@ -100,42 +105,42 @@ strut_tubes:
     - 0.11049
     - 0.098064
     - 0.178254
-    - [13, 96, 99, 112, 122, 14]
+    - [13, 96, 99,133, 112, 122, 14]
   - - strut_3
     - 19
     - 20
     - 0.131981
     - 0.106299
     - 0.19406
-    - [19, 92, 97, 111, 123, 20]
+    - [19, 92, 97,132, 111, 123, 20]
   - - strut_4
     - 25
     - 26
     - 0.140834
     - 0.105972
     - 0.201615
-    - [25, 91, 94, 110, 124, 26]
+    - [25, 91, 94,131, 110, 124, 26]
   - - strut_5
     - 31
     - 32
     - 0.140834
     - 0.105972
     - 0.201615
-    - [31, 57, 60, 76, 90, 32]
+    - [31, 57, 60,128, 76, 90, 32]
   - - strut_6
     - 37
     - 38
     - 0.131981
     - 0.106299
     - 0.19406
-    - [37, 58, 63, 77, 89, 38]
+    - [37, 58, 63, 129,77, 89, 38]
   - - strut_7
     - 43
     - 44
     - 0.11049
     - 0.098064
     - 0.178254
-    - [43, 62, 65, 78, 88, 44]
+    - [43, 62, 65, 130,78, 88, 44]
   - - strut_8
     - 49
     - 50
@@ -203,7 +208,7 @@ bridle_particles:
   - [68, -0.711827, -1.113164, 7.054963]
   - [69, -0.692391, -3.921859, 9.027294]
   - [70, -0.633144, -0.941442, 3.348039]
-  - [71, 0.547410, -3.802240, 7.614964] #chang eor remove
+  - [71, 0.247410, -3.802240, 7.614964] #chang eor remove -0.3x
   - [72, -0.618402, -2.172485, 6.506305]
   - [73, -0.616812, -3.825134, 8.898422]
   - [74, -0.607355, -2.644934, 8.26555]
@@ -237,7 +242,7 @@ bridle_particles:
   - [102, -0.711827, 1.113164, 7.054963]
   - [103, -0.692391, 3.921859, 9.027294]
   - [104, -0.633144, 0.941442, 3.348039]
-  - [105, 0.547410, 3.802240, 7.614964] #change or remove
+  - [105, 0.247410, 3.802240, 7.614964] #change or remove
   - [106, -0.618402, 2.172485, 6.506305]
   - [107, -0.616812, 3.825134, 8.898422]
   - [108, -0.607355, 2.644934, 8.26555]
@@ -260,27 +265,71 @@ bridle_particles:
   ##############################
   ### Additional ###################
   ##############################
-  - [125, 0.28625931, 0.0, 3.19030736]
-  - [126, 0.13269336, 0.23394851, 1.48060245]
-  - [127, 0.13269336, -0.23394851, 1.48060245]
+  - [125, 0.28625931, 0.0, 2.000]
+  - [126, 0.13269336, 0.23394851, 1.000]
+  - [127, 0.13269336, -0.23394851, 1.000]
+  - [128, -0.741091103507477, -0.673776946680759, 11.0302941121239]
+  - [129, -0.699915730604499, -1.99208185170321, 10.7401629888476]
+  - [130, -0.556715089835926, -3.1661181363632, 10.0871727169221]
+  - [131, -0.741091103507477, 0.673776946680759, 11.0302941121239]
+  - [132, -0.699915730604499, 1.99208185170321, 10.7401629888476]
+  - [133, -0.556715089835926, 3.1661181363632, 10.0871727169221]
+  - [134, -0.5516016, -0.6719445, 10.4569251]
+  - [135, -0.5130279, -1.9849414, 10.2199650]
+  - [136, -0.4067750, -3.1573406, 9.5759379]
+  - [137, -0.5516016, 0.6719445, 10.4569251]
+  - [138, -0.5130279, 1.9849414, 10.2199650]
+  - [139, -0.4067750, 3.1573406, 9.5759379]
+
+
+
 
 bridle_connections:
   headers: [name, ci, cj]
   data:
-  - [a1, 57, 59]
-  - [a1, 91, 93]
-  - [a2, 58, 61]
-  - [a2, 92, 95]
-  - [a3, 62, 64]
-  - [a3, 96, 98]
-  - [a4, 69, 73]
-  - [a4, 103, 107] #a1-4 correct
-  - [ab1, 59, 66]
-  - [ab1, 93, 100]
-  - [ab2, 61, 67]
-  - [ab2, 95, 101]
-  - [ab3, 64, 74]
-  - [ab3, 98, 108]
+  - [ab1, 57, 59, 60]
+  - [ab1, 91, 93, 94]
+  - [ab2, 58, 61, 63]
+  - [ab2, 92, 95, 97]
+  - [ab3, 62, 64, 65]
+  - [ab3, 96, 98, 99]
+  - [ab4, 69, 73, 75]
+  - [ab4, 103, 107, 109]
+  - [c1, 128, 134]
+  - [c1, 131, 137]
+  - [d1, 134, 76]
+  - [d1, 137, 110]
+  - [c2, 129, 135]
+  - [c2, 132, 138]
+  - [d2, 135, 77]
+  - [d2, 138, 111]
+  - [c3, 130, 136]
+  - [c3, 133, 139]
+  - [d3, 136, 78]
+  - [d3, 139, 112]
+
+
+  - [abcd1, 59, 66, 134]
+  - [abcd1, 93, 100, 137]
+  - [abcd2, 61, 67, 135]
+  - [abcd2, 95, 101, 138]
+  - [abcd3, 64, 74, 136]
+  - [abcd3, 98, 108, 139]
+
+  # - [ab1, 59, 66]
+  # - [ab1, 93, 100]
+  # - [ab2, 61, 67]
+  # - [ab2, 95, 101]
+  # - [ab3, 64, 74]
+  # - [ab3, 98, 108]
+  # - [cd1, 76, 66]
+  # - [cd1, 110, 100]
+  # - [cd2, 77, 67]
+  # - [cd2, 111, 101]
+  # - [cd3, 78, 74]
+  # - [cd3, 112, 108]
+
+
   - [A1, 66, 68]
   - [A1, 100, 102]
   - [A2, 67, 68]
@@ -295,20 +344,10 @@ bridle_connections:
   - [AII, 106, 104]
   # - [a5.1, 70, 71] #merge to node 70
   # - [a5.1, 104, 105] #merge to node 104
-  - [b1, 60, 59]
-  - [b1, 94, 93]
-  - [b2, 63, 61]
-  - [b2, 97, 95]
-  - [b3, 65, 64]
-  - [b3, 99, 98]
-  - [b4, 75, 73]
-  - [b4, 109, 107]
-  - [cd1, 76, 66]
-  - [cd1, 110, 100]
-  - [cd2, 77, 67]
-  - [cd2, 111, 101]
-  - [cd3, 78, 74]
-  - [cd3, 112, 108]
+
+
+
+
   - [br1, 90, 83]
   - [br1, 124, 117]
   - [br2, 89, 83]
@@ -337,8 +376,8 @@ bridle_connections:
   # front lines
   - [AIII,70,71,80] # pulley
   - [AIII,104,105,114] # pulley
-  - [a5,71,84]
-  - [a5,105,118]
+  - [a5,71,53] #84
+  - [a5,105,3] #118
   - [amain,70,0]
   - [amain,104,0]
   - [amain,104,0]
@@ -360,21 +399,35 @@ bridle_lines:
   headers: [name, rest_length, diameter, material, linktype]
   data:
   #front
-  - [a1, 0.165, 0.002, dyneema, "noncompressive"]
-  - [a2, 0.165, 0.002, dyneema, "noncompressive"] #update with measurement
-  - [a3, 0.1625, 0.002, dyneema, "noncompressive"]
-  - [a4, 0.1625, 0.002, dyneema, "noncompressive"] #update with measurement
+  - [ab1, 0.330, 0.002, dyneema, "pulley"]
+  - [ab2, 0.260, 0.002, dyneema, "pulley"]
+  - [ab3, 0.260, 0.002, dyneema, "pulley"]
+  - [ab4, 0.220, 0.002, dyneema, "pulley"]
+  - [abcd1, 3.261, 0.002, dyneema, "pulley"]
+  - [abcd2, 3.3180, 0.002, dyneema, "pulley"]
+  - [abcd3, 3.3076, 0.002, dyneema, "pulley"]
+  # - [a1, 0.165, 0.002, dyneema, "noncompressive"]
+  # - [a2, 0.165, 0.002, dyneema, "noncompressive"] #update with measurement
+  # - [a3, 0.1625, 0.002, dyneema, "noncompressive"]
+  # - [a4, 0.1625, 0.002, dyneema, "noncompressive"] #update with measurement
   - [a5, 0.234, 0.002, dyneema, "noncompressive"]
-  - [b1, 0.165, 0.002, dyneema, "noncompressive"]
-  - [b2, 0.165, 0.002, dyneema, "noncompressive"]
-  - [b3, 0.1625, 0.002, dyneema, "noncompressive"]
-  - [b4, 0.1625, 0.002, dyneema, "noncompressive"]
-  - [ab1, 1.833, 0.002, dyneema, "noncompressive"]
-  - [ab2, 1.79, 0.002, dyneema, "noncompressive"]
-  - [ab3, 1.723, 0.002, dyneema, "noncompressive"]
-  - [cd1, 1.833, 0.002, dyneema, "noncompressive"]
-  - [cd2, 1.79, 0.002, dyneema, "noncompressive"]
-  - [cd3, 1.723, 0.002, dyneema, "noncompressive"]
+  # - [b1, 0.165, 0.002, dyneema, "noncompressive"]
+  # - [b2, 0.165, 0.002, dyneema, "noncompressive"]
+  # - [b3, 0.1625, 0.002, dyneema, "noncompressive"]
+  # - [b4, 0.1625, 0.002, dyneema, "noncompressive"]
+  # - [ab1, 1.833, 0.002, dyneema, "noncompressive"]
+  # - [ab2, 1.79, 0.002, dyneema, "noncompressive"]
+  # - [ab3, 1.723, 0.002, dyneema, "noncompressive"]
+  # - [cd1, 1.833, 0.002, dyneema, "noncompressive"]
+  # - [cd2, 1.79, 0.002, dyneema, "noncompressive"]
+  # - [cd3, 1.723, 0.002, dyneema, "noncompressive"]
+  - [c1, 0.445, 0.002, dyneema, "noncompressive"]
+  - [d1, 0.405, 0.002, dyneema, "noncompressive"]
+  - [c2, 0.400, 0.002, dyneema, "noncompressive"]
+  - [d2, 0.375, 0.002, dyneema, "noncompressive"]
+  - [c3, 0.400, 0.002, dyneema, "noncompressive"]
+  - [d3, 0.370, 0.002, dyneema, "noncompressive"]
+
   - [A1, 1.860, 0.002, dyneema, "noncompressive"]
   - [A2, 1.798, 0.002, dyneema, "noncompressive"]
   - [A3, 1.791, 0.002, dyneema, "noncompressive"]
@@ -390,7 +443,7 @@ bridle_lines:
   #rear
   - [br1, 4.407, 0.002, dyneema, "noncompressive"]
   - [br2, 4.180, 0.002, dyneema, "noncompressive"]
-  - [br3, 4.4094, 0.002, dyneema, "noncompressive"]
+  - [br3, 4.094, 0.002, dyneema, "noncompressive"]
   - [br4, 3.550, 0.002, dyneema, "noncompressive"]
   - [br5, 0.825, 0.002, dyneema, "noncompressive"]
 
@@ -412,7 +465,7 @@ bridle_lines:
   # rear lines
   - [brmain 3, 12.168, 0.002, dyneema, "pulley"]
   - [M-line, 4.856, 0.005, dyneema, "pulley"]
-  - [Steering Tape, 1.800, 0.005, dyneema, "noncompressive"]
+  - [Steering Tape, 1.8, 0.005, dyneema, "noncompressive"]
   - [Power Tape, 3.335, 0.005, dyneema, "noncompressive"]
 
   #   # front lines

src/kitesim/read_struc_geometry_level_2_yaml.py

@@ -263,7 +263,72 @@ def initialize_wing_structure(
                     c_arr.append(0)
                     linktype_arr.append("noncompressive")
 
-
+    #assign masses canopy
+    def triangle_area(p1, p2, p3):
+        # Vectors for two sides of the triangle
+        v1 = p2 - p1
+        v2 = p3 - p1
+        # Cross product magnitude gives 2 * triangle area
+        return 0.5 * np.linalg.norm(np.cross(v1, v2))
+
+    def quad_area(A, B, C, D):
+        A = np.array(A)
+        B = np.array(B)
+        C = np.array(C)
+        D = np.array(D)
+
+        # Split quad into triangles ABC and ACD
+        area1 = triangle_area(A, B, C)
+        area2 = triangle_area(A, C, D)
+        return area1 + area2
+
+    for i in range(len(canopy_sections) - 1):
+        section_a = canopy_sections[i]
+        section_b = canopy_sections[i + 1]
+        # Create quads by connecting adjacent nodes in consecutive sections
+        for j in range(len(section_a) - 1):
+            quad = [section_a[j], section_a[j+1], section_b[j+1], section_b[j]]
+            # Get coordinates and calculate area
+            corners = [struc_nodes[node] for node in quad]
+            area = quad_area(corners[0], corners[1], corners[2], corners[3])
+            # Distribute quad mass to its 4 nodes (each gets 1/4 of quad mass)
+            quad_mass = area * struc_geometry["canopy_density"] / 1000  # Convert g/m^2 to kg/m^2
+            for node in quad:
+                m_arr[node] += quad_mass / 4
+    
+    mass_canopy = np.sum(m_arr)
+
+    le_indices = np.array(all_sections)[:,0]
+
+    # Calculate total length of inflatable tubes
+    total_inflatable_length = 0
+
+    # Add up lengths in leading edge
+    for i in range(len(le_indices) - 1):
+        total_inflatable_length += np.linalg.norm(struc_nodes[le_indices[i]] - struc_nodes[le_indices[i+1]])
+
+    # Add up lengths in strut sections
+    for section in strut_sections:
+        for j in range(len(section) - 1):
+            total_inflatable_length += np.linalg.norm(struc_nodes[section[j]] - struc_nodes[section[j+1]])
+
+    # Calculate target mass for inflatable tubes
+    target_mass_inflatable = struc_geometry["mass_without_bridles"] - mass_canopy
+
+    # Distribute mass along leading edge based on segment lengths
+    for i in range(len(le_indices) - 1):
+        segment_length = np.linalg.norm(struc_nodes[le_indices[i]] - struc_nodes[le_indices[i+1]])
+        segment_mass = target_mass_inflatable * (segment_length / total_inflatable_length)
+        m_arr[le_indices[i]] += segment_mass / 2
+        m_arr[le_indices[i+1]] += segment_mass / 2
+
+    # Distribute mass along strut sections based on segment lengths
+    for section in strut_sections:
+        for j in range(len(section) - 1):
+            segment_length = np.linalg.norm(struc_nodes[section[j]] - struc_nodes[section[j+1]])
+            segment_mass = target_mass_inflatable * (segment_length / total_inflatable_length)
+            m_arr[section[j]] += segment_mass / 2
+            m_arr[section[j+1]] += segment_mass / 2
 
     return (
         # node level