From dd3eb7d65d0a1c9431426e4a66c0573983e2663f Mon Sep 17 00:00:00 2001 From: "ANSYS\\spearson" Date: Thu, 8 Sep 2022 18:47:16 +0100 Subject: [PATCH 01/10] switch creatability default --- src/ansys/fluent/core/solver/flobject.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ansys/fluent/core/solver/flobject.py b/src/ansys/fluent/core/solver/flobject.py index b2555e96c2d..0a5bed12dbd 100644 --- a/src/ansys/fluent/core/solver/flobject.py +++ b/src/ansys/fluent/core/solver/flobject.py @@ -862,7 +862,7 @@ def get_cls(name, info, parent=None): dct["__doc__"] = f"'{pname.strip('_')}' child." include_child_named_objects = info.get("include_child_named_objects", False) - user_creatable = info.get("user_creatable", True) + user_creatable = info.get("user_creatable", False) bases = (base,) if include_child_named_objects: From 77a5c5ec1cd6cbcc939917c5f318b44a154d26da Mon Sep 17 00:00:00 2001 From: "ANSYS\\spearson" Date: Thu, 8 Sep 2022 19:13:15 +0100 Subject: [PATCH 02/10] switch creatability default --- tests/test_creatable.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 tests/test_creatable.py diff --git a/tests/test_creatable.py b/tests/test_creatable.py new file mode 100644 index 00000000000..32d6edcd9ec --- /dev/null +++ b/tests/test_creatable.py @@ -0,0 +1,22 @@ +from util.solver_workflow import new_solver_session # noqa: F401 + + +def test_session_starts_transcript_by_default(new_solver_session) -> None: + + has_not = ( + new_solver_session.setup.boundary_conditions.velocity_inlet, + new_solver_session.setup.cell_zone_conditions.fluid, + ) + + has = ( + new_solver_session.results.graphics.contour, + new_solver_session.results.graphics.vector, + ) + + for obj in has_not: + assert not hasattr(obj, "create") + assert "create" not in dir(obj) + + for obj in has: + assert hasattr(obj, "create") + assert "create" in dir(obj) From 8b77194452851b7a37a9b6c09546651987d53977 Mon Sep 17 00:00:00 2001 From: "ANSYS\\spearson" Date: Thu, 8 Sep 2022 19:46:52 +0100 Subject: [PATCH 03/10] test update --- tests/test_creatable.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/test_creatable.py b/tests/test_creatable.py index 32d6edcd9ec..595635bb4bc 100644 --- a/tests/test_creatable.py +++ b/tests/test_creatable.py @@ -1,7 +1,9 @@ +import pytest from util.solver_workflow import new_solver_session # noqa: F401 -def test_session_starts_transcript_by_default(new_solver_session) -> None: +@pytest.mark.fluent_231 +def test_creatable(new_solver_session) -> None: has_not = ( new_solver_session.setup.boundary_conditions.velocity_inlet, From 9849556f7c7c2bc48728be8f0e09c2415195bd5b Mon Sep 17 00:00:00 2001 From: "ANSYS\\spearson" Date: Thu, 8 Sep 2022 20:15:13 +0100 Subject: [PATCH 04/10] revert error message --- src/ansys/fluent/core/solver/flobject.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ansys/fluent/core/solver/flobject.py b/src/ansys/fluent/core/solver/flobject.py index b2555e96c2d..07843c9bea6 100644 --- a/src/ansys/fluent/core/solver/flobject.py +++ b/src/ansys/fluent/core/solver/flobject.py @@ -146,7 +146,7 @@ def get_attr(self, attr) -> Any: attrs = self.get_attrs([attr]) if attr != "active?" and attrs.get("active?", True) is False: raise RuntimeError("Object is not active") - return attrs[attr] + return attrs[attr] if attrs else None def is_active(self) -> bool: """Whether the object is active.""" From 748e9d67edd4005e60a0cff90ec9c8a784852a33 Mon Sep 17 00:00:00 2001 From: "ANSYS\\spearson" Date: Fri, 9 Sep 2022 17:15:33 +0100 Subject: [PATCH 05/10] simplify LOG for portability --- src/ansys/fluent/core/solver/flobject.py | 2 +- src/ansys/fluent/core/solver/logging.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 src/ansys/fluent/core/solver/logging.py diff --git a/src/ansys/fluent/core/solver/flobject.py b/src/ansys/fluent/core/solver/flobject.py index b2555e96c2d..24482f57f1c 100644 --- a/src/ansys/fluent/core/solver/flobject.py +++ b/src/ansys/fluent/core/solver/flobject.py @@ -25,7 +25,7 @@ from typing import Any, Dict, Generic, List, NewType, Tuple, TypeVar, Union import weakref -from ansys.fluent.core.utils.logging import LOG +from .logging import LOG # Type hints RealType = NewType("real", Union[float, str]) # constant or expression diff --git a/src/ansys/fluent/core/solver/logging.py b/src/ansys/fluent/core/solver/logging.py new file mode 100644 index 00000000000..5c9433359fc --- /dev/null +++ b/src/ansys/fluent/core/solver/logging.py @@ -0,0 +1 @@ +from ansys.fluent.core.utils.logging import LOG # noqa: F401 From e06e4c5054eabcf23bef98cdf73e51ce3927105b Mon Sep 17 00:00:00 2001 From: "ANSYS\\spearson" Date: Fri, 9 Sep 2022 17:21:44 +0100 Subject: [PATCH 06/10] __call__ not returning anything if sets state --- src/ansys/fluent/core/solver/flobject.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/ansys/fluent/core/solver/flobject.py b/src/ansys/fluent/core/solver/flobject.py index b2555e96c2d..6f2b1a1bc45 100644 --- a/src/ansys/fluent/core/solver/flobject.py +++ b/src/ansys/fluent/core/solver/flobject.py @@ -369,10 +369,11 @@ def __init__(self, name: str = None, parent=None): def __call__(self, *args, **kwargs): if kwargs: - return self.set_state(kwargs) + self.set_state(kwargs) elif args: - return self.set_state(args) - return self.get_state() + self.set_state(args) + else: + return self.get_state() @classmethod def to_scheme_keys(cls, value): From 9911530b48d14bb7b39621bed709781acf4af895 Mon Sep 17 00:00:00 2001 From: "ANSYS\\spearson" Date: Thu, 8 Sep 2022 20:15:13 +0100 Subject: [PATCH 07/10] revert error message --- src/ansys/fluent/core/solver/flobject.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ansys/fluent/core/solver/flobject.py b/src/ansys/fluent/core/solver/flobject.py index b2555e96c2d..07843c9bea6 100644 --- a/src/ansys/fluent/core/solver/flobject.py +++ b/src/ansys/fluent/core/solver/flobject.py @@ -146,7 +146,7 @@ def get_attr(self, attr) -> Any: attrs = self.get_attrs([attr]) if attr != "active?" and attrs.get("active?", True) is False: raise RuntimeError("Object is not active") - return attrs[attr] + return attrs[attr] if attrs else None def is_active(self) -> bool: """Whether the object is active.""" From 8b43fd5dd03de949f7cd472a961cff3e069ef948 Mon Sep 17 00:00:00 2001 From: "ANSYS\\spearson" Date: Thu, 8 Sep 2022 18:47:16 +0100 Subject: [PATCH 08/10] switch creatability default --- src/ansys/fluent/core/solver/flobject.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ansys/fluent/core/solver/flobject.py b/src/ansys/fluent/core/solver/flobject.py index b2555e96c2d..0a5bed12dbd 100644 --- a/src/ansys/fluent/core/solver/flobject.py +++ b/src/ansys/fluent/core/solver/flobject.py @@ -862,7 +862,7 @@ def get_cls(name, info, parent=None): dct["__doc__"] = f"'{pname.strip('_')}' child." include_child_named_objects = info.get("include_child_named_objects", False) - user_creatable = info.get("user_creatable", True) + user_creatable = info.get("user_creatable", False) bases = (base,) if include_child_named_objects: From 2b0f3dcc0b3c6ac255338f2fcf6ba3a4b836f64f Mon Sep 17 00:00:00 2001 From: "ANSYS\\spearson" Date: Thu, 8 Sep 2022 19:13:15 +0100 Subject: [PATCH 09/10] switch creatability default --- tests/test_creatable.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 tests/test_creatable.py diff --git a/tests/test_creatable.py b/tests/test_creatable.py new file mode 100644 index 00000000000..32d6edcd9ec --- /dev/null +++ b/tests/test_creatable.py @@ -0,0 +1,22 @@ +from util.solver_workflow import new_solver_session # noqa: F401 + + +def test_session_starts_transcript_by_default(new_solver_session) -> None: + + has_not = ( + new_solver_session.setup.boundary_conditions.velocity_inlet, + new_solver_session.setup.cell_zone_conditions.fluid, + ) + + has = ( + new_solver_session.results.graphics.contour, + new_solver_session.results.graphics.vector, + ) + + for obj in has_not: + assert not hasattr(obj, "create") + assert "create" not in dir(obj) + + for obj in has: + assert hasattr(obj, "create") + assert "create" in dir(obj) From 7bfdc35aa5016d5dc0fa7e3f1f49e91b58b55f89 Mon Sep 17 00:00:00 2001 From: "ANSYS\\spearson" Date: Thu, 8 Sep 2022 19:46:52 +0100 Subject: [PATCH 10/10] test update --- tests/test_creatable.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/test_creatable.py b/tests/test_creatable.py index 32d6edcd9ec..595635bb4bc 100644 --- a/tests/test_creatable.py +++ b/tests/test_creatable.py @@ -1,7 +1,9 @@ +import pytest from util.solver_workflow import new_solver_session # noqa: F401 -def test_session_starts_transcript_by_default(new_solver_session) -> None: +@pytest.mark.fluent_231 +def test_creatable(new_solver_session) -> None: has_not = ( new_solver_session.setup.boundary_conditions.velocity_inlet,