Skip to content

Commit 53f98b1

Browse files
prmukherjprmukherj
authored
Merge branch 'main' into maint/activate_2d_meshing_tests_for_251
2 parents 607f45c + 4c6f66a commit 53f98b1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1959
-331
lines changed

‎.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -563,8 +563,8 @@ jobs:
563563
if: always()
564564
run: make cleanup-previous-docker-containers
565565

566-
- name: Upload 24.2 Coverage Artifacts
567-
if: matrix.image-tag == 'v24.2.0'
566+
- name: Upload 25.1 Coverage Artifacts
567+
if: matrix.image-tag == 'v25.1.0'
568568
uses: actions/upload-artifact@v4
569569
with:
570570
name: coverage_report

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

+14-24
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ env:
1313
PYFLUENT_WATCHDOG_DEBUG: 'OFF'
1414
PYFLUENT_HIDE_LOG_SECRETS: 1
1515
MAIN_PYTHON_VERSION: '3.10'
16+
FLUENT_IMAGE_TAG: v25.1.0
17+
FLUENT_VERSION: 251
1618

1719
jobs:
1820
test:
@@ -55,56 +57,44 @@ jobs:
5557
username: ansys-bot
5658
password: ${{ secrets.GITHUB_TOKEN }}
5759

58-
- name: Pull 24.2 Fluent docker image
60+
- name: Pull Fluent docker image
5961
run: make docker-pull
6062
env:
61-
FLUENT_IMAGE_TAG: v24.2.0
63+
FLUENT_IMAGE_TAG: ${{ env.FLUENT_IMAGE_TAG }}
6264

63-
- name: Run 24.2 API codegen
65+
- name: Run API codegen
6466
run: make api-codegen
6567
env:
66-
FLUENT_IMAGE_TAG: v24.2.0
68+
FLUENT_IMAGE_TAG: ${{ env.FLUENT_IMAGE_TAG }}
6769

68-
- name: Pull 25.1 Fluent docker image
69-
run: make docker-pull
70-
env:
71-
FLUENT_IMAGE_TAG: v25.1.0
72-
73-
# The version-independent built-in settings classes are generated only with Fluent 25.1
74-
# which are required for the unit tests
75-
- name: Run 25.1 API codegen
76-
run: make api-codegen
77-
env:
78-
FLUENT_IMAGE_TAG: v25.1.0
79-
80-
- name: Print 24.2 Fluent version info
70+
- name: Print Fluent version info
8171
run: |
82-
cat src/ansys/fluent/core/generated/fluent_version_242.py
83-
python -c "from ansys.fluent.core.generated.solver.settings_242 import SHASH; print(f'SETTINGS_HASH = {SHASH}')"
72+
cat src/ansys/fluent/core/generated/fluent_version_${{ env.FLUENT_VERSION }}.py
73+
python -c "from ansys.fluent.core.generated.solver.settings_${{ env.FLUENT_VERSION }} import SHASH; print(f'SETTINGS_HASH = {SHASH}')"
8474
8575
- name: Install again after codegen
8676
run: |
8777
rm -rf dist
8878
make install > /dev/null
8979
90-
- name: 24.2 Unit Testing
80+
- name: Unit Testing
9181
run: |
9282
make install-test
93-
make unittest-all-242
83+
make unittest-all-${{ env.FLUENT_VERSION }}
9484
env:
95-
FLUENT_IMAGE_TAG: v24.2.0
85+
FLUENT_IMAGE_TAG: ${{ env.FLUENT_IMAGE_TAG }}
9686

9787
- name: Cleanup previous docker containers
9888
if: always()
9989
run: make cleanup-previous-docker-containers
10090

101-
- name: Upload 24.2 Coverage Results to Codecov
91+
- name: Upload Coverage Results to Codecov
10292
uses: codecov/codecov-action@v5
10393
with:
10494
root_dir: ${{ github.workspace }}
10595
name: cov_xml.xml
10696

107-
- name: Upload 24.2 Coverage Artifacts
97+
- name: Upload Coverage Artifacts
10898
uses: actions/upload-artifact@v4
10999
with:
110100
name: coverage_report

‎doc/source/cheatsheet/cheat_sheet.qmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ solver = pyfluent.launch_fluent(
5757
dimension=pyfluent.Dimension.THREE,
5858
precision=pyfluent.Precision.DOUBLE,
5959
processor_count=2,
60-
product_version=pyfluent.FluentVersion.v242
60+
product_version=pyfluent.FluentVersion.v251
6161
)
6262
```
6363

‎doc/source/contributing/index.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ To run the PyFluent unit tests, execute the following command in the root
3333
.. code:: console
3434
3535
pip install ansys-fluent-core[tests]
36-
python -m pytest -n 4 --fluent-version=24.2
36+
python -m pytest -n 4 --fluent-version=25.1
3737
38-
You can change the Fluent version by replacing ``24.2`` with the version you want to test.
38+
You can change the Fluent version by replacing ``25.1`` with the version you want to test.
3939

4040
Build documentation
4141
-------------------

‎doc/source/getting_started/faqs.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -200,10 +200,10 @@ increasing order of precedence:
200200

201201
#. ``AWP_ROOT<ver>`` environment variable, which is configured on Windows system
202202
when Fluent is installed, where ``<ver>`` is the Fluent release number such
203-
as ``242`` for release 2024 R2. PyFluent automatically uses this environment
203+
as ``251`` for release 2025 R1. PyFluent automatically uses this environment
204204
variable to locate the latest Fluent installation. On Linux systems configure
205205
``AWP_ROOT<ver>`` to point to the absolute path of an Ansys installation such
206-
as ``/apps/ansys_inc/v242``.
206+
as ``/apps/ansys_inc/v251``.
207207

208208

209209
How do you disable PyFluent warnings shown in the console?

‎doc/source/getting_started/installation.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,16 @@ All versions of PyFluent support Fluent 2022 R2 and later.
8686

8787
PyFluent uses an environment variable to locate your Ansys installation.
8888

89-
On Windows, the Ansys installer sets the environment variable. For instance, the Ansys 2024R2
90-
installer sets the ``AWP_ROOT242`` environment variable to point to ``C:\Program Files\ANSYS Inc\v242``
89+
On Windows, the Ansys installer sets the environment variable. For instance, the Ansys 2025 R1
90+
installer sets the ``AWP_ROOT251`` environment variable to point to ``C:\Program Files\ANSYS Inc\v251``
9191
if you accept the default installation location.
9292

9393
**On Linux, the environment variable is not set automatically.** It can be set for the
9494
current user in the current shell session as follows:
9595

9696
.. code:: console
9797
98-
export AWP_ROOT242=/usr/ansys_inc/v242
98+
export AWP_ROOT251=/usr/ansys_inc/v251
9999
100100
For this variable to persist between different shell sessions for the current user, the same
101101
export command can instead be added to the user's ``~/.profile`` file.

‎doc/source/user_guide/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ A simple example
3535
.. code:: python
3636
3737
>>> import ansys.fluent.core as pyfluent
38-
>>> meshing = pyfluent.launch_fluent(mode=pyfluent.FluentMode.MESHING, product_version=pyfluent.FluentVersion.v242)
38+
>>> meshing = pyfluent.launch_fluent(mode=pyfluent.FluentMode.MESHING, product_version=pyfluent.FluentVersion.v251)
3939
>>> watertight = meshing.watertight()
4040
>>> watertight.import_geometry.file_name = pyfluent.examples.download_file("mixing_elbow.pmdb","pyfluent/mixing_elbow")
4141
>>> watertight.import_geometry()

‎doc/source/user_guide/session/launching_ansys_fluent.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ scheduler using the ``sbatch`` command:
161161
#
162162
# Activate your favorite Python environment
163163
#
164-
export AWP_ROOT242=/apps/ansys_inc/v242
164+
export AWP_ROOT251=/apps/ansys_inc/v251
165165
. ./venv/bin/activate
166166
#
167167
# Run a PyFluent script
@@ -173,7 +173,7 @@ Here are a few notes about this example:
173173

174174
- Eight machines with a total of 32 cores are requested. Fluent is started with
175175
the appropriate command line arguments passed to ``-t`` and ``-cnf``.
176-
- The variable ``AWP_ROOT242`` is configured so that PyFluent can find
176+
- The variable ``AWP_ROOT251`` is configured so that PyFluent can find
177177
the Fluent installation.
178178
- The code assumes that a Python virtual environment was pre-configured with
179179
PyFluent installed before the job script is submitted to Slurm. You could

‎docker/fluent_251/Dockerfile

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# Specify base image
2+
FROM ubuntu:20.04
3+
4+
# User variables
5+
ARG USERNAME=fluent
6+
ARG USER_UID=1000
7+
ARG USER_GID=$USER_UID
8+
9+
# Create the user
10+
RUN groupadd --gid $USER_GID $USERNAME \
11+
&& useradd --uid $USER_UID --gid $USER_GID -m $USERNAME
12+
13+
# Copy ``ansys_inc`` directory
14+
COPY ansys_inc /ansys_inc
15+
16+
# Add metadata
17+
LABEL description="Ansys Fluent 2025 R1"
18+
LABEL email="[email protected]"
19+
20+
# OCI label
21+
LABEL org.opencontainers.image.documentation="https://fluent.docs.pyansys.com"
22+
23+
# Install dependencies
24+
RUN apt-get -y update && apt-get -y install \
25+
csh \
26+
fontconfig \
27+
libxi-dev \
28+
libsm6 \
29+
libice-dev \
30+
libxrandr-dev \
31+
libxinerama-dev \
32+
libxcursor-dev \
33+
libglu1-mesa \
34+
libglvnd-dev && apt-get clean all
35+
36+
# Specify working directory
37+
ENV WORKING_DIRECTORY=/home/$USERNAME/$WORKING_DIRECTORY
38+
39+
# Specify home directory
40+
ENV HOME=/home/$USERNAME
41+
42+
# Add a working directory and make it accessible to any user
43+
RUN mkdir -p $WORKING_DIRECTORY \
44+
&& \
45+
chown -R $USERNAME:$USERNAME $WORKING_DIRECTORY \
46+
&& \
47+
chmod a+rwx $WORKING_DIRECTORY
48+
49+
# Set the user
50+
USER $USERNAME
51+
52+
# Set working directory
53+
WORKDIR /home/$USERNAME/$WORKING_DIRECTORY
54+
55+
# Specify default Fluent executable
56+
ENTRYPOINT ["/ansys_inc/v251/fluent/bin/fluent"]

‎docker/fluent_251/cadList.txt

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
v251/commonfiles/CAD
2+
v251/aisol
3+
v251/commonfiles/MainWin
4+
v251/Framework
5+
v251/commonfiles/registry
6+
v251/tp/stdc++
7+
v251/tp/openssl

‎docker/fluent_251/ceiList.txt

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
v251/CEI/BUILDINFO.txt
2+
v251/CEI/apex242
3+
v251/CEI/bin
4+
v251/CEI/ensight242lang
5+
v251/CEI/nexus242

‎docker/fluent_251/cfdpostList.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v251/CFD-Post

‎docker/fluent_251/excludeCEIList.txt

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
v251/CEI/nexus242/docs
2+
v251/CEI/nexus242/examples
3+
v251/CEI/apex242/media/docs
4+
v251/CEI/apex242/machines/linux_2.6_64/Intel2016
5+
v251/CEI/apex242/machines/linux_2.6_64/multiport
6+
v251/CEI/apex242/machines/linux_2.6_64/Mesa-13.0.5
7+
v251/CEI/apex242/machines/linux_2.6_64/intel_embree-3.10.0
8+
v251/CEI/apex242/machines/linux_2.6_64/intel_ospray-2.1.1
9+
v251/CEI/apex242/machines/linux_2.6_64/intel_odin-1.2.1
10+
v251/CEI/apex242/machines/linux_2.6_64/ifort-14.0
11+
v251/CEI/apex242/machines/linux_2.6_64/licensingclient
12+
v251/CEI/apex242/machines/linux_2.6_64/CEI/enve_common/libudil-avi.so
13+
v251/CEI/apex242/machines/linux_2.6_64/CEI/enve_common/libudil-qtime.so
14+
v251/CEI/apex242/machines/linux_2.6_64/CEI/enve_common/libudil-sm.so
15+
v251/CEI/apex242/machines/linux_2.6_64/runtime_libs/libembree3.so.3
16+
v251/CEI/apex242/machines/linux_2.6_64/runtime_libs/libembree3.so
17+
v251/CEI/apex242/machines/linux_2.6_64/Python-3.7.4/lib/python3.7/site-packages/grpc
18+
v251/CEI/apex242/machines/linux_2.6_64/Python-3.7.4/lib/python3.7/site-packages/grpc_tools
19+
v251/CEI/apex242/machines/linux_2.6_64/Python-3.7.4/lib/python3.7/site-packages/grpcio-1.17.1.dist-info
20+
v251/CEI/apex242/machines/linux_2.6_64/Python-3.7.4/lib/python3.7/site-packages/grpcio-1.22.0.dist-info
21+
v251/CEI/apex242/machines/linux_2.6_64/Python-3.7.4/lib/python3.7/site-packages/grpcio_tools-1.17.1.dist-info
22+
v251/CEI/apex242/machines/linux_2.6_64/Python-3.7.4/lib/python3.7/site-packages/grpcio_tools-1.22.0.dist-info

‎docker/fluent_251/excludeFluentList.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v251/fluent/fluent25.1.0/addons/gpuapp

‎docker/fluent_251/fluentList.txt

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
v251/licensingclient/linx64/ansyscl
2+
v251/licensingclient/linx64/ansysli_util
3+
shared_files/licensing/language/en-us/ansysli_msgs.xml
4+
v251/commonfiles/APIP/bin/linx64/apip-standalone-service
5+
v251/commonfiles/etc/ApipRC.xml
6+
v251/commonfiles/images/splash.png
7+
v251/commonfiles/images/ANSYS_blk_lrg.png
8+
v251/commonfiles/images/ANSYS_wht_lrg.png
9+
v251/commonfiles/images/academic_large_black.png
10+
v251/commonfiles/images/academic_large_white.png
11+
v251/commonfiles/images/splash.bmp
12+
v251/commonfiles/globalsettings/ANSYSProductImprovementProgram.txt
13+
v251/commonfiles/help/en-us/fluent_gui_help/
14+
v251/commonfiles/CPython/3_10/linx64/Release
15+
v251/commonfiles/fluids
16+
v251/tp/IntelCompiler/2023.1.0/linx64/lib/intel64/libifcoremt.so.5
17+
v251/tp/IntelCompiler/2023.1.0/linx64/lib/intel64/libifcoremt.so
18+
v251/tp/IntelCompiler/2023.1.0/linx64/lib/intel64/libifcore.so
19+
v251/tp/IntelCompiler/2023.1.0/linx64/lib/intel64/libifcore.so.5
20+
v251/tp/IntelCompiler/2023.1.0/linx64/lib/intel64/libifport.so
21+
v251/tp/IntelCompiler/2023.1.0/linx64/lib/intel64/libifport.so.5
22+
v251/tp/IntelCompiler/2023.1.0/linx64/lib/intel64/libiomp5.so
23+
v251/tp/IntelCompiler/2023.1.0/linx64/lib/intel64/libiomp5.dbg
24+
v251/tp/IntelCompiler/2023.1.0/linx64/lib/intel64/libimf.so
25+
v251/tp/IntelCompiler/2023.1.0/linx64/lib/intel64/libintlc.so.5
26+
v251/tp/IntelCompiler/2023.1.0/linx64/lib/intel64/libintlc.so
27+
v251/tp/IntelCompiler/2023.1.0/linx64/lib/intel64/libirc.so
28+
v251/tp/IntelCompiler/2023.1.0/linx64/lib/intel64/libirng.so
29+
v251/tp/IntelCompiler/2023.1.0/linx64/lib/intel64/libsvml.so
30+
v251/tp/IntelMKL/2023.1.0/linx64/lib/intel64/libmkl_core.so
31+
v251/tp/IntelMKL/2023.1.0/linx64/lib/intel64/libmkl_core.so.2
32+
v251/tp/IntelMKL/2023.1.0/linx64/lib/intel64/libmkl_def.so
33+
v251/tp/IntelMKL/2023.1.0/linx64/lib/intel64/libmkl_def.so.2
34+
v251/tp/IntelMKL/2023.1.0/linx64/lib/intel64/libmkl_intel_lp64.so
35+
v251/tp/IntelMKL/2023.1.0/linx64/lib/intel64/libmkl_intel_lp64.so.2
36+
v251/tp/IntelMKL/2023.1.0/linx64/lib/intel64/libmkl_intel_thread.so
37+
v251/tp/IntelMKL/2023.1.0/linx64/lib/intel64/libmkl_intel_thread.so.2
38+
v251/tp/IntelMKL/2023.1.0/linx64/lib/intel64/libmkl_sequential.so
39+
v251/tp/IntelMKL/2023.1.0/linx64/lib/intel64/libmkl_sequential.so.2
40+
v251/tp/IntelMKL/2023.1.0/linx64/lib/intel64/libmkl_intel_ilp64.so
41+
v251/tp/IntelMKL/2023.1.0/linx64/lib/intel64/libmkl_intel_ilp64.so.2
42+
v251/tp/IntelMKL/2023.1.0/linx64/lib/intel64/libmkl_avx2.so.2
43+
v251/tp/IntelMKL/2023.1.0/linx64/lib/intel64/libmkl_avx512.so.2
44+
v251/tp/IntelMKL/2023.1.0/linx64/lib/intel64/libmkl_rt.so
45+
v251/tp/IntelMKL/2023.1.0/linx64/lib/intel64/libmkl_rt.so.2
46+
v251/tp/7zip
47+
v251/fluent

‎docker/fluent_dev/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN groupadd --gid $USER_GID $USERNAME \
1414
COPY ansys_inc /ansys_inc
1515

1616
# Add metadata
17-
LABEL description="Ansys Fluent 2025 R1"
17+
LABEL description="Ansys Fluent 2025 R2"
1818
LABEL email="[email protected]"
1919

2020
# OCI label
@@ -53,4 +53,4 @@ USER $USERNAME
5353
WORKDIR /home/$USERNAME/$WORKING_DIRECTORY
5454

5555
# Specify default Fluent executable
56-
ENTRYPOINT ["/ansys_inc/v251/fluent/bin/fluent"]
56+
ENTRYPOINT ["/ansys_inc/v252/fluent/bin/fluent"]

‎docker/fluent_dev/cadList.txt

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
v251/commonfiles/CAD
2-
v251/aisol
3-
v251/commonfiles/MainWin
4-
v251/Framework
5-
v251/commonfiles/registry
6-
v251/tp/stdc++
7-
v251/tp/openssl
1+
v252/commonfiles/CAD
2+
v252/aisol
3+
v252/commonfiles/MainWin
4+
v252/Framework
5+
v252/commonfiles/registry
6+
v252/tp/stdc++
7+
v252/tp/openssl

‎docker/fluent_dev/ceiList.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
v251/CEI/BUILDINFO.txt
2-
v251/CEI/apex251
3-
v251/CEI/bin
4-
v251/CEI/ensight251lang
5-
v251/CEI/nexus251
1+
v252/CEI/BUILDINFO.txt
2+
v252/CEI/apex252
3+
v252/CEI/bin
4+
v252/CEI/ensight252lang
5+
v252/CEI/nexus252

‎docker/fluent_dev/cfdpostList.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v251/CFD-Post
1+
v252/CFD-Post

0 commit comments

Comments
 (0)