turbigen 2.7.0__tar.gz → 2.7.3__tar.gz

{turbigen-2.7.0 → turbigen-2.7.3}/.gitlab-ci.yml

@@ -16,6 +16,7 @@ before_script:
 variables:
   UV_CACHE_DIR: "$CI_PROJECT_DIR/.uv-cache"
   DOCKER_HOST: unix:///var/run/docker.sock
+  DOCKER_API_VERSION: 1.41
   DOCKER_TLS_CERTDIR: ""
 
 build_test_wheel:
@@ -57,7 +58,7 @@ doc:
       - doc/_build
   script:
     - apt update && apt install -y pdf2svg fonts-freefont-ttf
-    - uv pip install dist/*.whl sphinx sphinx-autobuild sphinx-argparse sphinxcontrib-programoutput sphinxcontrib-bibtex snowballstemmer==2.2.0 autodocsumm
+    - uv pip install dist/*.whl sphinx~=8.0.0 sphinx-autobuild sphinx-argparse sphinxcontrib-programoutput sphinxcontrib-bibtex snowballstemmer==2.2.0 autodocsumm
     - python doc/generate_examples.py
     - python doc/generate_meanline.py
     - python doc/generate_data_structures.py

{turbigen-2.7.0 → turbigen-2.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: turbigen
-Version: 2.7.0
+Version: 2.7.3
 Summary: Framework for turbomachinery design and computational fluid dynamics simulation
 Keywords: turbomachinery,computational fluid dynamics,compressor,turbine
 Author-Email: James Brind <jb753@cam.ac.uk>

{turbigen-2.7.0 → turbigen-2.7.3}/examples/axial_turbine.yaml

@@ -51,7 +51,6 @@ blades:
     - spf: 0.5
       thick: [0.04, 0.12, 0.35, 0.2, 0.0, 0.15]
       camber: [0., 0., 0.0]
-      tip: 0.01
 
 # Circulation coefficient to set blade loadings
 nblade:

{turbigen-2.7.0 → turbigen-2.7.3}/meson.build

@@ -25,7 +25,6 @@ incdir_f2py = run_command(py,
 inc_np = include_directories(incdir_numpy)
 np_dep = declare_dependency(include_directories: inc_np)
 
-incdir_f2py = incdir_numpy / '..' / '..' / 'f2py' / 'src'
 inc_f2py = include_directories(incdir_f2py)
 fortranobject_c = incdir_f2py / 'fortranobject.c'
 

{turbigen-2.7.0 → turbigen-2.7.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "turbigen"
-version = "2.7.0"
+version = "2.7.3"
 requires-python = ">=3.11"
 license = {text = "GPL-3.0-or-later"}
 authors = [
@@ -50,7 +50,7 @@ manylinux-x86_64-image = "manylinux2014"
 archs = ["x86_64"]
 
 [tool.bumpversion]
-current_version = "2.7.0"
+current_version = "2.7.3"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"
@@ -68,9 +68,12 @@ commit_args = ""
 [[tool.bumpversion.files ]]
 filename = "pyproject.toml"
 
+[tool.uv]
+managed = false
+
 [dependency-groups]
 dev = [
-    'sphinx',
+    'sphinx~=8.0.0',
     'sphinx-autobuild',
     'sphinx-argparse',
     'sphinxcontrib-programoutput',
@@ -83,5 +86,4 @@ dev = [
     'bump-my-version',
     'meson-python',
     'ninja',
-    'pyqt6',
 ]

turbigen-2.7.3/scripts/ag_server_wrapper.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+# Autogrid server wrapper for running as systemd unit
+set -euo pipefail
+
+WORKDIR="/mnt/data/jb753/meshing/"
+LOGFILE="$WORKDIR/daemon.log"
+
+# Add Numeca IGG to PATH if it exists
+IGG_PATH="/usr/numeca/bin"
+if [ -d "$IGG_PATH" ]; then
+    export PATH="$IGG_PATH:$PATH"
+else
+    echo "Error: Numeca IGG path $IGG_PATH does not exist."
+    exit 1
+fi
+
+# Activate the venv
+VENV_PATH="/home/jb753/python/turbigen-dev/.venv"
+source "$VENV_PATH/bin/activate"
+
+# Run the server, teeing output to log
+turbigen-autogrid-server "$WORKDIR" --workers=8  2>&1 | tee -a "$LOGFILE"

{turbigen-2.7.0 → turbigen-2.7.3}/src/turbigen/config2.py

@@ -533,10 +533,11 @@ class TurbigenConfig:
         Nb = np.full((len(self.blades),), 0, dtype=int)
         for irow, row in enumerate(self.blades):
             # Set number of blades using main blade
+
             Nb[irow] = np.round(
-                self.nblade[irow].get_blade_number(
-                    self.mean_line.nominal.get_row(irow), row[0]
-                )
+                self.nblade[irow]
+                .get_blade_number(self.mean_line.nominal.get_row(irow), row[0])
+                .item()
             )
         return Nb
 
@@ -557,7 +558,7 @@ class TurbigenConfig:
             )
 
     def get_gaps(self):
-        """Return non-dimensional tip gaps as fraction of span."""
+        """Return dimensional tip gaps."""
 
         # Relative gaps from blade definition
         gap_span = np.full((self.nrow,), 0.0)
@@ -578,7 +579,8 @@ class TurbigenConfig:
                 )
                 sys.exit(1)
 
-        return gap_span
+        gap = gap_span * span
+        return gap
 
     def apply_recamber(self):
         # Apply recamber to the blades
@@ -939,7 +941,7 @@ class TurbigenConfig:
 
         self.check_pitch_chord()
         logger.info(f"Nblade: {self.get_nblade()}")
-        logger.info(f"Tip gaps/span: {self.get_gaps()}")
+        logger.info(f"Tip gaps [m]: {self.get_gaps()}")
 
         # Handle restarts
         if self.grid:

{turbigen-2.7.0 → turbigen-2.7.3}/src/turbigen/flowfield.py

@@ -549,6 +549,17 @@ class BaseFlowField(
         D = v[:, 1:, :-1, None]
         return util.dA_Gauss(A, B, C, D)[..., 0]
 
+    def nearest_index(self, xrt):
+        """Get the indices of closest point in a block to a query point."""
+        xrrt = np.copy(xrt)
+        xrrt[2] *= xrrt[1]
+        if self.ndim > 3:
+            xrrt_self = self.xrrt[..., 0]
+        else:
+            xrrt_self = self.xrrt
+        dist = np.sum((xrrt_self - np.reshape(xrrt, (3, 1, 1, 1))) ** 2, axis=0)
+        return np.unravel_index(np.argmin(dist), self.shape[:3]), dist.min()
+
 
 class PerfectFlowField(turbigen.fluid.PerfectState, BaseFlowField):
     """Flow and thermodynamic properties of a perfect gas."""

{turbigen-2.7.0 → turbigen-2.7.3}/src/turbigen/grid.py

@@ -1144,13 +1144,6 @@ class BaseBlock(turbigen.flowfield.BaseFlowField):
 
         self.Omega = Omega
 
-    def nearest_index(self, xrt):
-        """Get the indices of closest point in a block to a query point."""
-        xrrt = np.copy(xrt)
-        xrrt[2] *= xrrt[1]
-        dist = np.sum((self.xrrt - np.reshape(xrrt, (3, 1, 1, 1))) ** 2, axis=0)
-        return np.unravel_index(np.argmin(dist), self.shape)
-
     def __eq__(self, other):
         """Two blocks are equal if they have the same coordinates."""
         return self is other
@@ -1265,6 +1258,25 @@ class Grid:
 
         return blocks
 
+    def blocks_touching_box(self, xrt_box):
+        """Get blocks inside a bouding box."""
+        xrt_box = np.reshape(xrt_box, (3, 2))
+
+        # Loop over blocks
+        blocks = []
+        for b in self:
+            xmin = (b.x >= xrt_box[0, 0]).any()
+            xmax = (b.x <= xrt_box[0, -1]).any()
+            ymin = (b.r >= xrt_box[1, 0]).any()
+            ymax = (b.r <= xrt_box[1, -1]).any()
+            zmin = (b.t >= xrt_box[2, 0]).any()
+            zmax = (b.t <= xrt_box[2, -1]).any()
+
+            if all((xmin, xmax, ymin, ymax, zmin, zmax)):
+                blocks.append(b)
+
+        return blocks
+
     @property
     def inlet_patches(self):
         return self.find_patches(InletPatch)
@@ -1307,7 +1319,7 @@ class Grid:
 
     @property
     def inviscid_patches(self):
-        return self.find_patches(CuspPatch)
+        return self.find_patches(InviscidPatch)
 
     def match_patches(self, raise_fail=True):
         """Connect all pairs of patches that should match together."""
@@ -2173,6 +2185,13 @@ class InletPatch(Patch):
         else:
             raise Exception(f"Unknown inlet forcing type {self.force}")
 
+        assert np.abs(np.mean(fac_Po) - 1) < 1e-3, (
+            f"Mean inlet Po factor {np.mean(fac_Po)} is not unity!"
+        )
+        assert np.abs(np.mean(fac_ho) - 1) < 1e-3, (
+            f"Mean inlet ho factor {np.mean(fac_ho)} is not unity!"
+        )
+
         return fac_ho, fac_Po
 
     def set_profile(self, spf, profiles):

{turbigen-2.7.0 → turbigen-2.7.3}/src/turbigen/hmesh.py

@@ -78,6 +78,16 @@ class H(turbigen.mesh.Mesher):
 
         dsurf = np.tile(dsurf, (2, 1))
 
+        # Dimensional gaps
+        span_all = np.array(
+            [
+                np.mean(mac.ann.get_span(np.arange(irow * 2, irow * 2 + 2)))
+                for irow in range(mac.Nrow)
+            ]
+        )
+        tip_abs_all = np.array(mac.tip)
+        tip_span_all = tip_abs_all / span_all
+
         # Spanwise grid vector
         # From hub/casing spacings and ER
         span_ref = mac.ann.get_span(1)
@@ -160,7 +170,7 @@ class H(turbigen.mesh.Mesher):
             logger.debug(f"nk={nk}, nk_not_resampled={nk_not_resampled}")
 
             # Spanwise grid
-            tip_ref = np.max(mac.tip)
+            tip_ref = np.max(tip_span_all)
             span_frac = mesh_config.spanwise_grid(dspf_hub, dspf_casing, tip_ref)
 
             if mesh_config.slip_annulus:
@@ -314,13 +324,13 @@ class H(turbigen.mesh.Mesher):
                             drt_norm_now = np.sum(dsurf[:, irow] * mfrac) / rt_pitch_now
 
                             try:
-                                pitch_frac_clust[
-                                    i, j, :
-                                ] = mesh_config.pitchwise_grid_fixed_npts(
-                                    drt_norm_now,
-                                    pitch_chord_ref[1],
-                                    AR_row,
-                                    nk_not_resampled,
+                                pitch_frac_clust[i, j, :] = (
+                                    mesh_config.pitchwise_grid_fixed_npts(
+                                        drt_norm_now,
+                                        pitch_chord_ref[1],
+                                        AR_row,
+                                        nk_not_resampled,
+                                    )
                                 )
                             except ValueError:
                                 raise Exception(
@@ -364,9 +374,7 @@ class H(turbigen.mesh.Mesher):
                         xrt_l,
                         mlim_now,
                         Theta,
-                        chord_mid[
-                            (0, -1),
-                        ],
+                        chord_mid[(0, -1),],
                         Theta_max=mesh_config.skew_max,
                     )[:2]
 
@@ -422,17 +430,8 @@ class H(turbigen.mesh.Mesher):
 
             # Evaluate the angular coordinates and assemble
             theta = np.flip(
-                pfr3
-                * theta_lim3[
-                    (0,),
-                ]
-                + (1.0 - pfr3)
-                * (
-                    theta_lim3[
-                        (1,),
-                    ]
-                    + pitch_theta
-                ),
+                pfr3 * theta_lim3[(0,),]
+                + (1.0 - pfr3) * (theta_lim3[(1,),] + pitch_theta),
                 axis=-1,
             )
 
@@ -775,12 +774,7 @@ class H(turbigen.mesh.Mesher):
     def pitchwise_relaxation(self, stream_frac, pitch_chord):
         # Relax clustering towards a uniform distribution at inlet and exit
         dt_relax = (
-            np.ones((2,))
-            * self.nchord_relax
-            * pitch_chord[
-                (0, -1),
-            ]
-            / pitch_chord[1]
+            np.ones((2,)) * self.nchord_relax * pitch_chord[(0, -1),] / pitch_chord[1]
         )
         relax_ref = np.array([1.0, 0.0, 0.0, 1.0])
         t_ref = np.array([-dt_relax[0], 0.0, 1.0, 1.0 + dt_relax[1]])