Skip to content

Commit 330b496

Browse files
cbellot000PProfizi
andauthored
Merge/doc 0.5.dev2 fix and improve doc (#319)
* Update wheels of gate, grpc, # Conflicts: # .github/workflows/ansys_dpf_gate-0.1.dev1-py3-none-any.whl # .github/workflows/ansys_grpc_dpf-0.5.dev1-py3-none-any.whl * not zipping doc and print output # Conflicts: # .github/workflows/ci.yml * improve doc * custom css * fix doc * floake8 * flake8 # Conflicts: # tests/conftest.py * update dependencies doc * fix * fix merge * flake8 * Remove report * rename * dummy change * fix requirements Co-authored-by: paul.profizi <[email protected]>
1 parent 3f866d9 commit 330b496

File tree

524 files changed

+1646
-872
lines changed

Some content is hidden

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

524 files changed

+1646
-872
lines changed
Binary file not shown.
Binary file not shown.

.github/workflows/ci.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
ECHO %WHEELPATH%
106106
cd tests
107107
pip install %WHEELPATH%
108-
python -c "from ansys.dpf import core; print(core.Report(gpu=False))"
108+
python -c "from ansys.dpf import core"
109109
110110
- name: Install OpenGL
111111
run: |
@@ -129,14 +129,9 @@ jobs:
129129
shell: cmd
130130
run: |
131131
cd .ci
132-
build_doc.bat > ..\docs\log.txt 2>&1
132+
build_doc.bat > ..\docs\log.txt && type ..\docs\log.txt 2>&1
133133
timeout-minutes: 20
134134

135-
- name: DOCUMENTATION zip artifacts
136-
run: |
137-
7z a -tzip ./docs/archive/doc-ansys-dpf-core.zip ./docs/build
138-
if: always()
139-
140135
- name: Kill all servers
141136
shell: cmd
142137
run: |
@@ -150,7 +145,7 @@ jobs:
150145
uses: actions/upload-artifact@v3
151146
with:
152147
name: doc-ansys-dpf-core
153-
path: ./docs/archive/doc-ansys-dpf-core.zip
148+
path: ./docs/build/*
154149
if: always()
155150

156151
- name: Publish Documentation log

.github/workflows/retro.yml

Lines changed: 1 addition & 1 deletion
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

Lines changed: 0 additions & 13 deletions
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

Lines changed: 1 addition & 2 deletions
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

Lines changed: 54 additions & 76 deletions
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):
@@ -268,53 +275,6 @@ def set_coordinates_field(self, coordinates_field):
268275
"""
269276
self._api.meshed_region_set_coordinates_field(self, coordinates_field)
270277

271-
@property
272-
def available_property_fields(self):
273-
"""
274-
Returns a list of available property fields
275-
276-
Returns
277-
-------
278-
available_property_fields : list str
279-
"""
280-
return sorted(self._stub.List(self._message).available_prop)
281-
282-
def property_field(self, property_name):
283-
"""
284-
Property field getter. It can be coordinates (field),
285-
element types (property field)...
286-
287-
Returns
288-
-------
289-
field_or_property_field : core.Field or core.PropertyField
290-
"""
291-
request = meshed_region_pb2.ListPropertyRequest()
292-
request.mesh.CopyFrom(self._message)
293-
request.property_type.property_name.property_name = property_name
294-
fieldOut = self._stub.ListProperty(request)
295-
if fieldOut.datatype == u"int":
296-
return property_field.PropertyField(server=self._server, property_field=fieldOut)
297-
else:
298-
return field.Field(server=self._server, field=fieldOut)
299-
300-
@version_requires("3.0")
301-
def set_property_field(self, property_name, value):
302-
"""
303-
Property field setter. It can be coordinates (field),
304-
element types (property field)...
305-
306-
Parameters
307-
----------
308-
property_name : str
309-
property name of the field to set
310-
value : PropertyField or Field
311-
"""
312-
request = meshed_region_pb2.SetFieldRequest()
313-
request.mesh.CopyFrom(self._message)
314-
request.property_type.property_name.property_name = property_name
315-
request.field.CopyFrom(value._message)
316-
self._stub.SetField(request)
317-
318278
@property
319279
def available_named_selections(self):
320280
"""
@@ -337,7 +297,9 @@ def _get_available_named_selections(self):
337297
named_selections = []
338298
n_selections = self._api.meshed_region_get_num_available_named_selection(self)
339299
for index in range(n_selections):
340-
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+
)
341303
return named_selections
342304

343305
def named_selection(self, named_selection):
@@ -354,7 +316,9 @@ def named_selection(self, named_selection):
354316
named_selection : Scoping
355317
"""
356318
if server_meet_version("2.1", self._server):
357-
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+
)
358322
return scoping.Scoping(scoping=out, server=self._server)
359323
else:
360324
if hasattr(self, "_stream_provider"):
@@ -382,8 +346,9 @@ def set_named_selection_scoping(self, named_selection_name, scoping):
382346
named selection name
383347
scoping : Scoping
384348
"""
385-
return self._api.meshed_region_set_named_selection_scoping(self,
386-
named_selection_name, scoping)
349+
return self._api.meshed_region_set_named_selection_scoping(
350+
self, named_selection_name, scoping
351+
)
387352

388353
def _set_stream_provider(self, stream_provider):
389354
self._stream_provider = stream_provider
@@ -429,7 +394,7 @@ def _set_stream_provider(self, stream_provider):
429394
# self._internal_obj = skin.get_output(0, types.meshed_region)
430395
# return MeshedRegion(self._server.channel, skin, self._model, name)
431396

432-
def deform_by(self, deform_by, scale_factor=1.):
397+
def deform_by(self, deform_by, scale_factor=1.0):
433398
"""
434399
Deforms the mesh according to a 3D vector field and an additional scale factor.
435400
@@ -446,10 +411,11 @@ def deform_by(self, deform_by, scale_factor=1.):
446411
447412
"""
448413
from ansys.dpf.core.operators.math import add, scale
414+
449415
scale_op = scale(field=deform_by, ponderation=scale_factor)
450-
return add(fieldA=self.nodes.coordinates_field,
451-
fieldB=scale_op.outputs.field
452-
).eval()
416+
return add(
417+
fieldA=self.nodes.coordinates_field, fieldB=scale_op.outputs.field
418+
).eval()
453419

454420
def _as_vtk(self, coordinates=None, as_linear=True, include_ids=False):
455421
"""Convert DPF mesh to a PyVista unstructured grid."""
@@ -512,12 +478,12 @@ def grid(self):
512478
return self._full_grid
513479

514480
def plot(
515-
self,
516-
field_or_fields_container=None,
517-
shell_layers=None,
518-
deform_by=None,
519-
scale_factor=1.0,
520-
**kwargs
481+
self,
482+
field_or_fields_container=None,
483+
shell_layers=None,
484+
deform_by=None,
485+
scale_factor=1.0,
486+
**kwargs,
521487
):
522488
"""
523489
Plot the field or fields container on the mesh.
@@ -551,15 +517,24 @@ def plot(
551517
"""
552518
if field_or_fields_container is not None:
553519
pl = Plotter(self, **kwargs)
554-
return pl.plot_contour(field_or_fields_container, shell_layers,
555-
show_axes=kwargs.pop("show_axes", True),
556-
deform_by=deform_by,
557-
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+
)
558528

559529
# otherwise, simply plot the mesh
560530
pl = DpfPlotter(**kwargs)
561-
pl.add_mesh(self, deform_by=deform_by, scale_factor=scale_factor,
562-
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+
)
563538
return pl.show_figure(**kwargs)
564539

565540
def deep_copy(self, server=None):
@@ -642,12 +617,15 @@ def field_of_properties(self, property_name):
642617
else:
643618
field_out = self._api.meshed_region_get_property_field(self, property_name)
644619
if isinstance(field_out, int):
645-
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+
)
646623
return res
647624
else:
648625
if field_out.datatype == "int":
649-
return property_field.PropertyField(server=self._server,
650-
property_field=field_out)
626+
return property_field.PropertyField(
627+
server=self._server, property_field=field_out
628+
)
651629
else:
652630
# Not sure we go through here since the only datatype not int is coordinates,
653631
# which is already dealt with previously.

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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

0 commit comments

Comments
 (0)