Skip to content

Commit 73cca0e

Browse files
committed
Merge branch 'master' of https://github.com/pyansys/DPF-Core
2 parents 7fa8450 + 78b6e81 commit 73cca0e

File tree

2 files changed

+29
-0
lines changed

2 files changed

+29
-0
lines changed

ansys/dpf/core/dpf_operator.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -727,6 +727,7 @@ def _fillConnectionRequestMessage(request, inpt, server, pin_out=0):
727727
model,
728728
scoping,
729729
workflow,
730+
time_freq_support,
730731
)
731732

732733
if isinstance(inpt, str):
@@ -771,6 +772,8 @@ def _fillConnectionRequestMessage(request, inpt, server, pin_out=0):
771772
request.cyc_support.CopyFrom(inpt._message)
772773
elif isinstance(inpt, workflow.Workflow):
773774
request.workflow.CopyFrom(inpt._message)
775+
elif isinstance(inpt, time_freq_support.TimeFreqSupport):
776+
request.time_freq_support.CopyFrom(inpt._message)
774777
elif isinstance(inpt, Operator):
775778
request.inputop.inputop.CopyFrom(inpt._message)
776779
request.inputop.pinOut = pin_out

tests/test_timefreqsupport.py

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
from ansys.dpf.core import examples
77
from ansys.dpf.core import fields_factory
88
from ansys.dpf.core.common import locations
9+
from ansys.dpf.core.check_version import meets_version, get_server_version
910

11+
SERVER_VERSION_HIGHER_THAN_3_0 = meets_version(get_server_version(dpf.core._global_server()), "3.0")
1012

1113
@pytest.fixture()
1214
def vel_acc_model(velocity_acceleration):
@@ -272,3 +274,27 @@ def test_deep_copy_time_freq_support_multi_stage():
272274

273275
assert len(tf.get_harmonic_indices(0).data) == 6
274276
assert len(tf.get_harmonic_indices(1).data) == 6
277+
278+
279+
@pytest.mark.skipif(not SERVER_VERSION_HIGHER_THAN_3_0,
280+
reason='Requires server version higher than 3.0')
281+
def test_operator_connect_get_output_time_freq_support(velocity_acceleration):
282+
model = Model(velocity_acceleration)
283+
tf = model.metadata.time_freq_support
284+
op = dpf.core.operators.utility.forward(tf)
285+
tfout = op.get_output(0, dpf.core.types.time_freq_support)
286+
assert np.allclose(tf.time_frequencies.data, tfout.time_frequencies.data)
287+
288+
289+
@pytest.mark.skipif(not SERVER_VERSION_HIGHER_THAN_3_0,
290+
reason='Requires server version higher than 3.0')
291+
def test_workflow_connect_get_output_time_freq_support(velocity_acceleration):
292+
model = Model(velocity_acceleration)
293+
tf = model.metadata.time_freq_support
294+
wf = dpf.core.Workflow()
295+
op = dpf.core.operators.utility.forward()
296+
wf.set_input_name("tf", op, 0)
297+
wf.set_output_name("tf", op, 0)
298+
wf.connect("tf", tf)
299+
tfout = wf.get_output("tf", dpf.core.types.time_freq_support)
300+
assert np.allclose(tf.time_frequencies.data, tfout.time_frequencies.data)

0 commit comments

Comments
 (0)