Merge remote-tracking branch 'origin/zzqbranch'

Author: wenhuiuy

examples/ICFD/icfd_free_convection_flow.py

@@ -1,6 +1,6 @@
 """
-Thermal flow
-============
+Free convection flow
+====================
 
 This example shows a simple ICFD forced-convection input deck with a coarse mesh.
 The executable file for LS-DYNA is `` ls-dyna_smp_d_R13.1_138-g8429c8a10f_winx64_ifort190.exe``.

pyproject.toml

@@ -28,11 +28,11 @@ classifiers = [
 dependencies = ["ansys-dpf-core>=0.7.2",
                 "ansys-api-dyna==0.3.6",
                 "ansys-platform-instancemanagement~=1.0", 
+                "pyvista==0.43.4",
 ]
 
 [project.optional-dependencies]
 tests = [
-    "pyvista==0.43.4",
     "matplotlib==3.8.3",
     "numpy==1.26.4",
     "pytest==8.1.1",
@@ -49,7 +49,6 @@ doc = [
     "matplotlib==3.8.3",
     "imageio==2.34.0",
     "imageio-ffmpeg==0.4.9",
-    "pyvista==0.43.4",
     "numpydoc==1.6.0",
     "Sphinx==7.2.6",
     "sphinx-autobuild==2024.2.4",

src/ansys/dyna/core/pre/dynabase.py

@@ -274,6 +274,14 @@ def get_data(self) -> List:
         return None
 
 
+class ParameterType(Enum):
+    """Contains the parameter types."""
+
+    R = 1
+    I = 2
+    C = 3
+
+
 class DynaBase:
     """Contains methods for creating a general LS-DYNA keyword."""
 

src/ansys/dyna/core/pre/graphics/graphics.py

@@ -5,7 +5,7 @@
 
 import numpy as np
 import pyvista as pv
-from pyvista.plotting.plotting import Plotter
+from pyvista.plotting import Plotter
 import vtk
 
 import ansys.dyna.core.pre as pre
@@ -172,7 +172,7 @@ class Graphics(object):
         Whether to use the Trame visualizer. The default is ``False``.
     """
 
-    def __init__(self, model: pre.Model, use_trame: bool = False):
+    def __init__(self, model: pre.Model, use_trame: bool = False, view_position: str = "xy"):
         """Initialize graphics."""
         self._model = model
         self._display_data = {}
@@ -199,6 +199,7 @@ def __init__(self, model: pre.Model, use_trame: bool = False):
         self._viewLeftBt: vtk.vtkButtonWidget = None
         self._sphinx_build = defaults.get_sphinx_build()
         self._use_trame = use_trame
+        self._view_position = view_position
         self._init_velocity_data = []
         self._bdy_spc = []
         self._actor_init_velocity = None
@@ -631,12 +632,17 @@ def __draw_parts(self, parts: List = [], update: bool = False, spline: bool = Fa
     def _show_selector(self):
         """Chooses between using Trame or Python visualizer."""
         if self._use_trame:  # pragma: no cover
+            pv.set_jupyter_backend("server")
             visualizer = TrameVisualizer()
             visualizer.set_scene(self._plotter)
             visualizer.show()
         else:
-            self._plotter.camera_position = "xy"
-            self._plotter.show()
+            if self._view_position in ["xy", "xz", "yx", "yz", "zx", "zy"]:
+                pos = self._view_position
+            else:
+                pos = "xy"
+            self._plotter.camera_position = pos
+            self._plotter.show(jupyter_backend="static")
 
     def __update_bt_icons(self):
         """Update the icons on display."""
@@ -835,7 +841,7 @@ def add_to_plotter(self, plotter: Plotter):
             if self._type is DisplayMeshType.FACE:
                 surf = pv.PolyData(self._vertices, self._facet_list)
                 fcolor = np.array(self.get_face_color())
-                colors = np.tile(fcolor, (surf.n_faces, 1))
+                colors = np.tile(fcolor, (surf.n_cells, 1))
                 surf["colors"] = colors
                 surf.disp_mesh = self
                 self._poly_data = surf
@@ -847,7 +853,7 @@ def add_to_plotter(self, plotter: Plotter):
             elif self._type is DisplayMeshType.BEAM:
                 surf = pv.PolyData(self._vertices, lines=self._facet_list)
                 fcolor = np.array(self.get_face_color())
-                colors = np.tile(fcolor, (surf.n_faces, 1))
+                colors = np.tile(fcolor, (surf.n_cells, 1))
                 surf["colors"] = colors
                 surf.disp_mesh = self
                 self._poly_data = surf
@@ -861,7 +867,7 @@ def add_to_plotter(self, plotter: Plotter):
             ):
                 surf = self._mesh
                 fcolor = np.array(self.get_face_color())
-                colors = np.tile(fcolor, (surf.n_faces, 1))
+                colors = np.tile(fcolor, (surf.n_cells, 1))
                 surf["colors"] = colors
                 surf.disp_mesh = self
                 self._poly_data = surf
@@ -968,5 +974,5 @@ def set_color_by_type(self, type: ColorByType):
         if self._type == DisplayMeshType.FACE:
             if self._poly_data != None:
                 fcolor = np.array(self.get_face_color())
-                colors = np.tile(fcolor, (self._poly_data.n_faces, 1))
+                colors = np.tile(fcolor, (self._poly_data.n_cells, 1))
                 self._poly_data["colors"] = colors

src/ansys/dyna/core/pre/graphics/trame_gui.py

@@ -2,7 +2,8 @@
 try:
     from pyvista.trame.ui import plotter_ui
     from trame.app import get_server
-    from trame.ui.vuetify import SinglePageLayout
+    from trame.ui.vuetify3 import SinglePageLayout
+    from trame.widgets import vuetify3
 
     _HAS_TRAME = True
 
@@ -18,7 +19,7 @@ def __init__(self) -> None:
         if not _HAS_TRAME:  # pragma: no cover
             raise ModuleNotFoundError("The package 'pyvista[trame]' is required to use this function.")
 
-        self.server = get_server()
+        self.server = get_server(client_type="vue3")
         self.state, self.ctrl = self.server.state, self.server.controller
 
     def set_scene(self, plotter):
@@ -31,16 +32,17 @@ def set_scene(self, plotter):
         plotter : pv.Plotter
             PyVista plotter to render the mesh.
         """
-        self.state.trame__title = "PyPrime Viewer"
+        self.state.trame__title = "PyDYNA Viewer"
 
         with SinglePageLayout(self.server) as layout:
             layout.icon.click = self.ctrl.view_reset_camera
-            layout.title.set_text("PyPrime")
+            layout.title.set_text("PyDYNA")
 
             with layout.content:
-                # Use PyVista UI template for Plotters
-                view = plotter_ui(plotter)
-                self.ctrl.view_update = view.update
+                with vuetify3.VContainer(fluid=True, classes="pa-0 fill-height"):
+                    # Use PyVista UI template for Plotters
+                    view = plotter_ui(plotter)
+                    self.ctrl.view_update = view.update
 
             # hide footer with trame watermark
             layout.footer.hide()

src/ansys/dyna/core/pre/launcher.py

@@ -3,6 +3,7 @@
 import os
 import socket
 import subprocess
+import sys
 import threading
 from time import sleep
 from zipfile import ZipFile
@@ -74,6 +75,17 @@ def port_in_use(port, host=LOCALHOST):
             return True
 
 
+def get_virtualenv_path():
+    """Get the virtual environment path."""
+
+    python_executable_path = sys.executable
+    if hasattr(sys, "real_prefix"):
+        virtual_env_path = sys.prefix
+    else:
+        virtual_env_path = os.path.dirname(python_executable_path)
+    return virtual_env_path
+
+
 def launch_grpc(port=DYNAPRE_DEFAULT_PORT, ip=LOCALHOST, server_path="") -> tuple:  # pragma: no cover
     """
     Launch the pre service locally in gRPC mode.
@@ -123,6 +135,7 @@ def launch_grpc(port=DYNAPRE_DEFAULT_PORT, ip=LOCALHOST, server_path="") -> tupl
             # threadserver.run()
             # threadserver.setDaemon(True)
             # threadserver.start()
+            # env_path = get_virtualenv_path()
             process = subprocess.Popen("python kwserver.py", cwd=server_path, shell=True)
             waittime = 0
             while not DynaSolution.grpc_local_server_on():