Skip to content

Commit 726c8eb

Browse files
committed
Merge branch 'master' of https://github.com/ansys/pydpf-core into plot/streamlines
2 parents 390a4f0 + 64ca882 commit 726c8eb

File tree

108 files changed

+3295
-1208
lines changed

Some content is hidden

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

108 files changed

+3295
-1208
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/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;;

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
)

docs/source/_static/dpf_operators.html

Lines changed: 14 additions & 5 deletions
Large diffs are not rendered by default.

docs/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
pyvista.OFF_SCREEN = True
1515
# Preferred plotting style for documentation
1616
# pyvista.set_plot_theme('document')
17-
pyvista.rcParams["window_size"] = np.array([1024, 768]) * 2
17+
pyvista.global_theme.window_size = np.array([1024, 768]) * 2
1818
# Save figures in specified directory
1919
pyvista.FIGURE_PATH = os.path.join(os.path.abspath("./images/"), "auto-generated/")
2020
if not os.path.exists(pyvista.FIGURE_PATH):
294 KB
Loading
525 KB
Loading
870 KB
Loading
643 KB
Loading
633 KB
Loading

0 commit comments

Comments
 (0)