Skip to content

Commit d1ae076

Browse files
PProfiziPProfizi
authored
Merge branch 'merge/0.5.dev2' into merge/retro/fix_222
2 parents 1f84078 + 330b496 commit d1ae076

File tree

520 files changed

+1633
-800
lines changed

Some content is hidden

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

520 files changed

+1633
-800
lines changed

‎.github/workflows/ci.yml

+2-7
Original file line numberDiff line numberDiff line change
@@ -133,22 +133,17 @@ jobs:
133133
shell: cmd
134134
run: |
135135
cd .ci
136-
build_doc.bat > ..\docs\log.txt 2>&1
136+
build_doc.bat > ..\docs\log.txt && type ..\docs\log.txt 2>&1
137137
timeout-minutes: 20
138138

139-
- name: DOCUMENTATION zip artifacts
140-
run: |
141-
7z a -tzip ./docs/archive/doc-ansys-dpf-core.zip ./docs/build
142-
if: always()
143-
144139
- name: "Kill all servers"
145140
uses: pyansys/pydpf-actions/[email protected]
146141

147142
- name: Publish Documentation artifact
148143
uses: actions/upload-artifact@v3
149144
with:
150145
name: doc-ansys-dpf-core
151-
path: ./docs/archive/doc-ansys-dpf-core.zip
146+
path: ./docs/build/*
152147
if: always()
153148

154149
- name: Publish Documentation log

‎.github/workflows/retro.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
python-version: ["3.8"]
24-
os: [ "windows-latest"]
24+
os: ["windows-latest"]
2525
env:
2626
ANSYS_VERSION: 221
2727
steps:

‎ansys/dpf/core/elements.py

-13
Original file line numberDiff line numberDiff line change
@@ -601,19 +601,6 @@ def _get_connectivities_field(self):
601601
"""Retrieve the connectivities field."""
602602
return self._mesh.property_field(elemental_properties.connectivity)
603603

604-
@connectivities_field.setter
605-
@version_requires("3.0")
606-
def connectivities_field(self, property_field):
607-
"""
608-
Connectivity field setter.
609-
610-
Parameters
611-
----------
612-
property_field : PropertyField
613-
PropertyField that contains connectivity value
614-
"""
615-
self._property_field_setter(property_field, elemental_properties.connectivity)
616-
617604
@property
618605
def n_elements(self) -> int:
619606
"""Number of elements"""

‎ansys/dpf/core/inputs.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,7 @@ def connect(self, inpt):
196196
Parameters
197197
----------
198198
inpt : str, int, double, bool, list[int], list[float], Field, FieldsContainer, Scoping,
199-
ScopingsContainer, MeshedRegion, MeshesContainer, DataSources, CyclicSupport,
200-
Outputs, os.PathLike
199+
ScopingsContainer, MeshedRegion, MeshesContainer, DataSources, CyclicSupport, Outputs, os.PathLike # noqa: E501
201200
Input of the operator.
202201
203202
"""

‎ansys/dpf/core/meshed_region.py

+54-29
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,10 @@ def __init__(self, num_nodes=None, num_elements=None, mesh=None, server=None):
6767
self._server = server_module.get_or_create_server(server)
6868

6969
# step 2: get api
70-
self._api = self._server.get_api_for_type(capi=meshed_region_capi.MeshedRegionCAPI,
71-
grpcapi=meshed_region_grpcapi.MeshedRegionGRPCAPI)
70+
self._api = self._server.get_api_for_type(
71+
capi=meshed_region_capi.MeshedRegionCAPI,
72+
grpcapi=meshed_region_grpcapi.MeshedRegionGRPCAPI,
73+
)
7274

7375
# step3: init environment
7476
self._api.init_meshed_region_environment(self) # creates stub when gRPC
@@ -80,7 +82,9 @@ def __init__(self, num_nodes=None, num_elements=None, mesh=None, server=None):
8082
else:
8183
# if no mesh object, create one
8284
if self._server.has_client():
83-
self._internal_obj = self._api.meshed_region_new_on_client(self._server.client)
85+
self._internal_obj = self._api.meshed_region_new_on_client(
86+
self._server.client
87+
)
8488
else:
8589
self._internal_obj = self._api.meshed_region_new()
8690

@@ -223,10 +227,13 @@ def available_property_fields(self):
223227
available_property_fields : list str
224228
"""
225229
available_property_fields = []
226-
n_property_field = self._api.meshed_region_get_num_available_property_field(self)
230+
n_property_field = self._api.meshed_region_get_num_available_property_field(
231+
self
232+
)
227233
for index in range(n_property_field):
228-
available_property_fields.append(self._api.meshed_region_get_property_field_name(self,
229-
index))
234+
available_property_fields.append(
235+
self._api.meshed_region_get_property_field_name(self, index)
236+
)
230237
return available_property_fields
231238

232239
def property_field(self, property_name):
@@ -290,7 +297,9 @@ def _get_available_named_selections(self):
290297
named_selections = []
291298
n_selections = self._api.meshed_region_get_num_available_named_selection(self)
292299
for index in range(n_selections):
293-
named_selections.append(self._api.meshed_region_get_named_selection_name(self, index))
300+
named_selections.append(
301+
self._api.meshed_region_get_named_selection_name(self, index)
302+
)
294303
return named_selections
295304

296305
def named_selection(self, named_selection):
@@ -307,7 +316,9 @@ def named_selection(self, named_selection):
307316
named_selection : Scoping
308317
"""
309318
if server_meet_version("2.1", self._server):
310-
out = self._api.meshed_region_get_named_selection_scoping(self, named_selection)
319+
out = self._api.meshed_region_get_named_selection_scoping(
320+
self, named_selection
321+
)
311322
return scoping.Scoping(scoping=out, server=self._server)
312323
else:
313324
if hasattr(self, "_stream_provider"):
@@ -335,8 +346,9 @@ def set_named_selection_scoping(self, named_selection_name, scoping):
335346
named selection name
336347
scoping : Scoping
337348
"""
338-
return self._api.meshed_region_set_named_selection_scoping(self,
339-
named_selection_name, scoping)
349+
return self._api.meshed_region_set_named_selection_scoping(
350+
self, named_selection_name, scoping
351+
)
340352

341353
def _set_stream_provider(self, stream_provider):
342354
self._stream_provider = stream_provider
@@ -382,7 +394,7 @@ def _set_stream_provider(self, stream_provider):
382394
# self._internal_obj = skin.get_output(0, types.meshed_region)
383395
# return MeshedRegion(self._server.channel, skin, self._model, name)
384396

385-
def deform_by(self, deform_by, scale_factor=1.):
397+
def deform_by(self, deform_by, scale_factor=1.0):
386398
"""
387399
Deforms the mesh according to a 3D vector field and an additional scale factor.
388400
@@ -399,10 +411,11 @@ def deform_by(self, deform_by, scale_factor=1.):
399411
400412
"""
401413
from ansys.dpf.core.operators.math import add, scale
414+
402415
scale_op = scale(field=deform_by, ponderation=scale_factor)
403-
return add(fieldA=self.nodes.coordinates_field,
404-
fieldB=scale_op.outputs.field
405-
).eval()
416+
return add(
417+
fieldA=self.nodes.coordinates_field, fieldB=scale_op.outputs.field
418+
).eval()
406419

407420
def _as_vtk(self, coordinates=None, as_linear=True, include_ids=False):
408421
"""Convert DPF mesh to a PyVista unstructured grid."""
@@ -465,12 +478,12 @@ def grid(self):
465478
return self._full_grid
466479

467480
def plot(
468-
self,
469-
field_or_fields_container=None,
470-
shell_layers=None,
471-
deform_by=None,
472-
scale_factor=1.0,
473-
**kwargs
481+
self,
482+
field_or_fields_container=None,
483+
shell_layers=None,
484+
deform_by=None,
485+
scale_factor=1.0,
486+
**kwargs,
474487
):
475488
"""
476489
Plot the field or fields container on the mesh.
@@ -504,15 +517,24 @@ def plot(
504517
"""
505518
if field_or_fields_container is not None:
506519
pl = Plotter(self, **kwargs)
507-
return pl.plot_contour(field_or_fields_container, shell_layers,
508-
show_axes=kwargs.pop("show_axes", True),
509-
deform_by=deform_by,
510-
scale_factor=scale_factor, **kwargs)
520+
return pl.plot_contour(
521+
field_or_fields_container,
522+
shell_layers,
523+
show_axes=kwargs.pop("show_axes", True),
524+
deform_by=deform_by,
525+
scale_factor=scale_factor,
526+
**kwargs,
527+
)
511528

512529
# otherwise, simply plot the mesh
513530
pl = DpfPlotter(**kwargs)
514-
pl.add_mesh(self, deform_by=deform_by, scale_factor=scale_factor,
515-
show_axes=kwargs.pop("show_axes", True), **kwargs)
531+
pl.add_mesh(
532+
self,
533+
deform_by=deform_by,
534+
scale_factor=scale_factor,
535+
show_axes=kwargs.pop("show_axes", True),
536+
**kwargs,
537+
)
516538
return pl.show_figure(**kwargs)
517539

518540
def deep_copy(self, server=None):
@@ -595,12 +617,15 @@ def field_of_properties(self, property_name):
595617
else:
596618
field_out = self._api.meshed_region_get_property_field(self, property_name)
597619
if isinstance(field_out, int):
598-
res = property_field.PropertyField(server=self._server, property_field=field_out)
620+
res = property_field.PropertyField(
621+
server=self._server, property_field=field_out
622+
)
599623
return res
600624
else:
601625
if field_out.datatype == "int":
602-
return property_field.PropertyField(server=self._server,
603-
property_field=field_out)
626+
return property_field.PropertyField(
627+
server=self._server, property_field=field_out
628+
)
604629
else:
605630
# Not sure we go through here since the only datatype not int is coordinates,
606631
# which is already dealt with previously.

‎ansys/dpf/core/operators/averaging/elemental_difference.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""
22
elemental_difference
3-
--------------------
3+
====================
44
Autogenerated DPF operator classes.
55
"""
66
from warnings import warn

‎ansys/dpf/core/operators/averaging/elemental_difference_fc.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""
22
elemental_difference_fc
3-
-----------------------
3+
=======================
44
Autogenerated DPF operator classes.
55
"""
66
from warnings import warn

‎ansys/dpf/core/operators/averaging/elemental_fraction_fc.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""
22
elemental_fraction_fc
3-
---------------------
3+
=====================
44
Autogenerated DPF operator classes.
55
"""
66
from warnings import warn

‎ansys/dpf/core/operators/averaging/elemental_mean.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""
22
elemental_mean
3-
--------------
3+
==============
44
Autogenerated DPF operator classes.
55
"""
66
from warnings import warn

‎ansys/dpf/core/operators/averaging/elemental_mean_fc.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""
22
elemental_mean_fc
3-
-----------------
3+
=================
44
Autogenerated DPF operator classes.
55
"""
66
from warnings import warn

‎ansys/dpf/core/operators/averaging/elemental_nodal_to_nodal.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""
22
elemental_nodal_to_nodal
3-
------------------------
3+
========================
44
Autogenerated DPF operator classes.
55
"""
66
from warnings import warn

‎ansys/dpf/core/operators/averaging/elemental_nodal_to_nodal_elemental.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""
22
elemental_nodal_to_nodal_elemental
3-
----------------------------------
3+
==================================
44
Autogenerated DPF operator classes.
55
"""
66
from warnings import warn

‎ansys/dpf/core/operators/averaging/elemental_nodal_to_nodal_elemental_fc.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""
22
elemental_nodal_to_nodal_elemental_fc
3-
-------------------------------------
3+
=====================================
44
Autogenerated DPF operator classes.
55
"""
66
from warnings import warn

‎ansys/dpf/core/operators/averaging/elemental_nodal_to_nodal_fc.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""
22
elemental_nodal_to_nodal_fc
3-
---------------------------
3+
===========================
44
Autogenerated DPF operator classes.
55
"""
66
from warnings import warn

‎ansys/dpf/core/operators/averaging/elemental_to_elemental_nodal.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""
22
elemental_to_elemental_nodal
3-
----------------------------
3+
============================
44
Autogenerated DPF operator classes.
55
"""
66
from warnings import warn

‎ansys/dpf/core/operators/averaging/elemental_to_elemental_nodal_fc.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""
22
elemental_to_elemental_nodal_fc
3-
-------------------------------
3+
===============================
44
Autogenerated DPF operator classes.
55
"""
66
from warnings import warn

‎ansys/dpf/core/operators/averaging/elemental_to_nodal.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""
22
elemental_to_nodal
3-
------------------
3+
==================
44
Autogenerated DPF operator classes.
55
"""
66
from warnings import warn

‎ansys/dpf/core/operators/averaging/elemental_to_nodal_fc.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""
22
elemental_to_nodal_fc
3-
---------------------
3+
=====================
44
Autogenerated DPF operator classes.
55
"""
66
from warnings import warn

‎ansys/dpf/core/operators/averaging/extend_to_mid_nodes.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""
22
extend_to_mid_nodes
3-
-------------------
3+
===================
44
Autogenerated DPF operator classes.
55
"""
66
from warnings import warn

‎ansys/dpf/core/operators/averaging/extend_to_mid_nodes_fc.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""
22
extend_to_mid_nodes_fc
3-
----------------------
3+
======================
44
Autogenerated DPF operator classes.
55
"""
66
from warnings import warn

‎ansys/dpf/core/operators/averaging/gauss_to_node_fc.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""
22
gauss_to_node_fc
3-
----------------
3+
================
44
Autogenerated DPF operator classes.
55
"""
66
from warnings import warn

‎ansys/dpf/core/operators/averaging/nodal_difference.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""
22
nodal_difference
3-
----------------
3+
================
44
Autogenerated DPF operator classes.
55
"""
66
from warnings import warn

‎ansys/dpf/core/operators/averaging/nodal_difference_fc.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""
22
nodal_difference_fc
3-
-------------------
3+
===================
44
Autogenerated DPF operator classes.
55
"""
66
from warnings import warn

‎ansys/dpf/core/operators/averaging/nodal_fraction_fc.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""
22
nodal_fraction_fc
3-
-----------------
3+
=================
44
Autogenerated DPF operator classes.
55
"""
66
from warnings import warn

‎ansys/dpf/core/operators/averaging/nodal_to_elemental.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""
22
nodal_to_elemental
3-
------------------
3+
==================
44
Autogenerated DPF operator classes.
55
"""
66
from warnings import warn

‎ansys/dpf/core/operators/averaging/nodal_to_elemental_fc.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""
22
nodal_to_elemental_fc
3-
---------------------
3+
=====================
44
Autogenerated DPF operator classes.
55
"""
66
from warnings import warn

0 commit comments

Comments
 (0)