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
2 changes: 1 addition & 1 deletion src/ansys/fluent/core/launcher/launcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ def launch_fluent(
pyfluent.EXAMPLES_PATH, pyfluent.EXAMPLES_PATH, args
)
return new_session(
_FluentConnection(
fluent_connection=_FluentConnection(
port=port,
cleanup_on_exit=cleanup_on_exit,
start_transcript=start_transcript,
Expand Down
21 changes: 9 additions & 12 deletions src/ansys/fluent/core/session.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,7 @@
import grpc

from ansys.fluent.core.fluent_connection import _FluentConnection
from ansys.fluent.core.services.datamodel_tui import (
DatamodelService as DatamodelService_TUI,
)
from ansys.fluent.core.services.datamodel_tui import TUIMenuGeneric
from ansys.fluent.core.services.settings import SettingsService
from ansys.fluent.core.session_base_meshing import _BaseMeshing
from ansys.fluent.core.session_shared import _CODEGEN_MSG_TUI
from ansys.fluent.core.solver.flobject import get_root as settings_get_root
Expand Down Expand Up @@ -235,9 +231,7 @@ def __init__(
self._datamodel_service_tui = self.fluent_connection.datamodel_service_tui
self._settings_service = self.fluent_connection.settings_service

self.solver = Session.Solver(
self._datamodel_service_tui, self._settings_service
)
self.solver = Session.Solver(self.fluent_connection)

@classmethod
def create_from_server_info_file(
Expand Down Expand Up @@ -320,15 +314,18 @@ def __dir__(self):
)

class Solver:
def __init__(
self, tui_service: DatamodelService_TUI, settings_service: SettingsService
):
self._tui_service = tui_service
self._settings_service = settings_service
def __init__(self, fluent_connection: _FluentConnection):
self._fluent_connection = fluent_connection
self._tui_service = fluent_connection.datamodel_service_tui
self._settings_service = fluent_connection.settings_service
self._tui = None
self._settings_root = None
self._version = None

def get_fluent_version(self):
"""Gets and returns the fluent version."""
return self._fluent_connection.get_fluent_version()

@property
def version(self):
if self._version is None:
Expand Down
9 changes: 9 additions & 0 deletions tests/test_session.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from ansys.api.fluent.v0 import health_pb2, health_pb2_grpc
import ansys.fluent.core as pyfluent
from ansys.fluent.core import launch_fluent
from ansys.fluent.core.examples import download_file
from ansys.fluent.core.fluent_connection import _FluentConnection
from ansys.fluent.core.services.health_check import HealthCheckService
from ansys.fluent.core.session import _BaseSession
Expand Down Expand Up @@ -184,3 +185,11 @@ def test_execute_tui_commands(new_mesh_session, tmp_path=pyfluent.EXAMPLES_PATH)
os.remove(file_path)

assert returned


def test_old_style_session(with_launching_container):
session = pyfluent.launch_fluent()
case_path = download_file("mixing_elbow.cas.h5", "pyfluent/mixing_elbow")
session.solver.root.file.read(file_type="case", file_name=case_path)
session.solver.tui.report.system.sys_stats()
session.exit()