restructuring

ansys · Oct 21, 2024 · 01201b1 · 01201b1
1 parent 6d9a491
commit 01201b1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/src/ansys/fluent/core/__init__.py b/src/ansys/fluent/core/__init__.py
@@ -82,9 +82,6 @@ def version_info() -> str:
     platformdirs.user_documents_dir(), "ansys_fluent_core_examples"
 )
 
-# Working directory for the Fluent client
-CWD = None
-
 # Host path which is mounted to the container
 CONTAINER_MOUNT_SOURCE = None
 

diff --git a/src/ansys/fluent/core/fluent_connection.py b/src/ansys/fluent/core/fluent_connection.py
@@ -19,6 +19,7 @@
 import psutil
 
 import ansys.fluent.core as pyfluent
+from ansys.fluent.core.launcher.error_handler import _check_license
 from ansys.fluent.core.services import service_creator
 from ansys.fluent.core.services.scheme_eval import SchemeEvalService
 from ansys.fluent.core.utils.execution import timeout_exec, timeout_loop
@@ -382,7 +383,10 @@ def __init__(
         # throws, we should not proceed.
         # TODO: Show user-friendly error message.
         if pyfluent.CHECK_HEALTH:
-            self.health_check.check_health()
+            try:
+                self.health_check.check_health()
+            except RuntimeError:
+                _check_license()
 
         self._slurm_job_id = slurm_job_id
 

diff --git a/src/ansys/fluent/core/launcher/launcher.py b/src/ansys/fluent/core/launcher/launcher.py
@@ -264,9 +264,6 @@ def launch_fluent(
     if env is None:
         env = {}
 
-    if cwd:
-        pyfluent.CWD = cwd
-
     def _mode_to_launcher_type(fluent_launch_mode: LaunchMode):
         launcher_mode_type = {
             LaunchMode.CONTAINER: DockerLauncher,

diff --git a/src/ansys/fluent/core/services/interceptors.py b/src/ansys/fluent/core/services/interceptors.py
@@ -8,7 +8,6 @@
 from google.protobuf.message import Message
 import grpc
 
-from ansys.fluent.core.launcher.error_handler import _check_license
 from ansys.fluent.core.services.batch_ops import BatchOps
 
 network_logger: logging.Logger = logging.getLogger("pyfluent.networking")
@@ -110,8 +109,7 @@ def _intercept_call(
             grpc_ex = response.exception()
             ex = RuntimeError(grpc_ex.details())
             ex.__context__ = grpc_ex
-            if not _check_license():
-                raise ex from None
+            raise ex from None
         return response
 
     def intercept_unary_unary(