diff --git a/examples/scripts/animate_glb.py b/examples/scripts/animate_glb.py index 9aa4de351..bbacfca5c 100644 --- a/examples/scripts/animate_glb.py +++ b/examples/scripts/animate_glb.py @@ -1,4 +1,3 @@ - import numpy as np from pyquaternion import Quaternion diff --git a/src/ada/base/physical_objects.py b/src/ada/base/physical_objects.py index 39f3c7e18..0398398ab 100644 --- a/src/ada/base/physical_objects.py +++ b/src/ada/base/physical_objects.py @@ -174,9 +174,9 @@ def show( from itertools import groupby import trimesh - from ada.visit.comms import start_ws_server from ada.occ.tessellating import BatchTessellator + from ada.visit.comms import start_ws_server from ada.visit.gltf.optimize import concatenate_stores from ada.visit.gltf.store import merged_mesh_to_trimesh_scene diff --git a/src/ada/calc/beams.py b/src/ada/calc/beams.py index bb2fbff6c..8a40c3f56 100644 --- a/src/ada/calc/beams.py +++ b/src/ada/calc/beams.py @@ -6,8 +6,6 @@ from ada.core.utils import Counter from ada.visit.plots import easy_plotly -from .utils import equation_compiler - class ResType: displ = "DISPL" @@ -79,12 +77,18 @@ def add_point_load(self, p, x, name=None, use_relative_position=True): self._p.append((name, p, x, use_relative_position)) def get_displ_formula(self): + from .utils import equation_compiler + return equation_compiler(displ, True) def get_shear_formula(self): + from .utils import equation_compiler + return equation_compiler(shear, True) def get_moment_formula(self): + from .utils import equation_compiler + return equation_compiler(moment, True) def _repr_html_(self): diff --git a/src/ada/fem/results/common.py b/src/ada/fem/results/common.py index e82eb142a..571447ab4 100644 --- a/src/ada/fem/results/common.py +++ b/src/ada/fem/results/common.py @@ -11,14 +11,14 @@ import numpy as np from ada.config import logger +from ada.core.guid import create_guid from ada.fem.formats.general import FEATypes from ada.fem.shapes.definitions import LineShapes, MassTypes, ShellShapes, SolidShapes - -from ada.core.guid import create_guid from ada.visit.comms import send_to_viewer from ada.visit.gltf.graph import GraphNode, GraphStore from ada.visit.gltf.meshes import GroupReference, MergedMesh, MeshType from ada.visit.rendering.renderer_react import RendererReact + from .field_data import ElementFieldData, NodalFieldData, NodalFieldType if TYPE_CHECKING: @@ -456,12 +456,12 @@ def show( scene = trimesh.Scene() face_node = scene.add_geometry(faces_mesh, node_name=self.name, geom_name="faces") - edge_node = scene.add_geometry( + _ = scene.add_geometry( edge_mesh, node_name=f"{self.name}_edges", geom_name="edges", parent_node_name=self.name ) face_node_idx = [i for i, n in enumerate(scene.graph.nodes) if n == face_node][0] - edge_node_idx = [i for i, n in enumerate(scene.graph.nodes) if n == edge_node][0] + # edge_node_idx = [i for i, n in enumerate(scene.graph.nodes) if n == edge_node][0] # Start the websocket server ws = start_ws_server(server_exe=server_exe, server_args=server_args, host=host, port=port) diff --git a/tests/full/calculations/test_calc_jupyter.py b/tests/full/calculations/test_calc_jupyter.py index 9c8819043..42e46c882 100644 --- a/tests/full/calculations/test_calc_jupyter.py +++ b/tests/full/calculations/test_calc_jupyter.py @@ -1,3 +1,4 @@ + from ada import Beam from ada.calc.beams import BeamCalc @@ -7,12 +8,13 @@ def test_basic_udl_in_jupyter(): udl = BeamCalc(bm) udl.add_distributed_load(-1e3) - displ_latex = udl.get_displ_formula() - shear_latex = udl.get_shear_formula() - moment_latex = udl.get_moment_formula() - - assert displ_latex == "$$\\frac{w x \\left(L^3-2L x^2+x^3\\right)}{24E I}$$" - assert moment_latex == "$$\\frac{w x \\left(L-x\\right)}{2}$$" - assert shear_latex == "$$w \\left(\\frac{L}{2}-x\\right)$$" - - udl._repr_html_() + # This is only applicable if your have pytexit installed (which is no longer a dependency) + # displ_latex = udl.get_displ_formula() + # shear_latex = udl.get_shear_formula() + # moment_latex = udl.get_moment_formula() + # + # assert displ_latex == "$$\\frac{w x \\left(L^3-2L x^2+x^3\\right)}{24E I}$$" + # assert moment_latex == "$$\\frac{w x \\left(L-x\\right)}{2}$$" + # assert shear_latex == "$$w \\left(\\frac{L}{2}-x\\right)$$" + # + # udl._repr_html_()