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

{gmshairfoil2d-0.2.2.dist-info → gmshairfoil2d-0.2.31.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tests/test_airfoil_func.py

@@ -4,7 +4,7 @@ from unittest.mock import patch, Mock
 
 import gmshairfoil2d.__init__
 from gmshairfoil2d.airfoil_func import (NACA_4_digit_geom, get_airfoil_file,
-                                        get_all_available_airfoil_names)
+                                        get_all_available_airfoil_names, read_airfoil_from_file)
 from pytest import approx
 
 LIB_DIR = Path(gmshairfoil2d.__init__.__file__).parents[1]
@@ -75,3 +75,54 @@ def test_NACA_4_digit_geom():
     assert all(
         [a == approx(b, 1e-3) for a, b in zip(naca4412, NACA_4_digit_geom("4412"))]
     )
+
+def test_read_airfoil_from_file(tmp_path):
+    """
+    Test reading airfoil coordinates from a .dat file
+    """
+    # Create a simple test airfoil file
+    airfoil_content = """NACA 0012 Test Airfoil
+                      100 100
+                      1.000000 0.000000
+                      0.975000 0.003000
+                      0.900000 0.008000
+                      0.500000 0.012000
+                      0.100000 0.008000
+                      0.025000 0.003000
+                      0.000000 0.000000
+                      0.025000 -0.003000
+                      0.100000 -0.008000
+                      0.500000 -0.012000
+                      0.900000 -0.008000
+                      0.975000 -0.003000
+                      """
+    
+    test_file = tmp_path / "test_airfoil.dat"
+    test_file.write_text(airfoil_content)
+    
+    # Read the airfoil
+    points = read_airfoil_from_file(str(test_file))
+    
+    # Check that points were read
+    assert len(points) > 0
+    
+    # Check that points are tuples with 3 coordinates (x, y, 0)
+    for point in points:
+        assert len(point) == 3
+        assert point[2] == 0  # z coordinate should be 0
+    
+    # Check that we have some leading edge points (x near 0)
+    x_coords = [p[0] for p in points]
+    assert any(x < 0.05 for x in x_coords)
+    
+    # Check that we have trailing edge points (x near 1)
+    assert any(x > 0.95 for x in x_coords)
+
+
+def test_read_airfoil_from_file_not_found():
+    """
+    Test that FileNotFoundError is raised for non-existent files
+    """
+    import pytest
+    with pytest.raises(FileNotFoundError):
+        read_airfoil_from_file("/non/existent/path/airfoil.dat")

tests/test_config_handler.py

@@ -0,0 +1,260 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+"""
+Tests for the configuration file handler
+"""
+
+import pytest
+from pathlib import Path
+from gmshairfoil2d.config_handler import read_config, write_config, merge_config_with_args
+import argparse
+
+
+def test_read_config_basic(tmp_path):
+    """
+    Test reading basic configuration from file
+    """
+    config_content = """# Test configuration file
+naca= 0012
+aoa= 5.0
+farfield= 10
+format= su2
+"""
+    
+    config_file = tmp_path / "test_config.cfg"
+    config_file.write_text(config_content)
+    
+    config = read_config(str(config_file))
+    
+    assert config['naca'] == '0012'
+    assert config['aoa'] == 5.0
+    assert config['farfield'] == 10
+    assert config['format'] == 'su2'
+
+
+def test_read_config_empty_values(tmp_path):
+    """
+    Test that empty values are skipped
+    """
+    config_content = """naca= 0012
+airfoil=
+aoa= 5.0
+output=
+format= su2
+"""
+    
+    config_file = tmp_path / "test_config.cfg"
+    config_file.write_text(config_content)
+    
+    config = read_config(str(config_file))
+    
+    # Should have the parameters with values
+    assert 'naca' in config
+    assert 'aoa' in config
+    assert 'format' in config
+    
+    # Should NOT have the empty parameters
+    assert 'airfoil' not in config
+    assert 'output' not in config
+
+
+def test_read_config_boolean_values(tmp_path):
+    """
+    Test that boolean values are correctly converted
+    """
+    config_content = """no_bl= False
+structured= True
+ui= false
+"""
+    
+    config_file = tmp_path / "test_config.cfg"
+    config_file.write_text(config_content)
+    
+    config = read_config(str(config_file))
+    
+    assert config['no_bl'] is False
+    assert config['structured'] is True
+    assert config['ui'] is False
+
+
+def test_read_config_numeric_conversion(tmp_path):
+    """
+    Test that numeric values are correctly converted to float/int
+    """
+    config_content = """nb_layers= 35
+aoa= 5.5
+first_layer= 3e-05
+ratio= 1.2
+"""
+    
+    config_file = tmp_path / "test_config.cfg"
+    config_file.write_text(config_content)
+    
+    config = read_config(str(config_file))
+    
+    assert config['nb_layers'] == 35
+    assert isinstance(config['nb_layers'], int)
+    assert config['aoa'] == 5.5
+    assert isinstance(config['aoa'], float)
+    assert config['first_layer'] == 3e-05
+    assert isinstance(config['first_layer'], float)
+    assert config['ratio'] == 1.2
+    assert isinstance(config['ratio'], float)
+
+
+def test_read_config_comments_ignored(tmp_path):
+    """
+    Test that comment lines are ignored
+    """
+    config_content = """# This is a comment
+naca= 0012
+# Another comment
+aoa= 5.0
+# Even more comments here
+"""
+    
+    config_file = tmp_path / "test_config.cfg"
+    config_file.write_text(config_content)
+    
+    config = read_config(str(config_file))
+    
+    assert len(config) == 2
+    assert config['naca'] == '0012'
+    assert config['aoa'] == 5.0
+
+
+def test_read_config_file_not_found():
+    """
+    Test that FileNotFoundError is raised for non-existent files
+    """
+    with pytest.raises(FileNotFoundError):
+        read_config("/non/existent/config.cfg")
+
+
+def test_write_config(tmp_path):
+    """
+    Test writing configuration to file
+    """
+    config_dict = {
+        'naca': '0012',
+        'aoa': 5.0,
+        'farfield': 10,
+        'format': 'su2',
+        'structured': False
+    }
+    
+    output_file = tmp_path / "output_config.cfg"
+    write_config(config_dict, str(output_file))
+    
+    # Verify file was created
+    assert output_file.exists()
+    
+    # Read back and verify
+    content = output_file.read_text()
+    assert 'naca= 0012' in content
+    assert 'aoa= 5.0' in content
+    assert 'farfield= 10' in content
+    assert 'format= su2' in content
+
+
+def test_write_config_with_none_values(tmp_path):
+    """
+    Test writing configuration with None values
+    """
+    config_dict = {
+        'naca': '0012',
+        'airfoil': None,
+        'aoa': 5.0
+    }
+    
+    output_file = tmp_path / "output_config.cfg"
+    write_config(config_dict, str(output_file))
+    
+    content = output_file.read_text()
+    assert 'airfoil=' in content
+
+
+def test_merge_config_with_args():
+    """
+    Test merging configuration with command-line arguments
+    """
+    config_dict = {
+        'naca': '0012',
+        'aoa': 5.0,
+        'farfield': 10,
+        'format': 'su2'
+    }
+    
+    # Create mock args with defaults
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--naca', default=None)
+    parser.add_argument('--aoa', type=float, default=None)
+    parser.add_argument('--farfield', type=float, default=10)
+    parser.add_argument('--format', default=None)
+    parser.add_argument('--output', default='.')
+    
+    args = parser.parse_args([])
+    
+    # Merge config into args
+    merged_args = merge_config_with_args(config_dict, args)
+    
+    assert merged_args.naca == '0012'
+    assert merged_args.aoa == 5.0
+    assert merged_args.format == 'su2'
+    assert merged_args.output == '.'  # Default not overridden
+
+
+def test_merge_config_cli_precedence():
+    """
+    Test that CLI arguments take precedence over config file
+    """
+    config_dict = {
+        'naca': '0012',
+        'aoa': 5.0,
+        'format': 'su2'
+    }
+    
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--naca', default=None)
+    parser.add_argument('--aoa', type=float, default=None)
+    parser.add_argument('--format', default=None)
+    
+    # Simulate CLI providing aoa explicitly
+    args = parser.parse_args(['--aoa', '10.0'])
+    
+    merged_args = merge_config_with_args(config_dict, args)
+    
+    # Config values applied
+    assert merged_args.naca == '0012'
+    assert merged_args.format == 'su2'
+    
+    # CLI value takes precedence
+    assert merged_args.aoa == 10.0
+
+
+def test_read_write_roundtrip(tmp_path):
+    """
+    Test that writing and reading back produces the same config
+    """
+    original_config = {
+        'naca': '2412',
+        'aoa': 3.5,
+        'farfield': 15,
+        'format': 'cgns',
+        'nb_layers': 50,
+        'first_layer': 1e-04
+    }
+    
+    config_file = tmp_path / "roundtrip_config.cfg"
+    
+    # Write
+    write_config(original_config, str(config_file))
+    
+    # Read back
+    read_back_config = read_config(str(config_file))
+    
+    # Verify all values match
+    for key, value in original_config.items():
+        assert key in read_back_config
+        assert read_back_config[key] == value

tests/test_geometry_def.py

@@ -29,13 +29,17 @@ def test_mesh_rectangle():
     gmsh.write(str(Path(test_data_dir, "mesh_test.su2")))
     gmsh.finalize()
 
-    # Test if the generated mesh is correct
+    # Test if the generated mesh is correct by checking key properties
+    # (exact floating point comparison varies with GMSH version)
     with open(Path(test_data_dir, "mesh_test.su2"), "r") as f:
         mesh_test = f.read()
-    with open(Path(test_data_dir, "mesh.su2"), "r") as f:
-        mesh_origin = f.read()
+    
+    # Verify mesh structure is created correctly
+    assert "NDIME= 2" in mesh_test
+    assert "NELEM= 14" in mesh_test
+    assert "NPOIN= 12" in mesh_test
+    assert "NMARK= 3" in mesh_test
+    assert "MARKER_TAG= inlet" in mesh_test
+    assert "MARKER_TAG= outlet" in mesh_test
+    assert "MARKER_TAG= wall" in mesh_test
 
-    assert mesh_test == mesh_origin
-
-
-test_mesh_rectangle()

gmshairfoil2d-0.2.2.dist-info/RECORD

@@ -1,13 +0,0 @@
-gmshairfoil2d/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-gmshairfoil2d/airfoil_func.py,sha256=6DJTp4uwLL_9_75weVFw69lHZYmVsa-FY2916iBAuXU,5694
-gmshairfoil2d/geometry_def.py,sha256=IaJ-5pBAfXHI-fHvCoeIlXmu6kJpKYdEQq_cVdacK9I,44388
-gmshairfoil2d/gmshairfoil2d.py,sha256=9GoKpHDytiUOvM0dX-YNDVb25GxG5KaZjxq5emo-IVw,9998
-gmshairfoil2d-0.2.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/test_airfoil_func.py,sha256=s6byg1p66I79PhFK-r9Ke4KcI_XaTNqIYKB3K1ZjQEc,2465
-tests/test_geometry_def.py,sha256=ogy8YmigkwQ118duDXXGRZPZb_DS9qnkTuzzaF5jmb8,1054
-gmshairfoil2d-0.2.2.dist-info/METADATA,sha256=t5AtDapRtaMv-zLgvarUxEUHzQ9HnRk11U_OkUfONZk,5861
-gmshairfoil2d-0.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gmshairfoil2d-0.2.2.dist-info/entry_points.txt,sha256=6OBSsEXNhTICrsEGgfg30RGIkKRFXELizYtfZfT1_zk,67
-gmshairfoil2d-0.2.2.dist-info/top_level.txt,sha256=OUzQHTQIzJHlW1k6tm_9PLfE4eEWkwH0oOYNUuUXekw,20
-gmshairfoil2d-0.2.2.dist-info/RECORD,,