merge fixes

Author: cbellot000

ansys/dpf/core/__init__.py

@@ -61,7 +61,6 @@
 )
 from ansys.dpf.core import server
 from ansys.dpf.core import check_version
-from ansys.dpf.core import settings
 from ansys.dpf.core import path_utilities
 from ansys.dpf.core import settings
 

ansys/dpf/core/data_sources.py

@@ -196,6 +196,9 @@ def add_file_path_for_specified_result(self, filepath, key="", result_key=""):
     def add_upstream(self, upstream_data_sources, result_key=""):
         """Add upstream data sources.
 
+        This is used to add a set of path creating an upstream for
+        recursive workflows.
+
         Parameters
         ----------
         upstream_data_sources : DataSources

ansys/dpf/core/examples/downloads.py

@@ -317,7 +317,7 @@ def download_fluent_files() -> dict:
 
 def download_extrapolation_3d_result() -> dict:
     """Download example static results of reference and integrated points
-    for extrapolation of 3d-element and return return the dictionnary of 2 download paths.
+    for extrapolation of 3d-element and return return the dictionary of 2 download paths.
 
     Examples files are downloaded to a persistent cache to avoid
     re-downloading the same file twice.
@@ -330,7 +330,7 @@ def download_extrapolation_3d_result() -> dict:
 
     Examples
     --------
-    Download 2 example result files and return the dictionnary containing 2 files
+    Download 2 example result files and return the dictionary containing 2 files
 
     >>> from ansys.dpf.core import examples
     >>> dict = examples.download_extrapolation_ref_result
@@ -351,7 +351,7 @@ def download_extrapolation_3d_result() -> dict:
 
 def download_extrapolation_2d_result() -> dict:
     """Download example static results of reference and integrated points
-    for extrapolation of 2d-element and return the dictionnary of 2 download paths.
+    for extrapolation of 2d-element and return the dictionary of 2 download paths.
 
     Examples files are downloaded to a persistent cache to avoid
     re-downloading the same file twice.
@@ -364,7 +364,7 @@ def download_extrapolation_2d_result() -> dict:
 
      Examples
     --------
-    Download 2 example result files and return the dictionnary containing 2 files
+    Download 2 example result files and return the dictionary containing 2 files
 
     >>> from ansys.dpf.core import examples
     >>> dict = examples.download_extrapolation_ref_result

ansys/dpf/core/results.py

@@ -60,13 +60,11 @@ class Results:
 
         Examples
         --------
-        Create a stress result from the model and choose its time and mesh scopings.
 
         >>> from ansys.dpf import core as dpf
         >>> from ansys.dpf.core import examples
         >>> model = dpf.Model(examples.electric_therm)
         >>> v = model.results.electric_potential
-        >>> rf = model.results.reaction_force
         >>> dissip = model.results.thermal_dissipation_energy
 
     Examples

tests/conftest.py

@@ -58,7 +58,7 @@ def resolve_test_file(basename, additional_path="", is_in_examples=None):
         )
         if not os.path.isfile(filename):
             raise FileNotFoundError(f"Unable to locate {basename} at {test_files_path}")
-        return filen
+        return filename
 
 
 @pytest.fixture()

tests/test_field.py

@@ -1,11 +1,11 @@
 import numpy as np
 import pytest
-
 from ansys import dpf
 from ansys.dpf import core
 from ansys.dpf.core import FieldDefinition
 from ansys.dpf.core import operators as ops
 from ansys.dpf.core.common import locations, shell_layers
+
 from conftest import local_server
 
 
@@ -1005,99 +1005,6 @@ def test_dot_operator_field():
     assert np.allclose(out.data, -field.data)
 
 
-def test_add_operator_server_field():
-    field = dpf.core.fields_factory.create_3d_vector_field(2, server=local_server)
-    field.data = [0., 1., 2., 3., 4., 5.]
-    field.scoping.ids = [1, 2]
-
-    # field+op
-    forward = ops.utility.forward_field(field, server=local_server)
-    add = field + forward
-    assert isinstance(add, ops.math.add)
-    out = add.outputs.field()
-    assert out.scoping.ids == [1, 2]
-    assert np.allclose(out.data, np.array(field.data) * 2.0)
-
-    # field + list
-    add = field + [0., 1., 2.]
-    assert isinstance(add, ops.math.add)
-    out = add.outputs.field()
-    assert len(out) == 6
-    assert out.scoping.ids == [1, 2]
-    assert np.allclose(out.data, field.data + np.array([[0., 1., 2.], [0., 1., 2.]]))
-
-    # field + float
-    add = field + 1.0
-    assert isinstance(add, ops.math.add)
-    out = add.outputs.field()
-    assert out.scoping.ids == [1, 2]
-    assert np.allclose(out.data, np.array([[1., 2., 3.], [4., 5., 6.]]))
-
-
-def test_minus_operator_server_field():
-    field = dpf.core.fields_factory.create_3d_vector_field(2, server=local_server)
-    field.data = [0., 1., 2., 3., 4., 5.]
-    field.scoping.ids = [1, 2]
-
-    # field-op
-    forward = ops.utility.forward_field(field, server=local_server)
-    add = field - forward
-    assert isinstance(add, ops.math.minus)
-    out = add.outputs.field()
-    assert len(out) == 6
-    assert out.scoping.ids == [1, 2]
-    assert np.allclose(out.data, np.zeros((2, 3)))
-
-    # fc - list
-    add = field - [0., 1., 2.]
-    assert isinstance(add, ops.math.minus)
-    out = add.outputs.field()
-    assert out.scoping.ids == [1, 2]
-    assert np.allclose(out.data, np.array([[0., 0., 0.], [3., 3., 3.]]))
-
-    # operator - float
-    add = field - 1.0
-    assert isinstance(add, ops.math.minus)
-    out = add.outputs.field()
-    assert out.scoping.ids == [1, 2]
-    assert np.allclose(out.data, np.array([[-1., 0., 1.], [2., 3., 4.]]))
-
-
-def test_dot_operator_server_field():
-    field = dpf.core.fields_factory.create_3d_vector_field(2, server=local_server)
-    field.data = [0., 1., 2., 3., 4., 5.]
-    field.scoping.ids = [1, 2]
-
-    # field * op
-    forward = ops.utility.forward_field(field, server=local_server)
-    add = field * forward
-    assert type(add) == ops.math.generalized_inner_product
-    out = add.outputs.field()
-    assert out.scoping.ids == [1, 2]
-    assert np.allclose(out.data, np.array([5., 50.]))
-
-    # field * field
-    add = field * field
-    assert isinstance(add, ops.math.generalized_inner_product)
-    out = add.outputs.field()
-    assert out.scoping.ids == [1, 2]
-    assert np.allclose(out.data, np.array([5., 50.]))
-
-    # field * list
-    add = field * [0., 1., 2.]
-    assert isinstance(add, ops.math.generalized_inner_product)
-    out = add.outputs.field()
-    assert out.scoping.ids == [1, 2]
-    assert np.allclose(out.data, np.array([5., 14.]))
-
-    # field * float
-    add = field * -1.0
-    assert isinstance(add, ops.math.generalized_inner_product)
-    out = add.outputs.field()
-    assert out.scoping.ids == [1, 2]
-    assert np.allclose(out.data, -field.data)
-
-
 def test_add_operator_server_field():
     field = dpf.core.fields_factory.create_3d_vector_field(2, server=local_server)
     field.data = [0.0, 1.0, 2.0, 3.0, 4.0, 5.0]