Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions src/ansys/fluent/core/session.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,6 @@ def _get_preferences(session):
return _get_datamodel_attributes(session, "preferences")


def _get_solverworkflow(session):
return _get_datamodel_attributes(session, "solverworkflow")


class _IsDataValid:
def __init__(self, scheme_eval):
self._scheme_eval = scheme_eval
Expand Down Expand Up @@ -118,7 +114,6 @@ def build_from_fluent_connection(self, fluent_connection: FluentConnection):
self.rp_vars = RPVars(self.scheme_eval.string_eval)
self._uploader = None
self._preferences = None
self._solverworkflow = None
self.journal = Journal(self.scheme_eval)

self.transcript = self.fluent_connection.create_service(Transcript)
Expand Down
15 changes: 1 addition & 14 deletions src/ansys/fluent/core/session_solver.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,7 @@
from ansys.fluent.core.services.datamodel_tui import TUIMenu
from ansys.fluent.core.services.reduction import Reduction, ReductionService
from ansys.fluent.core.services.svar import SVARData, SVARInfo, SVARService
from ansys.fluent.core.session import (
_CODEGEN_MSG_TUI,
BaseSession,
_get_preferences,
_get_solverworkflow,
)
from ansys.fluent.core.session import _CODEGEN_MSG_TUI, BaseSession, _get_preferences
from ansys.fluent.core.session_shared import _CODEGEN_MSG_DATAMODEL
from ansys.fluent.core.solver.flobject import get_root as settings_get_root
from ansys.fluent.core.systemcoupling import SystemCoupling
Expand Down Expand Up @@ -52,7 +47,6 @@ def _build_from_fluent_connection(self, fluent_connection):
self._system_coupling = None
self._settings_root = None
self._version = None
self._solverworkflow = None
self._lck = threading.Lock()
self.svar_service = self.fluent_connection.create_service(SVARService)
self.svar_info = SVARInfo(self.svar_service)
Expand Down Expand Up @@ -188,13 +182,6 @@ def preferences(self):
self._preferences = _get_preferences(self)
return self._preferences

@property
def solverworkflow(self):
"""Datamodel root of solverworkflow."""
if self._solverworkflow is None:
self._solverworkflow = _get_solverworkflow(self)
return self._solverworkflow

def _sync_from_future(self, fut: Future):
with self._lck:
try:
Expand Down
1 change: 0 additions & 1 deletion src/ansys/fluent/core/utils/setup_for_fluent.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ def setup_for_fluent(*args, **kwargs):
globals["solver"] = Solver(fluent_connection=session.fluent_connection)
else:
globals["solver"] = session
globals["solverworkflow"] = session.solverworkflow

globals["preferences"] = session.preferences
globals["workflow"] = session.workflow
Expand Down
14 changes: 9 additions & 5 deletions tests/test_session.py
Original file line number Diff line number Diff line change
Expand Up @@ -292,11 +292,15 @@ def test_start_transcript_file_write(new_mesh_session):


@pytest.mark.fluent_version(">=23.1")
def test_solverworkflow_in_solver_session(new_solver_session):
solver = new_solver_session
solver_dir = dir(solver)
for attr in ("preferences", "solverworkflow", "tui", "workflow"):
assert attr in solver_dir
def test_expected_interfaces_in_solver_session(new_solver_session):
assert all(
intf in dir(new_solver_session) for intf in ("preferences", "tui", "workflow")
)


@pytest.mark.fluent_version(">=24.1")
def test_solverworkflow_not_in_solver_session(new_solver_session):
assert "solverworkflow" not in dir(new_solver_session)


@pytest.mark.fluent_version(">=23.2")
Expand Down