gmshairfoil2d 0.2.31__py3-none-any.whl → 0.2.33__py3-none-any.whl

gmshairfoil2d/__init__.py

@@ -1,3 +1,3 @@
 """GMSH-Airfoil-2D: 2D airfoil mesh generation with GMSH."""
 
-__version__ = "1.0.0"
+__version__ = "0.2.33"

gmshairfoil2d/airfoil_func.py

@@ -131,7 +131,7 @@ def get_airfoil_file(airfoil_name):
         sys.exit(1)
 
 
-def get_airfoil_points(airfoil_name):
+def get_airfoil_points(airfoil_name: str) -> list[tuple[float, float, float]]:
     """Load airfoil points from the database.
     
     Parameters
@@ -149,14 +149,25 @@ def get_airfoil_points(airfoil_name):
     ValueError
         If no valid points found for the airfoil
     """
+    if len(airfoil_name) == 4 and airfoil_name.isdigit():
+        return four_digit_naca_airfoil(
+            naca_name=airfoil_name,
+        )
+
     get_airfoil_file(airfoil_name)
     airfoil_file = Path(database_dir, f"{airfoil_name}.dat")
 
     airfoil_points = []
     with open(airfoil_file) as f:
         for line in f:
+            line = line.strip()
+            if not line or line.startswith(('#', 'Airfoil')):
+                continue
+            parts = line.split()
+            if len(parts) != 2:
+                continue
             try:
-                x, y = map(float, line.strip().split())
+                x, y = map(float, parts)
             except ValueError:
                 continue
             if x > 1 and y > 1:
@@ -166,35 +177,83 @@ def get_airfoil_points(airfoil_name):
     if not airfoil_points:
         raise ValueError(f"No valid points found for airfoil {airfoil_name}")
 
-    n_points = len(airfoil_points)
-    upper_len = n_points // 2
+    def _dedupe_consecutive(points, tol=1e-9):
+        out = []
+        for x, y in points:
+            if not out:
+                out.append((x, y))
+                continue
+            if abs(x - out[-1][0]) <= tol and abs(y - out[-1][1]) <= tol:
+                continue
+            out.append((x, y))
+        return out
 
-    # Try to find split point at (0, 0)
-    for i, (x, y) in enumerate(airfoil_points):
-        if x == y == 0:
-            upper_len = i
-            break
+    def _dedupe_any(points, tol=1e-9):
+        out = []
+        for x, y in points:
+            if any(abs(x - ux) <= tol and abs(y - uy) <= tol for ux, uy in out):
+                continue
+            out.append((x, y))
+        return out
 
-    upper_points = airfoil_points[:upper_len]
-    lower_points = airfoil_points[upper_len:]
-    
-    if lower_points and lower_points[0][0] == 0:
-        lower_points = lower_points[::-1]
+    tol = 1e-9
+    airfoil_points = _dedupe_consecutive(airfoil_points, tol=tol)
 
-    x_up, y_up = zip(*upper_points) if upper_points else ([], [])
-    x_lo, y_lo = zip(*lower_points) if lower_points else ([], [])
+    if len(airfoil_points) < 3:
+        raise ValueError(f"Not enough unique points for airfoil {airfoil_name}")
 
-    cloud_points = [(x, y, 0) for x, y in zip([*x_up, *x_lo], [*y_up, *y_lo])]
-    return sorted(set(cloud_points), key=cloud_points.index)
+    # Split into upper/lower when a LE point repeats (common in UIUC files)
+    min_x = min(x for x, _ in airfoil_points)
+    le_indices = [i for i, (x, _) in enumerate(airfoil_points) if abs(x - min_x) <= tol]
+
+    if len(le_indices) >= 2:
+        split_idx = le_indices[1]
+        upper = airfoil_points[:split_idx]
+        lower = airfoil_points[split_idx:]
+    else:
+        # Fallback: split at first maximum x (trailing edge)
+        max_x = max(x for x, _ in airfoil_points)
+        split_idx = next(i for i, (x, _) in enumerate(airfoil_points) if abs(x - max_x) <= tol)
+        upper = airfoil_points[:split_idx + 1]
+        lower = airfoil_points[split_idx + 1:]
+
+    def _ensure_le_to_te(points):
+        if len(points) < 2:
+            return points
+        return points if points[0][0] <= points[-1][0] else points[::-1]
+
+    upper = _ensure_le_to_te(upper)
+    lower = _ensure_le_to_te(lower)
+
+    # Build a closed loop starting at TE: TE->LE (upper reversed) then LE->TE (lower)
+    if upper and lower:
+        upper = upper[::-1]
+        loop = upper + lower[1:]
+    else:
+        loop = airfoil_points
+
+    # Remove duplicate closing point if present
+    if len(loop) > 1:
+        x0, y0 = loop[0]
+        x1, y1 = loop[-1]
+        if abs(x0 - x1) <= tol and abs(y0 - y1) <= tol:
+            loop.pop()
+
+    loop = _dedupe_any(loop, tol=tol)
+
+    if len(loop) < 3:
+        raise ValueError(f"Not enough unique points for airfoil {airfoil_name}")
+
+    return [(x, y, 0) for x, y in loop]
 
 
-def NACA_4_digit_geom(NACA_name, nb_points=100):
+def four_digit_naca_airfoil(naca_name: str, nb_points: int = 100):
     """
     Compute the profile of a NACA 4 digits airfoil
 
     Parameters
     ----------
-    NACA_name : str
+    naca_name : str
         4 digit of the NACA airfoil
     nb_points : int, optional
             number of points for the disrcetisation of
@@ -208,9 +267,9 @@ def NACA_4_digit_geom(NACA_name, nb_points=100):
     theta_line = np.linspace(0, np.pi, nb_points)
     x_line = 0.5 * (1 - np.cos(theta_line))
 
-    m = int(NACA_name[0]) / 100
-    p = int(NACA_name[1]) / 10
-    t = (int(NACA_name[2]) * 10 + int(NACA_name[3])) / 100
+    m = int(naca_name[0]) / 100
+    p = int(naca_name[1]) / 10
+    t = (int(naca_name[2]) * 10 + int(naca_name[3])) / 100
 
     # thickness line
     y_t = (

gmshairfoil2d/gmshairfoil2d.py

@@ -6,7 +6,7 @@ import sys
 from pathlib import Path
 
 import gmsh
-from gmshairfoil2d.airfoil_func import (NACA_4_digit_geom, get_airfoil_points,
+from gmshairfoil2d.airfoil_func import (four_digit_naca_airfoil, get_airfoil_points,
                                         get_all_available_airfoil_names, read_airfoil_from_file)
 from gmshairfoil2d.geometry_def import (AirfoilSpline, Circle, PlaneSurface,
                                         Rectangle, outofbounds, CType)
@@ -349,7 +349,7 @@ def main():
 
     if args.naca:
         airfoil_name = args.naca
-        cloud_points = NACA_4_digit_geom(airfoil_name)
+        cloud_points = four_digit_naca_airfoil(airfoil_name)
 
     if args.airfoil:
         airfoil_name = args.airfoil
@@ -542,5 +542,6 @@ def main():
         from gmshairfoil2d.config_handler import write_config
         write_config(config_dict, args.save_config)
 
+
 if __name__ == "__main__":
     main()

{gmshairfoil2d-0.2.31.dist-info → gmshairfoil2d-0.2.33.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gmshairfoil2d
-Version: 0.2.31
+Version: 0.2.33
 Summary: Python tool to generate 2D mesh around an airfoil
 Home-page: https://github.com/cfsengineering/GMSH-Airfoil-2D
 Author: Giacomo Benedetti

gmshairfoil2d-0.2.33.dist-info/RECORD

@@ -0,0 +1,16 @@
+gmshairfoil2d/__init__.py,sha256=Z6ecfFqBGVmNzzlviwe1cnuzG-ArA79kykCVP4eveRE,85
+gmshairfoil2d/__main__.py,sha256=SdT5IPOCPld7yGCoC3cb6v55E9Ys3KeM1vrVocBqtG4,134
+gmshairfoil2d/airfoil_func.py,sha256=ddJMWhsdnjXANw1yDjKIsV9kEz0sWDTXRJmLpOFGou4,9525
+gmshairfoil2d/config_handler.py,sha256=WM10C_yxlAl6A0sAsgW9KbfIHnrWOhvwMbs7F_AQePI,5490
+gmshairfoil2d/geometry_def.py,sha256=D3FuRfaZ_YgHTvDW3KWB6Cya_2tJEktFvZkTA13h7pQ,48800
+gmshairfoil2d/gmshairfoil2d.py,sha256=2j3JqSsPyTzeV2nvaoBjqb18v-oD3tLM3dz8dabkAfI,18670
+gmshairfoil2d-0.2.33.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/test_airfoil_func.py,sha256=Q7I9_9v97V52M-qzhV42IJnCDntA5TV3z_gif2a7ua8,4182
+tests/test_config_handler.py,sha256=TI0OvZRbsho8mjzf1kUXLQ-rm_6dGY4b6w9RxYDxS5A,6449
+tests/test_geometry_def.py,sha256=Ox_ePu1sZs5dOZTsPj87b3b_gHwrC3UzyoJsuL-VeUk,1325
+gmshairfoil2d-0.2.33.dist-info/METADATA,sha256=XyPHJ64FeiiQmNoVs0GJQ82AUUSjVtNqq-QhvZ4v9XM,8248
+gmshairfoil2d-0.2.33.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+gmshairfoil2d-0.2.33.dist-info/entry_points.txt,sha256=6OBSsEXNhTICrsEGgfg30RGIkKRFXELizYtfZfT1_zk,67
+gmshairfoil2d-0.2.33.dist-info/top_level.txt,sha256=OUzQHTQIzJHlW1k6tm_9PLfE4eEWkwH0oOYNUuUXekw,20
+gmshairfoil2d-0.2.33.dist-info/RECORD,,

tests/test_airfoil_func.py

@@ -3,7 +3,7 @@ from pathlib import Path
 from unittest.mock import patch, Mock
 
 import gmshairfoil2d.__init__
-from gmshairfoil2d.airfoil_func import (NACA_4_digit_geom, get_airfoil_file,
+from gmshairfoil2d.airfoil_func import (four_digit_naca_airfoil, get_airfoil_file,
                                         get_all_available_airfoil_names, read_airfoil_from_file)
 from pytest import approx
 
@@ -58,7 +58,7 @@ def test_get_airfoil_file(monkeypatch, tmp_path):
     assert expected_path.read_text() == fake_text
 
 
-def test_NACA_4_digit_geom():
+def test_four_digit_naca_airfoil():
     with open(Path(test_data_dir, "naca0012.txt"), "rb") as f:
         naca0012 = pickle.load(f)
     with open(Path(test_data_dir, "naca4412.txt"), "rb") as f:
@@ -69,11 +69,11 @@ def test_NACA_4_digit_geom():
     """
 
     assert all(
-        [a == approx(b, 1e-3) for a, b in zip(naca0012, NACA_4_digit_geom("0012"))]
+        [a == approx(b, 1e-3) for a, b in zip(naca0012, four_digit_naca_airfoil("0012"))]
     )
 
     assert all(
-        [a == approx(b, 1e-3) for a, b in zip(naca4412, NACA_4_digit_geom("4412"))]
+        [a == approx(b, 1e-3) for a, b in zip(naca4412, four_digit_naca_airfoil("4412"))]
     )
 
 def test_read_airfoil_from_file(tmp_path):

gmshairfoil2d-0.2.31.dist-info/RECORD

@@ -1,16 +0,0 @@
-gmshairfoil2d/__init__.py,sha256=VEFFbq6EClONvPaNYBMGUnR64J06nJaO_ErPZi6WyRE,84
-gmshairfoil2d/__main__.py,sha256=SdT5IPOCPld7yGCoC3cb6v55E9Ys3KeM1vrVocBqtG4,134
-gmshairfoil2d/airfoil_func.py,sha256=UGugj2Djp-7JTv_AzEwmQcMQNMtqHSVzAdIIxZNwDyQ,7545
-gmshairfoil2d/config_handler.py,sha256=WM10C_yxlAl6A0sAsgW9KbfIHnrWOhvwMbs7F_AQePI,5490
-gmshairfoil2d/geometry_def.py,sha256=D3FuRfaZ_YgHTvDW3KWB6Cya_2tJEktFvZkTA13h7pQ,48800
-gmshairfoil2d/gmshairfoil2d.py,sha256=acEOhx8IlhRkXfFP-C-3rtqlslXgbIW276Xcz3k5Tq8,18657
-gmshairfoil2d-0.2.31.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/test_airfoil_func.py,sha256=uCzaCbr4BHfKCHF_9gEQ7hzgwQSt7rEZRrRCbEOtOlw,4158
-tests/test_config_handler.py,sha256=TI0OvZRbsho8mjzf1kUXLQ-rm_6dGY4b6w9RxYDxS5A,6449
-tests/test_geometry_def.py,sha256=Ox_ePu1sZs5dOZTsPj87b3b_gHwrC3UzyoJsuL-VeUk,1325
-gmshairfoil2d-0.2.31.dist-info/METADATA,sha256=lwQWTpntG0cPpQJdyMWms0OnQBeG6Oyd-li_fZ4fB44,8248
-gmshairfoil2d-0.2.31.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-gmshairfoil2d-0.2.31.dist-info/entry_points.txt,sha256=6OBSsEXNhTICrsEGgfg30RGIkKRFXELizYtfZfT1_zk,67
-gmshairfoil2d-0.2.31.dist-info/top_level.txt,sha256=OUzQHTQIzJHlW1k6tm_9PLfE4eEWkwH0oOYNUuUXekw,20
-gmshairfoil2d-0.2.31.dist-info/RECORD,,