Skip to content

Commit a79f2f0

Browse files
authored
Merge branch 'master' into dependabot/pip/requirements/sphinx-8.1.3
2 parents 5c8a090 + e4f47bf commit a79f2f0

File tree

11 files changed

+205
-18
lines changed

11 files changed

+205
-18
lines changed

doc/source/_static/dpf_operators.html

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

requirements/requirements_docs.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ ansys-sphinx-theme[autoapi]==1.3.1
22
enum-tools[sphinx]==0.12.0
33
graphviz==0.20.1
44
imageio==2.36.0
5-
imageio-ffmpeg==0.5.1
5+
imageio-ffmpeg==0.6.0
66
nbsphinx==0.9.6
7-
pypandoc==1.14
7+
pypandoc==1.15
88
pytest-sphinx==0.6.3
99
pyvista==0.44.2
1010
sphinx==8.1.3
1111
sphinx-copybutton==0.5.2
12-
sphinx-gallery==0.18.0
12+
sphinx-gallery==0.19.0
1313
sphinx-notfound-page==1.1.0
1414
sphinx-reredirects==0.1.3
1515
sphinx_design==0.6.1
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
importlib-metadata==8.5.0
2-
numpy==2.2.1
2+
numpy==2.2.3
33
packaging==24.2
4-
psutil==6.1.1
4+
psutil==7.0.0
55
tqdm==4.67.1

requirements/requirements_test.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ansys-platform-instancemanagement==1.1.2
22
coverage==7.6.11
33
imageio==2.36.0
4-
imageio-ffmpeg==0.5.1
4+
imageio-ffmpeg==0.6.0
55
pytest==8.3.4
66
pytest-cov==6.0.0
77
pytest-order==1.3.0

src/ansys/dpf/core/available_result.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ class Homogeneity(Enum):
102102
mass_flow_rate = 122
103103
specific_energy = 123
104104
specific_entropy = 124
105+
force_density = 125
106+
magnetic_potential = 126
105107

106108

107109
class AvailableResult:

src/ansys/dpf/core/operators/result/cyclic_equivalent_mass.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212

1313

1414
class cyclic_equivalent_mass(Operator):
15-
"""Read equivalent mass from an rst file and expand it with cyclic
16-
symmetry.
15+
"""This operator is deprecated: use the operator equivalent_mass with the
16+
read_cyclic pin instead. Read equivalent mass from an rst file and
17+
expand it with cyclic symmetry.
1718
1819
Parameters
1920
----------
@@ -172,8 +173,9 @@ def __init__(
172173

173174
@staticmethod
174175
def _spec():
175-
description = """Read equivalent mass from an rst file and expand it with cyclic
176-
symmetry."""
176+
description = """This operator is deprecated: use the operator equivalent_mass with the
177+
read_cyclic pin instead. Read equivalent mass from an rst
178+
file and expand it with cyclic symmetry."""
177179
spec = Specification(
178180
description=description,
179181
map_input_pin_spec={

src/ansys/dpf/core/operators/result/equivalent_mass.py

Lines changed: 189 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,25 @@ class equivalent_mass(Operator):
5757
all_dofs : bool, optional
5858
Default is false.
5959
mesh : MeshedRegion or MeshesContainer, optional
60-
Prevents from reading the mesh in the result
61-
files
60+
Mesh. if cylic expansion is to be done, mesh
61+
of the base sector
62+
read_cyclic : int, optional
63+
If 0 cyclic symmetry is ignored, if 1 cyclic
64+
sector is read, if 2 cyclic expansion
65+
is done, if 3 cyclic expansion is
66+
done and stages are merged (default
67+
is 1)
68+
expanded_meshed_region : MeshedRegion or MeshesContainer, optional
69+
Mesh expanded, use if cyclic expansion is to
70+
be done.
71+
sectors_to_expand : Scoping or ScopingsContainer, optional
72+
Sectors to expand (start at 0), for
73+
multistage: use scopings container
74+
with 'stage' label, use if cyclic
75+
expansion is to be done.
76+
phi : float, optional
77+
Angle phi in degrees (default value 0.0), use
78+
if cyclic expansion is to be done.
6279
6380
Returns
6481
-------
@@ -86,6 +103,14 @@ class equivalent_mass(Operator):
86103
>>> op.inputs.all_dofs.connect(my_all_dofs)
87104
>>> my_mesh = dpf.MeshedRegion()
88105
>>> op.inputs.mesh.connect(my_mesh)
106+
>>> my_read_cyclic = int()
107+
>>> op.inputs.read_cyclic.connect(my_read_cyclic)
108+
>>> my_expanded_meshed_region = dpf.MeshedRegion()
109+
>>> op.inputs.expanded_meshed_region.connect(my_expanded_meshed_region)
110+
>>> my_sectors_to_expand = dpf.Scoping()
111+
>>> op.inputs.sectors_to_expand.connect(my_sectors_to_expand)
112+
>>> my_phi = float()
113+
>>> op.inputs.phi.connect(my_phi)
89114
90115
>>> # Instantiate operator and connect inputs in one line
91116
>>> op = dpf.operators.result.equivalent_mass(
@@ -96,6 +121,10 @@ class equivalent_mass(Operator):
96121
... data_sources=my_data_sources,
97122
... all_dofs=my_all_dofs,
98123
... mesh=my_mesh,
124+
... read_cyclic=my_read_cyclic,
125+
... expanded_meshed_region=my_expanded_meshed_region,
126+
... sectors_to_expand=my_sectors_to_expand,
127+
... phi=my_phi,
99128
... )
100129
101130
>>> # Get output data
@@ -111,6 +140,10 @@ def __init__(
111140
data_sources=None,
112141
all_dofs=None,
113142
mesh=None,
143+
read_cyclic=None,
144+
expanded_meshed_region=None,
145+
sectors_to_expand=None,
146+
phi=None,
114147
config=None,
115148
server=None,
116149
):
@@ -131,6 +164,14 @@ def __init__(
131164
self.inputs.all_dofs.connect(all_dofs)
132165
if mesh is not None:
133166
self.inputs.mesh.connect(mesh)
167+
if read_cyclic is not None:
168+
self.inputs.read_cyclic.connect(read_cyclic)
169+
if expanded_meshed_region is not None:
170+
self.inputs.expanded_meshed_region.connect(expanded_meshed_region)
171+
if sectors_to_expand is not None:
172+
self.inputs.sectors_to_expand.connect(sectors_to_expand)
173+
if phi is not None:
174+
self.inputs.phi.connect(phi)
134175

135176
@staticmethod
136177
def _spec():
@@ -213,8 +254,41 @@ def _spec():
213254
name="mesh",
214255
type_names=["abstract_meshed_region", "meshes_container"],
215256
optional=True,
216-
document="""Prevents from reading the mesh in the result
217-
files""",
257+
document="""Mesh. if cylic expansion is to be done, mesh
258+
of the base sector""",
259+
),
260+
14: PinSpecification(
261+
name="read_cyclic",
262+
type_names=["enum dataProcessing::ECyclicReading", "int32"],
263+
optional=True,
264+
document="""If 0 cyclic symmetry is ignored, if 1 cyclic
265+
sector is read, if 2 cyclic expansion
266+
is done, if 3 cyclic expansion is
267+
done and stages are merged (default
268+
is 1)""",
269+
),
270+
15: PinSpecification(
271+
name="expanded_meshed_region",
272+
type_names=["abstract_meshed_region", "meshes_container"],
273+
optional=True,
274+
document="""Mesh expanded, use if cyclic expansion is to
275+
be done.""",
276+
),
277+
18: PinSpecification(
278+
name="sectors_to_expand",
279+
type_names=["vector<int32>", "scoping", "scopings_container"],
280+
optional=True,
281+
document="""Sectors to expand (start at 0), for
282+
multistage: use scopings container
283+
with 'stage' label, use if cyclic
284+
expansion is to be done.""",
285+
),
286+
19: PinSpecification(
287+
name="phi",
288+
type_names=["double"],
289+
optional=True,
290+
document="""Angle phi in degrees (default value 0.0), use
291+
if cyclic expansion is to be done.""",
218292
),
219293
},
220294
map_output_pin_spec={
@@ -287,6 +361,14 @@ class InputsEquivalentMass(_Inputs):
287361
>>> op.inputs.all_dofs.connect(my_all_dofs)
288362
>>> my_mesh = dpf.MeshedRegion()
289363
>>> op.inputs.mesh.connect(my_mesh)
364+
>>> my_read_cyclic = int()
365+
>>> op.inputs.read_cyclic.connect(my_read_cyclic)
366+
>>> my_expanded_meshed_region = dpf.MeshedRegion()
367+
>>> op.inputs.expanded_meshed_region.connect(my_expanded_meshed_region)
368+
>>> my_sectors_to_expand = dpf.Scoping()
369+
>>> op.inputs.sectors_to_expand.connect(my_sectors_to_expand)
370+
>>> my_phi = float()
371+
>>> op.inputs.phi.connect(my_phi)
290372
"""
291373

292374
def __init__(self, op: Operator):
@@ -305,6 +387,18 @@ def __init__(self, op: Operator):
305387
self._inputs.append(self._all_dofs)
306388
self._mesh = Input(equivalent_mass._spec().input_pin(7), 7, op, -1)
307389
self._inputs.append(self._mesh)
390+
self._read_cyclic = Input(equivalent_mass._spec().input_pin(14), 14, op, -1)
391+
self._inputs.append(self._read_cyclic)
392+
self._expanded_meshed_region = Input(
393+
equivalent_mass._spec().input_pin(15), 15, op, -1
394+
)
395+
self._inputs.append(self._expanded_meshed_region)
396+
self._sectors_to_expand = Input(
397+
equivalent_mass._spec().input_pin(18), 18, op, -1
398+
)
399+
self._inputs.append(self._sectors_to_expand)
400+
self._phi = Input(equivalent_mass._spec().input_pin(19), 19, op, -1)
401+
self._inputs.append(self._phi)
308402

309403
@property
310404
def time_scoping(self):
@@ -457,8 +551,8 @@ def all_dofs(self):
457551
def mesh(self):
458552
"""Allows to connect mesh input to the operator.
459553
460-
Prevents from reading the mesh in the result
461-
files
554+
Mesh. if cylic expansion is to be done, mesh
555+
of the base sector
462556
463557
Parameters
464558
----------
@@ -474,6 +568,95 @@ def mesh(self):
474568
"""
475569
return self._mesh
476570

571+
@property
572+
def read_cyclic(self):
573+
"""Allows to connect read_cyclic input to the operator.
574+
575+
If 0 cyclic symmetry is ignored, if 1 cyclic
576+
sector is read, if 2 cyclic expansion
577+
is done, if 3 cyclic expansion is
578+
done and stages are merged (default
579+
is 1)
580+
581+
Parameters
582+
----------
583+
my_read_cyclic : int
584+
585+
Examples
586+
--------
587+
>>> from ansys.dpf import core as dpf
588+
>>> op = dpf.operators.result.equivalent_mass()
589+
>>> op.inputs.read_cyclic.connect(my_read_cyclic)
590+
>>> # or
591+
>>> op.inputs.read_cyclic(my_read_cyclic)
592+
"""
593+
return self._read_cyclic
594+
595+
@property
596+
def expanded_meshed_region(self):
597+
"""Allows to connect expanded_meshed_region input to the operator.
598+
599+
Mesh expanded, use if cyclic expansion is to
600+
be done.
601+
602+
Parameters
603+
----------
604+
my_expanded_meshed_region : MeshedRegion or MeshesContainer
605+
606+
Examples
607+
--------
608+
>>> from ansys.dpf import core as dpf
609+
>>> op = dpf.operators.result.equivalent_mass()
610+
>>> op.inputs.expanded_meshed_region.connect(my_expanded_meshed_region)
611+
>>> # or
612+
>>> op.inputs.expanded_meshed_region(my_expanded_meshed_region)
613+
"""
614+
return self._expanded_meshed_region
615+
616+
@property
617+
def sectors_to_expand(self):
618+
"""Allows to connect sectors_to_expand input to the operator.
619+
620+
Sectors to expand (start at 0), for
621+
multistage: use scopings container
622+
with 'stage' label, use if cyclic
623+
expansion is to be done.
624+
625+
Parameters
626+
----------
627+
my_sectors_to_expand : Scoping or ScopingsContainer
628+
629+
Examples
630+
--------
631+
>>> from ansys.dpf import core as dpf
632+
>>> op = dpf.operators.result.equivalent_mass()
633+
>>> op.inputs.sectors_to_expand.connect(my_sectors_to_expand)
634+
>>> # or
635+
>>> op.inputs.sectors_to_expand(my_sectors_to_expand)
636+
"""
637+
return self._sectors_to_expand
638+
639+
@property
640+
def phi(self):
641+
"""Allows to connect phi input to the operator.
642+
643+
Angle phi in degrees (default value 0.0), use
644+
if cyclic expansion is to be done.
645+
646+
Parameters
647+
----------
648+
my_phi : float
649+
650+
Examples
651+
--------
652+
>>> from ansys.dpf import core as dpf
653+
>>> op = dpf.operators.result.equivalent_mass()
654+
>>> op.inputs.phi.connect(my_phi)
655+
>>> # or
656+
>>> op.inputs.phi(my_phi)
657+
"""
658+
return self._phi
659+
477660

478661
class OutputsEquivalentMass(_Outputs):
479662
"""Intermediate class used to get outputs from
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
-4 KB
Binary file not shown.

0 commit comments

Comments
 (0)