Skip to content

Commit 16745bf

Browse files
authored
Merge branch 'master' into maint/move_imageio_to_plotting_dependencies
2 parents 6b14f03 + 63d9bf5 commit 16745bf

File tree

204 files changed

+12462
-1783
lines changed

Some content is hidden

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

204 files changed

+12462
-1783
lines changed

.ci/build_doc.bat

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,25 @@ call sphinx-apidoc -o ../docs/source/api ../src/ansys ../src/ansys/dpf/core/log.
44
../src/ansys/dpf/core/field_base.py ../src/ansys/dpf/core/cache.py ../src/ansys/dpf/core/misc.py ^
55
../src/ansys/dpf/core/check_version.py ../src/ansys/dpf/core/operators/build.py ../src/ansys/dpf/core/operators/specification.py ^
66
../src/ansys/dpf/core/vtk_helper.py ../src/ansys/dpf/core/label_space.py ../src/ansys/dpf/core/examples/python_plugins/* ^
7-
../src/ansys/dpf/core/examples/examples.py ^
7+
../src/ansys/dpf/core/examples/examples.py ../src/ansys/dpf/core/property_fields_container.py ^
88
-f --implicit-namespaces --separate --no-headings
99
pushd .
1010
cd ../docs/
1111
call make clean
1212
call make html -v -v -v -P
13+
14+
dir
15+
16+
rem Patch pyVista issue with elemental plots
17+
18+
xcopy source\examples\04-advanced\02-volume_averaged_stress\sphx_glr_02-volume_averaged_stress_001.png build\html\_images\sphx_glr_02-volume_averaged_stress_001.png /y
19+
xcopy source\examples\12-fluids\02-fluids_results\sphx_glr_02-fluids_results_001.png build\html\_images\sphx_glr_02-fluids_results_001.png /y
20+
xcopy source\examples\12-fluids\02-fluids_results\sphx_glr_02-fluids_results_002.png build\html\_images\sphx_glr_02-fluids_results_002.png /y
21+
xcopy source\examples\12-fluids\02-fluids_results\sphx_glr_02-fluids_results_003.png build\html\_images\sphx_glr_02-fluids_results_003.png /y
22+
xcopy source\examples\12-fluids\02-fluids_results\sphx_glr_02-fluids_results_004.png build\html\_images\sphx_glr_02-fluids_results_004.png /y
23+
xcopy source\examples\12-fluids\02-fluids_results\sphx_glr_02-fluids_results_005.png build\html\_images\sphx_glr_02-fluids_results_005.png /y
24+
xcopy source\examples\12-fluids\02-fluids_results\sphx_glr_02-fluids_results_006.png build\html\_images\sphx_glr_02-fluids_results_006.png /y
25+
xcopy source\examples\12-fluids\02-fluids_results\sphx_glr_02-fluids_results_007.png build\html\_images\sphx_glr_02-fluids_results_007.png /y
26+
xcopy source\examples\12-fluids\02-fluids_results\sphx_glr_02-fluids_results_thumb.png build\html\_images\sphx_glr_02-fluids_results_thumb.png /y
27+
1328
popd

.github/workflows/ci_release.yml

Lines changed: 34 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
standalone_branch_suffix:
1212
description: 'Suffix of the branch on standalone'
1313
required: false
14-
default: '.pre1'
14+
default: '.pre0'
1515

1616
#┌───────────── minute (0 - 59)
1717
#│ ┌───────────── hour (0 - 23)
@@ -24,7 +24,7 @@ on:
2424
#* * * * *
2525

2626
env:
27-
ANSYS_VERSION: 232
27+
ANSYS_VERSION: 241
2828
DOCUMENTATION_CNAME: 'dpf.docs.pyansys.com'
2929
MAIN_PYTHON_VERSION: '3.8'
3030

@@ -57,27 +57,36 @@ jobs:
5757
tests:
5858
uses: ./.github/workflows/tests.yml
5959
with:
60-
ANSYS_VERSION: "232"
61-
python_versions: '["3.7", "3.8", "3.9", "3.10"]'
60+
ANSYS_VERSION: "241"
61+
python_versions: '["3.8", "3.9", "3.10"]'
6262
wheel: true
6363
wheelhouse: true
64-
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre1' }}
64+
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre0' }}
6565
secrets: inherit
6666

6767
docs:
6868
uses: ./.github/workflows/docs.yml
6969
with:
70-
ANSYS_VERSION: "232"
71-
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre1' }}
70+
ANSYS_VERSION: "241"
71+
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre0' }}
7272
event_name: ${{ github.event_name }}
7373
secrets: inherit
7474

7575
examples:
7676
uses: ./.github/workflows/examples.yml
77+
with:
78+
ANSYS_VERSION: "241"
79+
python_versions: '["3.8", "3.9", "3.10"]'
80+
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre0' }}
81+
secrets: inherit
82+
83+
retro_232:
84+
name: "retro 232"
85+
uses: ./.github/workflows/tests.yml
7786
with:
7887
ANSYS_VERSION: "232"
79-
python_versions: '["3.7", "3.8", "3.9", "3.10"]'
80-
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre1' }}
88+
python_versions: '["3.8"]'
89+
DOCSTRING: false
8190
secrets: inherit
8291

8392
retro_231:
@@ -107,12 +116,19 @@ jobs:
107116
DOCSTRING: false
108117
secrets: inherit
109118

119+
pydpf-post_241:
120+
name: "PyDPF-Post with 241"
121+
uses: ./.github/workflows/pydpf-post.yml
122+
with:
123+
ANSYS_VERSION: "241"
124+
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre0' }}
125+
secrets: inherit
126+
110127
pydpf-post_232:
111128
name: "PyDPF-Post with 232"
112129
uses: ./.github/workflows/pydpf-post.yml
113130
with:
114131
ANSYS_VERSION: "232"
115-
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre1' }}
116132
secrets: inherit
117133

118134
pydpf-post_231:
@@ -140,29 +156,32 @@ jobs:
140156
name: "gate"
141157
uses: ./.github/workflows/gate.yml
142158
with:
143-
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre1' }}
159+
python_versions: '["3.8"]'
160+
ANSYS_VERSION: "241"
161+
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre0' }}
144162
secrets: inherit
145163

146164
docker_tests:
147165
name: "Build and Test on Docker"
148166
uses: ./.github/workflows/test_docker.yml
149167
with:
150-
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre1' }}
168+
ANSYS_VERSION: "241"
169+
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre0' }}
151170
secrets: inherit
152171

153172
docker_examples:
154173
name: "Run examples on Docker"
155174
uses: ./.github/workflows/examples_docker.yml
156175
with:
157-
ANSYS_VERSION: "232"
176+
ANSYS_VERSION: "241"
158177
python_versions: '["3.8", "3.9", "3.10"]'
159-
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
178+
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre0' }}
160179
secrets: inherit
161180

162181
draft_release:
163182
name: "Draft Release"
164183
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
165-
needs: [style, tests, docs, examples, retro_222, retro_221, gate, pydpf-post_231, pydpf-post_222, pydpf-post_221, docker_tests]
184+
needs: [style, tests, docs, examples, retro_232, retro_231, retro_222, retro_221, gate, docker_tests]
166185
runs-on: ubuntu-latest
167186
steps:
168187
- name: "Set up Python"

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ jobs:
139139
shell: bash
140140
working-directory: docs
141141
run: |
142-
case `tail -n 5 log.txt | grep -F "build succeeded" >/dev/null; echo $?` in
142+
case `grep -F "build succeeded" log.txt >/dev/null; echo $?` in
143143
0)
144144
echo "Build succeeded!"
145145
exit 0;;

.github/workflows/gate.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
python_versions:
88
required: false
99
type: string
10-
default: '["3.7"]'
10+
default: '["3.8"]'
1111
ANSYS_VERSION:
1212
required: false
1313
type: string
@@ -24,7 +24,7 @@ on:
2424
description: "Python interpreters to test."
2525
required: true
2626
type: string
27-
default: '["3.7"]'
27+
default: '["3.8"]'
2828
ANSYS_VERSION:
2929
description: "ANSYS version"
3030
required: true

README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,16 @@ apps for both data input and data output, including visualization and
2020
result plots. It can access data from solver result files and other neutral
2121
formats, such as CSV, HDF5, and VTK files.
2222

23+
The latest version of DPF supports Ansys solver result files for:
24+
25+
- MAPDL (`.rst`, `.mode`, `.rfrq`, `.rdsp`)
26+
- LS-DYNA (`.d3plot`, `.binout`)
27+
- Fluent (`.cas/dat.h5`, `.flprj`)
28+
- CFX (`.cad/dat.cff`, `.flprj`)
29+
30+
See the `PyDPF-Core main page <https://dpf.docs.pyansys.com/version/stable/index.html>`_
31+
for more information on compatibility.
32+
2333
Using the many DPF operators that are available, you can manipulate and
2434
transform this data. You can also chain operators together to create simple
2535
or complex data-processing workflows that you can reuse for repeated or

docs/make.bat

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,24 @@ IF EXIST "source\images\auto-generated" (
4040
IF EXIST "source\examples\07-python-operators\plugins" (
4141
robocopy "source\examples\07-python-operators\plugins" "source\_temp\plugins" /E >nul 2>&1
4242
)
43+
IF EXIST "source\examples\04-advanced\02-volume_averaged_stress" (
44+
robocopy "source\examples\04-advanced\02-volume_averaged_stress" "source\_temp\04_advanced" /E >nul 2>&1
45+
)
46+
IF EXIST "source\examples\12-fluids\02-fluids_results" (
47+
robocopy "source\examples\12-fluids\02-fluids_results" "source\_temp\12_fluids" /E >nul 2>&1
48+
)
4349
IF EXIST "source\examples" (
4450
rmdir "source\examples" /s /q
4551
)
4652
IF EXIST "source\_temp\plugins" (
4753
robocopy "source\_temp\plugins" "source\examples\07-python-operators\plugins" /E >nul 2>&1
4854
)
55+
IF EXIST "source\_temp\04_advanced" (
56+
robocopy "source\_temp\04_advanced" "source\examples\04-advanced\02-volume_averaged_stress" /E >nul 2>&1
57+
)
58+
IF EXIST "source\_temp\12_fluids" (
59+
robocopy "source\_temp\12_fluids" "source\examples\12-fluids\02-fluids_results" /E >nul 2>&1
60+
)
4961
IF EXIST "source\_temp" (
5062
rmdir "source\_temp" /s /q
5163
)

0 commit comments

Comments
 (0)