From e4d80f278b1ac4904e1bb659cfcba359aa4dc26f Mon Sep 17 00:00:00 2001
From: "ANSYS\\spearson" <sean.pearson@ansys.com>
Date: Fri, 22 Sep 2023 16:09:53 +0100
Subject: [PATCH] rm slvr wf

---
 src/ansys/fluent/core/session.py                |  5 -----
 src/ansys/fluent/core/session_solver.py         | 15 +--------------
 src/ansys/fluent/core/utils/setup_for_fluent.py |  1 -
 tests/test_session.py                           | 14 +++++++++-----
 4 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/src/ansys/fluent/core/session.py b/src/ansys/fluent/core/session.py
index b5383a1b09e4..ae40e7e9ceb1 100644
--- a/src/ansys/fluent/core/session.py
+++ b/src/ansys/fluent/core/session.py
@@ -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
@@ -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)
diff --git a/src/ansys/fluent/core/session_solver.py b/src/ansys/fluent/core/session_solver.py
index e026348dd1b0..5fcf6a3b68b0 100644
--- a/src/ansys/fluent/core/session_solver.py
+++ b/src/ansys/fluent/core/session_solver.py
@@ -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
@@ -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)
@@ -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:
diff --git a/src/ansys/fluent/core/utils/setup_for_fluent.py b/src/ansys/fluent/core/utils/setup_for_fluent.py
index b235f79e75be..cf532291d594 100644
--- a/src/ansys/fluent/core/utils/setup_for_fluent.py
+++ b/src/ansys/fluent/core/utils/setup_for_fluent.py
@@ -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
diff --git a/tests/test_session.py b/tests/test_session.py
index dae4eea3f701..493dabd7db3b 100644
--- a/tests/test_session.py
+++ b/tests/test_session.py
@@ -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")