Skip to content

Commit 8a796f2

Browse files
committed
fix: pyflake style
1 parent 8a34a56 commit 8a796f2

14 files changed

+46
-211
lines changed

tests/test_local_server.py

-110
Original file line numberDiff line numberDiff line change
@@ -227,113 +227,3 @@ def test_dot_operator_server_fields_container(local_server):
227227
out = add.outputs.fields_container()
228228
assert np.allclose(out[0].scoping.ids, [1, 2])
229229
assert np.allclose(out[0].data, -field.data)
230-
231-
232-
def test_add_operator_server_fields_container(local_server):
233-
field = dpf.core.fields_factory.create_3d_vector_field(2, server=local_server)
234-
field.data = [0.0, 1.0, 2.0, 3.0, 4.0, 5.0]
235-
field.scoping.ids = [1, 2]
236-
237-
fc = dpf.core.fields_container_factory.over_time_freq_fields_container(
238-
[field, field], server=local_server
239-
)
240-
241-
# operator with field out
242-
forward = ops.utility.forward_field(field, server=local_server)
243-
add = fc + forward
244-
assert type(add) == ops.math.add_fc
245-
out = add.outputs.fields_container()
246-
assert len(out) == 2
247-
assert np.allclose(out[0].scoping.ids, [1, 2])
248-
assert np.allclose(out[0].data, np.array(field.data) * 2.0)
249-
250-
# fc + list
251-
add = fc + [0.0, 1.0, 2.0]
252-
assert type(add) == ops.math.add_fc
253-
out = add.outputs.fields_container()
254-
assert len(out) == 2
255-
assert np.allclose(out[0].scoping.ids, [1, 2])
256-
assert np.allclose(out[0].data, field.data + np.array([[0.0, 1.0, 2.0], [0.0, 1.0, 2.0]]))
257-
258-
# fc + float
259-
add = fc + 1.0
260-
assert type(add) == ops.math.add_fc
261-
out = add.outputs.fields_container()
262-
assert np.allclose(out[0].scoping.ids, [1, 2])
263-
assert np.allclose(out[0].data, np.array([[1.0, 2.0, 3.0], [4.0, 5.0, 6.0]]))
264-
265-
266-
def test_minus_operator_server_fields_container(local_server):
267-
field = dpf.core.fields_factory.create_3d_vector_field(2, server=local_server)
268-
field.data = [0.0, 1.0, 2.0, 3.0, 4.0, 5.0]
269-
field.scoping.ids = [1, 2]
270-
271-
fc = dpf.core.fields_container_factory.over_time_freq_fields_container(
272-
[field, field], server=local_server
273-
)
274-
275-
# operator with field out
276-
forward = ops.utility.forward_field(field, server=local_server)
277-
add = fc - forward
278-
assert type(add) == ops.math.minus_fc
279-
out = add.outputs.fields_container()
280-
assert len(out) == 2
281-
assert np.allclose(out[0].scoping.ids, [1, 2])
282-
assert np.allclose(out[0].data, np.zeros((2, 3)))
283-
284-
# fc - list
285-
add = fc - [0.0, 1.0, 2.0]
286-
assert type(add) == ops.math.minus_fc
287-
out = add.outputs.fields_container()
288-
assert len(out) == 2
289-
assert np.allclose(out[0].scoping.ids, [1, 2])
290-
assert np.allclose(out[0].data, np.array([[0.0, 0.0, 0.0], [3.0, 3.0, 3.0]]))
291-
292-
# fc - float
293-
add = fc - 1.0
294-
assert type(add) == ops.math.minus_fc
295-
out = add.outputs.fields_container()
296-
assert np.allclose(out[0].scoping.ids, [1, 2])
297-
assert np.allclose(out[0].data, np.array([[-1.0, 0.0, 1.0], [2.0, 3.0, 4.0]]))
298-
299-
300-
def test_dot_operator_server_fields_container(local_server):
301-
field = dpf.core.fields_factory.create_3d_vector_field(2, server=local_server)
302-
field.data = [0.0, 1.0, 2.0, 3.0, 4.0, 5.0]
303-
field.scoping.ids = [1, 2]
304-
305-
fc = dpf.core.fields_container_factory.over_time_freq_fields_container(
306-
[field, field], server=local_server
307-
)
308-
309-
# fc * op
310-
forward = ops.utility.forward_field(field, server=local_server)
311-
add = fc * forward
312-
assert type(add) == ops.math.generalized_inner_product_fc
313-
out = add.outputs.fields_container()
314-
assert len(out) == 2
315-
assert np.allclose(out[0].scoping.ids, [1, 2])
316-
assert np.allclose(out[0].data, np.array([5.0, 50.0]))
317-
318-
# fc * field
319-
add = fc * field
320-
assert type(add) == ops.math.generalized_inner_product_fc
321-
out = add.outputs.fields_container()
322-
assert len(out) == 2
323-
assert np.allclose(out[0].scoping.ids, [1, 2])
324-
assert np.allclose(out[0].data, np.array([5.0, 50.0]))
325-
326-
# fc * list
327-
add = fc * [0.0, 1.0, 2.0]
328-
assert type(add) == ops.math.generalized_inner_product_fc
329-
out = add.outputs.fields_container()
330-
assert len(out) == 2
331-
assert np.allclose(out[0].scoping.ids, [1, 2])
332-
assert np.allclose(out[0].data, np.array([5.0, 14.0]))
333-
334-
# fc * float
335-
add = fc * -1.0
336-
assert type(add) == ops.math.generalized_inner_product_fc
337-
out = add.outputs.fields_container()
338-
assert np.allclose(out[0].scoping.ids, [1, 2])
339-
assert np.allclose(out[0].data, -field.data)

tests/test_model.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ def test_result_not_dynamic(plate_msup):
234234
assert len(fc) == 2
235235
assert np.allclose(fc.time_freq_support.time_frequencies.data, np.array([0.115, 0.125]))
236236
assert fc[0].unit == "Pa"
237-
dis = model.results.displacement().eval()
237+
model.results.displacement().eval()
238238
dpf.core.settings.set_dynamic_available_results_capability(True)
239239

240240

tests/test_multi_server.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ def test_model_cyc_support_multi_server(cyc_models):
192192

193193

194194
def test_model_displacement_multi_server(transient_models):
195-
tf = transient_models[0].metadata.time_freq_support
195+
transient_models[0].metadata.time_freq_support
196196
time_scoping = range(1, 3)
197197
disp = transient_models[0].results.displacement()
198198
disp.inputs.time_scoping(time_scoping)
@@ -226,7 +226,7 @@ def check_fc(fc, fc2):
226226

227227

228228
def test_model_stress_multi_server(transient_models):
229-
tf = transient_models[0].metadata.time_freq_support
229+
transient_models[0].metadata.time_freq_support
230230
time_scoping = range(1, 3)
231231
disp = transient_models[0].results.stress()
232232
disp.inputs.time_scoping(time_scoping)

tests/test_operator.py

+3-48
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ def test_inputs_outputs_meshes_container(allkindofcomplexity):
573573

574574
opsc = dpf.core.Operator("scoping::by_property")
575575
opsc.inputs.mesh.connect(model.metadata.meshed_region)
576-
sc = opsc.outputs.mesh_scoping()
576+
opsc.outputs.mesh_scoping()
577577

578578
stress = model.results.stress()
579579
stress.inputs.connect(op.outputs)
@@ -838,17 +838,6 @@ def test_connect_result2(plate_msup, server_type):
838838
assert len(out) == len(out2)
839839

840840

841-
@pytest.mark.skipif(
842-
not conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_3_0,
843-
reason="Bug in server version lower than 3.0",
844-
)
845-
def test_connect_get_output_int_list_operator(server_type):
846-
d = list(range(0, 1000000))
847-
op = dpf.core.operators.utility.forward(d, server=server_type)
848-
d_out = op.get_output(0, dpf.core.types.vec_int)
849-
assert np.allclose(d, d_out)
850-
851-
852841
@pytest.mark.skipif(
853842
not conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_3_0,
854843
reason="Bug in server version lower than 3.0",
@@ -1166,7 +1155,7 @@ def test_get_static_spec_operator_in_proc(server_clayer):
11661155
spec = dpf.core.Operator.operator_specification(name, server=server_clayer)
11671156
assert len(spec.operator_name) > 0
11681157
l = len(spec.inputs)
1169-
d = spec.description
1158+
spec.description
11701159

11711160

11721161
@conftest.raises_for_servers_version_under("3.0")
@@ -1201,40 +1190,6 @@ def test_with_progress_operator_in_proc(allkindofcomplexity, server_clayer):
12011190
assert len(fc) == 2
12021191

12031192

1204-
@conftest.raises_for_servers_version_under("3.0")
1205-
def test_list_operators(server_type_legacy_grpc):
1206-
l = dpf.core.dpf_operator.available_operator_names(server=server_type_legacy_grpc)
1207-
assert len(l) > 400
1208-
assert "merge::result_info" in l
1209-
assert "unit_convert" in l
1210-
assert "stream_provider" in l
1211-
1212-
1213-
@conftest.raises_for_servers_version_under("3.0")
1214-
def test_get_static_spec_operator(server_type_legacy_grpc):
1215-
l = dpf.core.dpf_operator.available_operator_names(server=server_type_legacy_grpc)
1216-
for i, name in enumerate(l):
1217-
spec = dpf.core.Operator.operator_specification(name, server=server_type_legacy_grpc)
1218-
assert len(spec.operator_name) > 0
1219-
assert len(spec.inputs) > 0
1220-
assert len(spec.description) > 0
1221-
1222-
1223-
@conftest.raises_for_servers_version_under("3.0")
1224-
def test_with_progress_operator(allkindofcomplexity, server_type):
1225-
model = dpf.core.Model(allkindofcomplexity, server=server_type)
1226-
op = model.results.stress()
1227-
op.inputs.read_cyclic(3)
1228-
opnorm = dpf.core.operators.averaging.to_nodal_fc(op, server=server_type)
1229-
add = dpf.core.operators.math.add_fc(opnorm, opnorm, server=server_type)
1230-
add2 = dpf.core.operators.math.add_fc(add, add, server=server_type)
1231-
add3 = dpf.core.operators.math.add_fc(add2, server=server_type)
1232-
add4 = dpf.core.operators.math.add_fc(add3, add3, server=server_type)
1233-
add4.progress_bar = True
1234-
fc = add4.outputs.fields_container()
1235-
assert len(fc) == 2
1236-
1237-
12381193
def test_operator_specification_simple(server_type):
12391194
spec = Specification(operator_name="U", server=server_type)
12401195
assert "displacement" in spec.description
@@ -1318,7 +1273,7 @@ def test_delete_operator(server_type):
13181273

13191274
def test_memory_outputs_operator(allkindofcomplexity):
13201275
model = dpf.core.Model(allkindofcomplexity)
1321-
mesh = model.metadata.meshed_region
1276+
model.metadata.meshed_region
13221277
stress_fc = model.results.stress().eqv().eval()
13231278
assert len(stress_fc) == 2
13241279

tests/test_plotter.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ def test_plotter_on_fields_container_elemental(allkindofcomplexity):
127127
avg_op.inputs.fields_container.connect(stress.outputs.fields_container)
128128
fc = avg_op.outputs.fields_container()
129129
pl = Plotter(model.metadata.meshed_region)
130-
cpos = pl.plot_contour(fc)
130+
pl.plot_contour(fc)
131131

132132

133133
@pytest.mark.skipif(not HAS_PYVISTA, reason="Please install pyvista")
@@ -139,7 +139,7 @@ def test_plotter_on_fields_container_nodal(allkindofcomplexity):
139139
avg_op.inputs.fields_container.connect(stress.outputs.fields_container)
140140
fc = avg_op.outputs.fields_container()
141141
pl = Plotter(model.metadata.meshed_region)
142-
cpos = pl.plot_contour(fc)
142+
pl.plot_contour(fc)
143143

144144

145145
@pytest.mark.skipif(not HAS_PYVISTA, reason="Please install pyvista")
@@ -169,7 +169,7 @@ def test_fields_container_plot(allkindofcomplexity):
169169
@pytest.mark.skipif(not HAS_PYVISTA, reason="Please install pyvista")
170170
def test_field_elemental_plot(allkindofcomplexity):
171171
model = Model(allkindofcomplexity)
172-
mesh = model.metadata.meshed_region
172+
model.metadata.meshed_region
173173
stress = model.results.stress()
174174
stress.inputs.requested_location.connect("Elemental")
175175
avg_op = Operator("to_elemental_fc")
@@ -182,7 +182,7 @@ def test_field_elemental_plot(allkindofcomplexity):
182182
@pytest.mark.skipif(not HAS_PYVISTA, reason="Please install pyvista")
183183
def test_field_nodal_plot(allkindofcomplexity):
184184
model = Model(allkindofcomplexity)
185-
mesh = model.metadata.meshed_region
185+
model.metadata.meshed_region
186186
stress = model.results.stress()
187187
stress.inputs.requested_location.connect("Elemental")
188188
avg_op = Operator("to_nodal_fc")
@@ -200,7 +200,7 @@ def test_field_nodal_plot(allkindofcomplexity):
200200
@pytest.mark.skipif(not HAS_PYVISTA, reason="Please install pyvista")
201201
def test_field_solid_plot(allkindofcomplexity):
202202
model = Model(allkindofcomplexity)
203-
mesh = model.metadata.meshed_region
203+
model.metadata.meshed_region
204204
stress = model.results.stress()
205205
stress.inputs.requested_location.connect("Nodal")
206206
fc = stress.outputs.fields_container()
@@ -211,7 +211,7 @@ def test_field_solid_plot(allkindofcomplexity):
211211
@pytest.mark.skipif(not HAS_PYVISTA, reason="Please install pyvista")
212212
def test_field_shell_plot(allkindofcomplexity):
213213
model = Model(allkindofcomplexity)
214-
mesh = model.metadata.meshed_region
214+
model.metadata.meshed_region
215215
stress = model.results.stress()
216216
stress.inputs.requested_location.connect("Nodal")
217217
fc = stress.outputs.fields_container()
@@ -222,7 +222,7 @@ def test_field_shell_plot(allkindofcomplexity):
222222
@pytest.mark.skipif(not HAS_PYVISTA, reason="Please install pyvista")
223223
def test_field_solid_plot_scoping_nodal(multishells):
224224
model = core.Model(multishells)
225-
mesh = model.metadata.meshed_region
225+
model.metadata.meshed_region
226226
stress = model.results.stress()
227227
stress.inputs.requested_location.connect("Nodal")
228228
scoping = core.Scoping()
@@ -240,7 +240,7 @@ def test_field_solid_plot_scoping_nodal(multishells):
240240
@pytest.mark.skipif(not HAS_PYVISTA, reason="Please install pyvista")
241241
def test_field_shell_plot_scoping_elemental(multishells):
242242
model = core.Model(multishells)
243-
mesh = model.metadata.meshed_region
243+
model.metadata.meshed_region
244244
stress = model.results.stress()
245245
scoping = core.Scoping()
246246
scoping.location = "Elemental"

tests/test_plugins.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ def test_vtk(server_type, tmpdir):
125125
op.inputs.fields1.connect(u)
126126
op.inputs.mesh.connect(model.metadata.mesh_provider)
127127
op.inputs.directory.connect(os.path.dirname(rst_file))
128-
out_path = op.eval()
128+
op.eval()
129129
# assert out_path.result_files is not []
130130
# try:
131131
# out_path = dpf.core.download_file(

tests/test_resultinfo.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ def test_result_info_memory_leaks(model):
180180
res = metadata.result_info
181181
# Still leaking, but maybe from the Operator.connect
182182
# in Metadata._load_result_info()
183-
u = res.unit_system_name
184-
c = res.cyclic_support
183+
res.unit_system_name
184+
res.cyclic_support
185185
# v = res.solver_version
186186
# date = res.solver_date
187187
# time = res.solver_time

tests/test_server.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -160,13 +160,13 @@ def test_available_api_types(self, server_config):
160160
set_server_configuration(server_config)
161161
server = get_or_create_server(None)
162162
assert has_local_server()
163-
types = server.available_api_types
163+
server.available_api_types
164164

165165
def test_client(self, server_config):
166166
set_server_configuration(server_config)
167167
server = get_or_create_server(None)
168168
assert has_local_server()
169-
client = server.client
169+
server.client
170170

171171

172172
@pytest.mark.skipif(

tests/test_service.py

+7-9
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,10 @@ def test_download_with_subdir(multishells, tmpdir, server_type_remote_process):
136136
filename = ntpath.basename(file)
137137
parent_path = os.path.dirname(file)
138138
to_server_path = parent_path + separator + "subdir" + separator + filename
139-
subdir_filepath = dpf.core.upload_file(file, to_server_path, server=server_type_remote_process)
139+
dpf.core.upload_file(file, to_server_path, server=server_type_remote_process)
140140
folder = parent_path
141141

142-
out = dpf.core.download_files_in_folder(folder, tmpdir, server=server_type_remote_process)
142+
dpf.core.download_files_in_folder(folder, tmpdir, server=server_type_remote_process)
143143
p1 = os.path.join(tmpdir, filename)
144144
p2 = os.path.join(tmpdir, "subdir", filename)
145145
# p1 = tmpdir + "/" + filename
@@ -174,9 +174,7 @@ def test_downloadinfolder_uploadinfolder(multishells, tmpdir, server_type_remote
174174
# download it
175175
new_tmpdir = os.path.join(tmpdir, "my_tmp_dir")
176176
os.mkdir(new_tmpdir)
177-
out = dpf.core.download_files_in_folder(
178-
TARGET_PATH, new_tmpdir, server=server_type_remote_process
179-
)
177+
dpf.core.download_files_in_folder(TARGET_PATH, new_tmpdir, server=server_type_remote_process)
180178
# check if the architecture of the download is ok
181179
path1_check = os.path.join(new_tmpdir, os.path.basename(multishells))
182180
path2_check = os.path.join(new_tmpdir, "subdirA", os.path.basename(multishells))
@@ -524,7 +522,7 @@ def test_server_without_context(remote_config_server_type):
524522
)
525523
@conftest.raises_for_servers_version_under("6.0")
526524
def test_release_dpf(server_type):
527-
op = dpf.core.Operator("expansion::modal_superposition", server=server_type)
525+
dpf.core.Operator("expansion::modal_superposition", server=server_type)
528526
server_type.release()
529527

530528
with pytest.raises((KeyError, dpf.core.errors.DPFServerException)):
@@ -540,7 +538,7 @@ def test_license_context_manager_as_context(server_type):
540538
op.inputs.field(field)
541539
op.inputs.threshold(0.0)
542540
with dpf.core.LicenseContextManager(server=server_type) as lic:
543-
out = op.outputs.field()
541+
op.outputs.field()
544542
st = lic.status
545543

546544
assert len(st) != 0
@@ -549,7 +547,7 @@ def test_license_context_manager_as_context(server_type):
549547
lic = dpf.core.LicenseContextManager(server=server_type)
550548
op.inputs.field(field)
551549
op.inputs.threshold(0.0)
552-
out = op.outputs.field()
550+
op.outputs.field()
553551
new_st = lic.status
554552
assert str(new_st) == str(st)
555553
lic = None
@@ -560,7 +558,7 @@ def test_license_context_manager_as_context(server_type):
560558
with dpf.core.LicenseContextManager(
561559
increment_name="ansys", license_timeout_in_seconds=1.0, server=server_type
562560
) as lic:
563-
out = op.outputs.field()
561+
op.outputs.field()
564562
st = lic.status
565563
assert "ansys" in st
566564
st = lic.status

0 commit comments

Comments
 (0)