Skip to content

Commit 6880f3b

Browse files
update generated code (#1498)
1 parent 40cc530 commit 6880f3b

18 files changed

+471
-49
lines changed

doc/source/_static/dpf_operators.html

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

src/ansys/dpf/core/operators/mapping/fft.py

Lines changed: 59 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,22 @@ class fft(Operator):
2727
field : Field or FieldsContainer
2828
Field or fields container.
2929
scale_forward_transform : float, optional
30-
Scale for forward transform, default is 1.0.
30+
Scale for forward transform, default is
31+
2/field_num_elementary_data.
3132
inplace : bool, optional
3233
True if inplace, default is false.
3334
force_fft_points : int, optional
3435
Explicitely define number of fft points to
3536
either rescope or perform zero
3637
padding.
3738
cutoff_frequency : float, optional
38-
Restrict output frequency output up to this
39-
cutoff frequency
39+
Restrict output frequency up to this cutoff
40+
frequency
41+
scale_right_amplitude : bool, optional
42+
If set to true (default is false),
43+
2/field_num_entities scaling will be
44+
applied, to have right amplitude
45+
values.
4046
4147
4248
Examples
@@ -57,6 +63,8 @@ class fft(Operator):
5763
>>> op.inputs.force_fft_points.connect(my_force_fft_points)
5864
>>> my_cutoff_frequency = float()
5965
>>> op.inputs.cutoff_frequency.connect(my_cutoff_frequency)
66+
>>> my_scale_right_amplitude = bool()
67+
>>> op.inputs.scale_right_amplitude.connect(my_scale_right_amplitude)
6068
6169
>>> # Instantiate operator and connect inputs in one line
6270
>>> op = dpf.operators.mapping.fft(
@@ -65,6 +73,7 @@ class fft(Operator):
6573
... inplace=my_inplace,
6674
... force_fft_points=my_force_fft_points,
6775
... cutoff_frequency=my_cutoff_frequency,
76+
... scale_right_amplitude=my_scale_right_amplitude,
6877
... )
6978
7079
>>> # Get output data
@@ -78,6 +87,7 @@ def __init__(
7887
inplace=None,
7988
force_fft_points=None,
8089
cutoff_frequency=None,
90+
scale_right_amplitude=None,
8191
config=None,
8292
server=None,
8393
):
@@ -94,6 +104,8 @@ def __init__(
94104
self.inputs.force_fft_points.connect(force_fft_points)
95105
if cutoff_frequency is not None:
96106
self.inputs.cutoff_frequency.connect(cutoff_frequency)
107+
if scale_right_amplitude is not None:
108+
self.inputs.scale_right_amplitude.connect(scale_right_amplitude)
97109

98110
@staticmethod
99111
def _spec():
@@ -120,7 +132,8 @@ def _spec():
120132
name="scale_forward_transform",
121133
type_names=["double"],
122134
optional=True,
123-
document="""Scale for forward transform, default is 1.0.""",
135+
document="""Scale for forward transform, default is
136+
2/field_num_elementary_data.""",
124137
),
125138
4: PinSpecification(
126139
name="inplace",
@@ -140,8 +153,17 @@ def _spec():
140153
name="cutoff_frequency",
141154
type_names=["double"],
142155
optional=True,
143-
document="""Restrict output frequency output up to this
144-
cutoff frequency""",
156+
document="""Restrict output frequency up to this cutoff
157+
frequency""",
158+
),
159+
7: PinSpecification(
160+
name="scale_right_amplitude",
161+
type_names=["bool"],
162+
optional=True,
163+
document="""If set to true (default is false),
164+
2/field_num_entities scaling will be
165+
applied, to have right amplitude
166+
values.""",
145167
),
146168
},
147169
map_output_pin_spec={
@@ -213,6 +235,8 @@ class InputsFft(_Inputs):
213235
>>> op.inputs.force_fft_points.connect(my_force_fft_points)
214236
>>> my_cutoff_frequency = float()
215237
>>> op.inputs.cutoff_frequency.connect(my_cutoff_frequency)
238+
>>> my_scale_right_amplitude = bool()
239+
>>> op.inputs.scale_right_amplitude.connect(my_scale_right_amplitude)
216240
"""
217241

218242
def __init__(self, op: Operator):
@@ -227,6 +251,8 @@ def __init__(self, op: Operator):
227251
self._inputs.append(self._force_fft_points)
228252
self._cutoff_frequency = Input(fft._spec().input_pin(6), 6, op, -1)
229253
self._inputs.append(self._cutoff_frequency)
254+
self._scale_right_amplitude = Input(fft._spec().input_pin(7), 7, op, -1)
255+
self._inputs.append(self._scale_right_amplitude)
230256

231257
@property
232258
def field(self):
@@ -252,7 +278,8 @@ def field(self):
252278
def scale_forward_transform(self):
253279
"""Allows to connect scale_forward_transform input to the operator.
254280
255-
Scale for forward transform, default is 1.0.
281+
Scale for forward transform, default is
282+
2/field_num_elementary_data.
256283
257284
Parameters
258285
----------
@@ -314,8 +341,8 @@ def force_fft_points(self):
314341
def cutoff_frequency(self):
315342
"""Allows to connect cutoff_frequency input to the operator.
316343
317-
Restrict output frequency output up to this
318-
cutoff frequency
344+
Restrict output frequency up to this cutoff
345+
frequency
319346
320347
Parameters
321348
----------
@@ -331,6 +358,29 @@ def cutoff_frequency(self):
331358
"""
332359
return self._cutoff_frequency
333360

361+
@property
362+
def scale_right_amplitude(self):
363+
"""Allows to connect scale_right_amplitude input to the operator.
364+
365+
If set to true (default is false),
366+
2/field_num_entities scaling will be
367+
applied, to have right amplitude
368+
values.
369+
370+
Parameters
371+
----------
372+
my_scale_right_amplitude : bool
373+
374+
Examples
375+
--------
376+
>>> from ansys.dpf import core as dpf
377+
>>> op = dpf.operators.mapping.fft()
378+
>>> op.inputs.scale_right_amplitude.connect(my_scale_right_amplitude)
379+
>>> # or
380+
>>> op.inputs.scale_right_amplitude(my_scale_right_amplitude)
381+
"""
382+
return self._scale_right_amplitude
383+
334384

335385
class OutputsFft(_Outputs):
336386
"""Intermediate class used to get outputs from

src/ansys/dpf/core/operators/math/compute_residual_and_error.py

Lines changed: 95 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ class compute_residual_and_error(Operator):
4646
pin2 selection
4747
1 for l1, ie sum(abs(xi)),
4848
2 for l2, ie sqrt(sum((xi^2))
49+
field_reference : int, optional
50+
Field reference for the normalization step,
51+
default: 0 for entry 1, 1 for
52+
residuals - optional
4953
field_or_fields_container2 : Field or FieldsContainer, optional
5054
Field or fields container of same
5155
dimensionality as entry 1 - optional
@@ -65,6 +69,8 @@ class compute_residual_and_error(Operator):
6569
>>> op.inputs.normalization_type.connect(my_normalization_type)
6670
>>> my_norm_calculation_type = int()
6771
>>> op.inputs.norm_calculation_type.connect(my_norm_calculation_type)
72+
>>> my_field_reference = int()
73+
>>> op.inputs.field_reference.connect(my_field_reference)
6874
>>> my_field_or_fields_container2 = dpf.Field()
6975
>>> op.inputs.field_or_fields_container2.connect(my_field_or_fields_container2)
7076
@@ -73,19 +79,23 @@ class compute_residual_and_error(Operator):
7379
... field_or_fields_container1=my_field_or_fields_container1,
7480
... normalization_type=my_normalization_type,
7581
... norm_calculation_type=my_norm_calculation_type,
82+
... field_reference=my_field_reference,
7683
... field_or_fields_container2=my_field_or_fields_container2,
7784
... )
7885
7986
>>> # Get output data
8087
>>> result_residuals = op.outputs.residuals()
8188
>>> result_error = op.outputs.error()
89+
>>> result_residuals_normalization_factor = op.outputs.residuals_normalization_factor()
90+
>>> result_error_normalization_factor = op.outputs.error_normalization_factor()
8291
"""
8392

8493
def __init__(
8594
self,
8695
field_or_fields_container1=None,
8796
normalization_type=None,
8897
norm_calculation_type=None,
98+
field_reference=None,
8999
field_or_fields_container2=None,
90100
config=None,
91101
server=None,
@@ -99,6 +109,8 @@ def __init__(
99109
self.inputs.normalization_type.connect(normalization_type)
100110
if norm_calculation_type is not None:
101111
self.inputs.norm_calculation_type.connect(norm_calculation_type)
112+
if field_reference is not None:
113+
self.inputs.field_reference.connect(field_reference)
102114
if field_or_fields_container2 is not None:
103115
self.inputs.field_or_fields_container2.connect(field_or_fields_container2)
104116

@@ -151,6 +163,14 @@ def _spec():
151163
2 for l2, ie sqrt(sum((xi^2))""",
152164
),
153165
3: PinSpecification(
166+
name="field_reference",
167+
type_names=["int32"],
168+
optional=True,
169+
document="""Field reference for the normalization step,
170+
default: 0 for entry 1, 1 for
171+
residuals - optional""",
172+
),
173+
4: PinSpecification(
154174
name="field_or_fields_container2",
155175
type_names=["field", "fields_container"],
156176
optional=True,
@@ -175,6 +195,18 @@ def _spec():
175195
document="""1: error as a field or a field container
176196
depending on the entry's type.""",
177197
),
198+
2: PinSpecification(
199+
name="residuals_normalization_factor",
200+
type_names=["field", "fields_container"],
201+
optional=False,
202+
document="""2: factor used for residual normalization""",
203+
),
204+
3: PinSpecification(
205+
name="error_normalization_factor",
206+
type_names=["field", "fields_container"],
207+
optional=False,
208+
document="""3: factor used for error norm normalization""",
209+
),
178210
},
179211
)
180212
return spec
@@ -230,6 +262,8 @@ class InputsComputeResidualAndError(_Inputs):
230262
>>> op.inputs.normalization_type.connect(my_normalization_type)
231263
>>> my_norm_calculation_type = int()
232264
>>> op.inputs.norm_calculation_type.connect(my_norm_calculation_type)
265+
>>> my_field_reference = int()
266+
>>> op.inputs.field_reference.connect(my_field_reference)
233267
>>> my_field_or_fields_container2 = dpf.Field()
234268
>>> op.inputs.field_or_fields_container2.connect(my_field_or_fields_container2)
235269
"""
@@ -248,9 +282,13 @@ def __init__(self, op: Operator):
248282
compute_residual_and_error._spec().input_pin(2), 2, op, -1
249283
)
250284
self._inputs.append(self._norm_calculation_type)
251-
self._field_or_fields_container2 = Input(
285+
self._field_reference = Input(
252286
compute_residual_and_error._spec().input_pin(3), 3, op, -1
253287
)
288+
self._inputs.append(self._field_reference)
289+
self._field_or_fields_container2 = Input(
290+
compute_residual_and_error._spec().input_pin(4), 4, op, -1
291+
)
254292
self._inputs.append(self._field_or_fields_container2)
255293

256294
@property
@@ -326,6 +364,28 @@ def norm_calculation_type(self):
326364
"""
327365
return self._norm_calculation_type
328366

367+
@property
368+
def field_reference(self):
369+
"""Allows to connect field_reference input to the operator.
370+
371+
Field reference for the normalization step,
372+
default: 0 for entry 1, 1 for
373+
residuals - optional
374+
375+
Parameters
376+
----------
377+
my_field_reference : int
378+
379+
Examples
380+
--------
381+
>>> from ansys.dpf import core as dpf
382+
>>> op = dpf.operators.math.compute_residual_and_error()
383+
>>> op.inputs.field_reference.connect(my_field_reference)
384+
>>> # or
385+
>>> op.inputs.field_reference(my_field_reference)
386+
"""
387+
return self._field_reference
388+
329389
@property
330390
def field_or_fields_container2(self):
331391
"""Allows to connect field_or_fields_container2 input to the operator.
@@ -359,6 +419,8 @@ class OutputsComputeResidualAndError(_Outputs):
359419
>>> # Connect inputs : op.inputs. ...
360420
>>> result_residuals = op.outputs.residuals()
361421
>>> result_error = op.outputs.error()
422+
>>> result_residuals_normalization_factor = op.outputs.residuals_normalization_factor()
423+
>>> result_error_normalization_factor = op.outputs.error_normalization_factor()
362424
"""
363425

364426
def __init__(self, op: Operator):
@@ -395,3 +457,35 @@ def __init__(self, op: Operator):
395457
op,
396458
)
397459
self._outputs.append(self.error_as_fields_container)
460+
self.residuals_normalization_factor_as_field = Output(
461+
_modify_output_spec_with_one_type(
462+
compute_residual_and_error._spec().output_pin(2), "field"
463+
),
464+
2,
465+
op,
466+
)
467+
self._outputs.append(self.residuals_normalization_factor_as_field)
468+
self.residuals_normalization_factor_as_fields_container = Output(
469+
_modify_output_spec_with_one_type(
470+
compute_residual_and_error._spec().output_pin(2), "fields_container"
471+
),
472+
2,
473+
op,
474+
)
475+
self._outputs.append(self.residuals_normalization_factor_as_fields_container)
476+
self.error_normalization_factor_as_field = Output(
477+
_modify_output_spec_with_one_type(
478+
compute_residual_and_error._spec().output_pin(3), "field"
479+
),
480+
3,
481+
op,
482+
)
483+
self._outputs.append(self.error_normalization_factor_as_field)
484+
self.error_normalization_factor_as_fields_container = Output(
485+
_modify_output_spec_with_one_type(
486+
compute_residual_and_error._spec().output_pin(3), "fields_container"
487+
),
488+
3,
489+
op,
490+
)
491+
self._outputs.append(self.error_normalization_factor_as_fields_container)

src/ansys/dpf/core/operators/utility/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
from .merge_weighted_fields import merge_weighted_fields
5656
from .merge_weighted_fields_containers import merge_weighted_fields_containers
5757
from .mesh import mesh
58+
from .mesh_to_mc import mesh_to_mc
5859
from .overlap_fields import overlap_fields
5960
from .producer_consumer_for_each import producer_consumer_for_each
6061
from .property_field import property_field

src/ansys/dpf/core/operators/utility/field_to_fc.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313

1414
class field_to_fc(Operator):
15-
"""Creates a field container containing the field provided on pin 0.
15+
"""Creates a fields container containing the field provided on pin 0.
1616
1717
Parameters
1818
----------
@@ -59,7 +59,7 @@ def __init__(self, field=None, label=None, config=None, server=None):
5959
@staticmethod
6060
def _spec():
6161
description = (
62-
"""Creates a field container containing the field provided on pin 0."""
62+
"""Creates a fields container containing the field provided on pin 0."""
6363
)
6464
spec = Specification(
6565
description=description,

0 commit comments

Comments
 (0)