Skip to content

Commit

Permalink
Formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
Krande committed May 11, 2021
1 parent 441feab commit 118bdc0
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 11 deletions.
12 changes: 8 additions & 4 deletions src/ada/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -964,8 +964,10 @@ def __repr__(self):
nshps = len(self.shapes) + len([shp for p in self.get_all_subparts() for shp in p.shapes])
nels = len(self.fem.elements) + len([el for p in self.get_all_subparts() for el in p.fem.elements])
nnodes = len(self.fem.nodes) + len([no for p in self.get_all_subparts() for no in p.fem.nodes])
return f'Part("{self.name}": Beams: {nbms}, Plates: {npls}, ' \
f'Pipes: {npipes}, Shapes: {nshps}, Elements: {nels}, Nodes: {nnodes})'
return (
f'Part("{self.name}": Beams: {nbms}, Plates: {npls}, '
f"Pipes: {npipes}, Shapes: {nshps}, Elements: {nels}, Nodes: {nnodes})"
)


class Assembly(Part):
Expand Down Expand Up @@ -1498,8 +1500,10 @@ def __repr__(self):
npipes = len(self.pipes) + len([pl for p in self.get_all_subparts() for pl in p.pipes])
nels = len(self.fem.elements) + len([el for p in self.get_all_subparts() for el in p.fem.elements])
nns = len(self.fem.nodes) + len([no for p in self.get_all_subparts() for no in p.fem.nodes])
return f'Assembly("{self.name}": Beams: {nbms}, Plates: {npls}, Pipes: {npipes}, ' \
f'Shapes: {nshps}, Elements: {nels}, Nodes: {nns})'
return (
f'Assembly("{self.name}": Beams: {nbms}, Plates: {npls}, Pipes: {npipes}, '
f"Shapes: {nshps}, Elements: {nels}, Nodes: {nns})"
)


class Beam(BackendGeom):
Expand Down
6 changes: 3 additions & 3 deletions src/ada/base/render_fem.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import pathlib

import numpy as np
from IPython.display import clear_output, display
from IPython.display import display
from ipywidgets import Dropdown, HBox, VBox

from .common import (
Expand Down Expand Up @@ -199,8 +199,8 @@ def _viz_geom(self, data_type, displ_data=False, renderer=None):
def on_changed_point_data_set(self, p):
data = p["new"]
if self._analysis_type == "code_aster":
if 'point_tags' in data:
print("\r" + f'Point Tags are not a valid display value'+10*' ', end="")
if "point_tags" in data:
print("\r" + "Point Tags are not a valid display value" + 10 * " ", end="")
return None
if "DISP" in data:
self._viz_geom(data, displ_data=True, renderer=self.renderer)
Expand Down
8 changes: 4 additions & 4 deletions src/ada/base/renderer.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import logging
import uuid
from itertools import chain
import more_itertools
from random import randint

import more_itertools
import numpy as np
from OCC.Core.Tesselator import ShapeTesselator
from OCC.Display.WebGl.jupyter_renderer import (
Expand All @@ -29,8 +29,6 @@

__all__ = ["MyRenderer", "SectionRenderer"]

import ada.fem


class MyRenderer(JupyterRenderer):
"""
Expand Down Expand Up @@ -743,7 +741,9 @@ def _on_changed_fem_set(self, p):
color = (1, 0, 0)
if setref in fem.elsets.keys():
fem_set = fem.elsets[setref]
set_edges_nodes = list(chain.from_iterable(filter(None, [grab_nodes(el, fem, True) for el in fem_set.members])))
set_edges_nodes = list(
chain.from_iterable(filter(None, [grab_nodes(el, fem, True) for el in fem_set.members]))
)

res1 = [list(more_itertools.locate(edges_nodes, lambda a: a == i)) for i in set_edges_nodes]
set_edges_indices = chain.from_iterable(res1)
Expand Down

0 comments on commit 118bdc0

Please sign in to comment.