Merge branch 'main' into maint/activate_2d_meshing_tests_for_251

Author: prmukherj

.github/workflows/ci.yml

@@ -563,8 +563,8 @@ jobs:
         if: always()
         run: make cleanup-previous-docker-containers
 
-      - name: Upload 24.2 Coverage Artifacts
-        if: matrix.image-tag == 'v24.2.0'
+      - name: Upload 25.1 Coverage Artifacts
+        if: matrix.image-tag == 'v25.1.0'
         uses: actions/upload-artifact@v4
         with:
           name: coverage_report

.github/workflows/test-run-nightly.yml

@@ -13,6 +13,8 @@ env:
   PYFLUENT_WATCHDOG_DEBUG: 'OFF'
   PYFLUENT_HIDE_LOG_SECRETS: 1
   MAIN_PYTHON_VERSION: '3.10'
+  FLUENT_IMAGE_TAG: v25.1.0
+  FLUENT_VERSION: 251
 
 jobs:
   test:
@@ -55,56 +57,44 @@ jobs:
           username: ansys-bot
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Pull 24.2 Fluent docker image
+      - name: Pull Fluent docker image
         run: make docker-pull
         env:
-          FLUENT_IMAGE_TAG: v24.2.0
+          FLUENT_IMAGE_TAG: ${{ env.FLUENT_IMAGE_TAG }}
 
-      - name: Run 24.2 API codegen
+      - name: Run API codegen
         run: make api-codegen
         env:
-          FLUENT_IMAGE_TAG: v24.2.0
+          FLUENT_IMAGE_TAG: ${{ env.FLUENT_IMAGE_TAG }}
 
-      - name: Pull 25.1 Fluent docker image
-        run: make docker-pull
-        env:
-          FLUENT_IMAGE_TAG: v25.1.0
-
-        # The version-independent built-in settings classes are generated only with Fluent 25.1
-        # which are required for the unit tests
-      - name: Run 25.1 API codegen
-        run: make api-codegen
-        env:
-          FLUENT_IMAGE_TAG: v25.1.0
-
-      - name: Print 24.2 Fluent version info
+      - name: Print Fluent version info
         run: |
-          cat src/ansys/fluent/core/generated/fluent_version_242.py
-          python -c "from ansys.fluent.core.generated.solver.settings_242 import SHASH; print(f'SETTINGS_HASH = {SHASH}')"
+          cat src/ansys/fluent/core/generated/fluent_version_${{ env.FLUENT_VERSION }}.py
+          python -c "from ansys.fluent.core.generated.solver.settings_${{ env.FLUENT_VERSION }} import SHASH; print(f'SETTINGS_HASH = {SHASH}')"
 
       - name: Install again after codegen
         run: |
           rm -rf dist
           make install > /dev/null
 
-      - name: 24.2 Unit Testing
+      - name: Unit Testing
         run: |
           make install-test
-          make unittest-all-242
+          make unittest-all-${{ env.FLUENT_VERSION }}
         env:
-          FLUENT_IMAGE_TAG: v24.2.0
+          FLUENT_IMAGE_TAG: ${{ env.FLUENT_IMAGE_TAG }}
 
       - name: Cleanup previous docker containers
         if: always()
         run: make cleanup-previous-docker-containers
 
-      - name: Upload 24.2 Coverage Results to Codecov
+      - name: Upload Coverage Results to Codecov
         uses: codecov/codecov-action@v5
         with:
           root_dir: ${{ github.workspace }}
           name: cov_xml.xml
 
-      - name: Upload 24.2 Coverage Artifacts
+      - name: Upload Coverage Artifacts
         uses: actions/upload-artifact@v4
         with:
           name: coverage_report

doc/source/cheatsheet/cheat_sheet.qmd

@@ -57,7 +57,7 @@ solver = pyfluent.launch_fluent(
     dimension=pyfluent.Dimension.THREE,
     precision=pyfluent.Precision.DOUBLE,
     processor_count=2,
-    product_version=pyfluent.FluentVersion.v242
+    product_version=pyfluent.FluentVersion.v251
     )
 ```
 

doc/source/contributing/index.rst

@@ -33,9 +33,9 @@ To run the PyFluent unit tests, execute the following command in the root
 .. code:: console
 
     pip install ansys-fluent-core[tests]
-    python -m pytest -n 4 --fluent-version=24.2
+    python -m pytest -n 4 --fluent-version=25.1
 
-You can change the Fluent version by replacing ``24.2`` with the version you want to test.
+You can change the Fluent version by replacing ``25.1`` with the version you want to test.
 
 Build documentation
 -------------------

doc/source/getting_started/faqs.rst

@@ -200,10 +200,10 @@ increasing order of precedence:
 
 #. ``AWP_ROOT<ver>`` environment variable, which is configured on Windows system
    when Fluent is installed, where ``<ver>`` is the Fluent release number such
-   as ``242`` for release 2024 R2.  PyFluent automatically uses this environment
+   as ``251`` for release 2025 R1.  PyFluent automatically uses this environment
    variable to locate the latest Fluent installation. On Linux systems configure
    ``AWP_ROOT<ver>`` to point to the absolute path of an Ansys installation such
-   as ``/apps/ansys_inc/v242``.
+   as ``/apps/ansys_inc/v251``.
 
 
 How do you disable PyFluent warnings shown in the console?

doc/source/getting_started/installation.rst

@@ -86,16 +86,16 @@ All versions of PyFluent support Fluent 2022 R2 and later.
 
 PyFluent uses an environment variable to locate your Ansys installation.
 
-On Windows, the Ansys installer sets the environment variable. For instance, the Ansys 2024R2
-installer sets the ``AWP_ROOT242`` environment variable to point to ``C:\Program Files\ANSYS Inc\v242``
+On Windows, the Ansys installer sets the environment variable. For instance, the Ansys 2025 R1
+installer sets the ``AWP_ROOT251`` environment variable to point to ``C:\Program Files\ANSYS Inc\v251``
 if you accept the default installation location.
 
 **On Linux, the environment variable is not set automatically.** It can be set for the
 current user in the current shell session as follows:
 
 .. code:: console
 
-    export AWP_ROOT242=/usr/ansys_inc/v242
+    export AWP_ROOT251=/usr/ansys_inc/v251
 
 For this variable to persist between different shell sessions for the current user, the same
 export command can instead be added to the user's ``~/.profile`` file.

doc/source/user_guide/index.rst

@@ -35,7 +35,7 @@ A simple example
 .. code:: python
 
   >>> import ansys.fluent.core as pyfluent
-  >>> meshing = pyfluent.launch_fluent(mode=pyfluent.FluentMode.MESHING, product_version=pyfluent.FluentVersion.v242)
+  >>> meshing = pyfluent.launch_fluent(mode=pyfluent.FluentMode.MESHING, product_version=pyfluent.FluentVersion.v251)
   >>> watertight = meshing.watertight()
   >>> watertight.import_geometry.file_name = pyfluent.examples.download_file("mixing_elbow.pmdb","pyfluent/mixing_elbow")
   >>> watertight.import_geometry()

doc/source/user_guide/session/launching_ansys_fluent.rst

@@ -161,7 +161,7 @@ scheduler using the ``sbatch`` command:
    #
    # Activate your favorite Python environment
    #
-   export AWP_ROOT242=/apps/ansys_inc/v242
+   export AWP_ROOT251=/apps/ansys_inc/v251
    . ./venv/bin/activate
    #
    # Run a PyFluent script
@@ -173,7 +173,7 @@ Here are a few notes about this example:
 
 - Eight machines with a total of 32 cores are requested. Fluent is started with
   the appropriate command line arguments passed to ``-t`` and ``-cnf``.
-- The variable ``AWP_ROOT242`` is configured so that PyFluent can find
+- The variable ``AWP_ROOT251`` is configured so that PyFluent can find
   the Fluent installation.
 - The code assumes that a Python virtual environment was pre-configured with
   PyFluent installed before the job script is submitted to Slurm. You could

docker/fluent_251/Dockerfile

@@ -0,0 +1,56 @@
+# Specify base image
+FROM ubuntu:20.04
+
+# User variables
+ARG USERNAME=fluent
+ARG USER_UID=1000
+ARG USER_GID=$USER_UID
+
+# Create the user
+RUN groupadd --gid $USER_GID $USERNAME \
+    && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME
+
+# Copy ``ansys_inc`` directory
+COPY ansys_inc /ansys_inc
+
+# Add metadata
+LABEL description="Ansys Fluent 2025 R1"
+LABEL email="[email protected]"
+
+# OCI label
+LABEL org.opencontainers.image.documentation="https://fluent.docs.pyansys.com"
+
+# Install dependencies
+RUN apt-get -y update && apt-get -y install \
+        csh \
+        fontconfig \
+        libxi-dev \
+        libsm6 \
+        libice-dev \
+        libxrandr-dev \
+        libxinerama-dev \
+        libxcursor-dev \
+        libglu1-mesa \
+        libglvnd-dev  && apt-get clean all
+
+# Specify working directory
+ENV WORKING_DIRECTORY=/home/$USERNAME/$WORKING_DIRECTORY
+
+# Specify home directory
+ENV HOME=/home/$USERNAME
+
+# Add a working directory and make it accessible to any user
+RUN mkdir -p $WORKING_DIRECTORY \
+    && \
+    chown -R $USERNAME:$USERNAME $WORKING_DIRECTORY \
+    && \
+    chmod a+rwx $WORKING_DIRECTORY
+
+# Set the user
+USER $USERNAME
+
+# Set working directory
+WORKDIR /home/$USERNAME/$WORKING_DIRECTORY
+
+# Specify default Fluent executable
+ENTRYPOINT ["/ansys_inc/v251/fluent/bin/fluent"]

docker/fluent_251/cadList.txt

@@ -0,0 +1,7 @@
+v251/commonfiles/CAD
+v251/aisol
+v251/commonfiles/MainWin
+v251/Framework
+v251/commonfiles/registry
+v251/tp/stdc++
+v251/tp/openssl