From 09fafe5148ed735acfb50b7894f3703913a24cfb Mon Sep 17 00:00:00 2001 From: Mainak Kundu Date: Tue, 16 Jan 2024 21:46:36 +0530 Subject: [PATCH] svar refactoring --- src/ansys/fluent/core/services/__init__.py | 3 +++ src/ansys/fluent/core/session_solver.py | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/ansys/fluent/core/services/__init__.py b/src/ansys/fluent/core/services/__init__.py index d2f8dc8a69ad..47de9ac7209f 100644 --- a/src/ansys/fluent/core/services/__init__.py +++ b/src/ansys/fluent/core/services/__init__.py @@ -8,6 +8,7 @@ from ansys.fluent.core.services.monitor import MonitorsService from ansys.fluent.core.services.scheme_eval import SchemeEval from ansys.fluent.core.services.settings import SettingsService +from ansys.fluent.core.services.svar import SVARData, SVARService _service_cls_by_name = { "datamodel": DatamodelService_SE, @@ -17,6 +18,8 @@ "field_data": FieldData, "field_info": FieldInfo, "monitors": MonitorsService, + "svar": SVARService, + "svar_data": SVARData, } diff --git a/src/ansys/fluent/core/session_solver.py b/src/ansys/fluent/core/session_solver.py index 620544b5a8bb..89e0b9486072 100644 --- a/src/ansys/fluent/core/session_solver.py +++ b/src/ansys/fluent/core/session_solver.py @@ -8,10 +8,11 @@ import threading from typing import Any, Optional +from ansys.fluent.core.services import service_creator from ansys.fluent.core.services.datamodel_se import PyMenuGeneric 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.services.svar import SVARData, SVARInfo 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 import flobject @@ -95,7 +96,9 @@ def _build_from_fluent_connection(self, fluent_connection): self._settings_root = None self._version = None self._lck = threading.Lock() - self.svar_service = self.fluent_connection.create_grpc_service(SVARService) + self.svar_service = service_creator("svar").create( + fluent_connection._channel, fluent_connection._metadata + ) self.svar_info = SVARInfo(self.svar_service) self._reduction_service = self.fluent_connection.create_grpc_service( ReductionService, self.error_state @@ -113,7 +116,7 @@ def build_from_fluent_connection(self, fluent_connection): @property def svar_data(self) -> SVARData: """Return the SVARData handle.""" - return SVARData(self.svar_service, self.svar_info) + return service_creator("svar_data").create(self.svar_service, self.svar_info) @property def version(self):