Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Result.plot(name=None): Plot only the undeformed mesh #462

Merged
merged 1 commit into from
Apr 25, 2023
Merged

Result.plot(name=None): Plot only the undeformed mesh #462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
147 changes: 79 additions & 68 deletions src/felupe/tools/_plot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class Scene:

def plot(
self,
name,
name=None,
component=0,
label=None,
factor=1.0,
Expand All @@ -59,8 +59,8 @@ def plot(

Parameters
----------
name: str
Name of array of scalars to plot.
name: str or None, optional
Name of array of scalars to plot (default is None).
component : int, optional
Component of vector-valued scalars to plot (default is 0).
label : str or None, optional
Expand Down Expand Up @@ -112,73 +112,84 @@ def plot(
if scalar_bar_args is None:
scalar_bar_args = {}

if name in self.mesh.point_data.keys():
data = self.mesh.point_data[name]
else:
data = self.mesh.cell_data[name]

dim = 1

if len(data.shape) == 2:
dim = data.shape[1]

if label is None:
data_label = name

component_labels_dict = {
1: [""],
2: ["X", "Y"],
3: ["X", "Y", "Z"],
6: ["XX", "YY", "ZZ", "XY", "YZ", "XZ"],
9: [
"XX",
"XY",
"XZ",
"YX",
"YY",
"YZ",
"ZX",
"ZY",
"ZZ",
],
}

if "Principal Values of " in name:
component_labels_dict[2] = [
"(Max. Principal)",
"(Min. Principal)",
]
component_labels_dict[3] = [
"(Max. Principal)",
"(Int. Principal)",
"(Min. Principal)",
]
data_label = data_label[20:]

component_labels = np.arange(dim)
if dim in component_labels_dict.keys():
component_labels = component_labels_dict[dim]

component_label = component_labels[component]
label = f"{data_label} {component_label}"
if name is not None:
if name in self.mesh.point_data.keys():
data = self.mesh.point_data[name]
else:
data = self.mesh.cell_data[name]

dim = 1

if len(data.shape) == 2:
dim = data.shape[1]

if label is None:
data_label = name

component_labels_dict = {
1: [""],
2: ["X", "Y"],
3: ["X", "Y", "Z"],
6: ["XX", "YY", "ZZ", "XY", "YZ", "XZ"],
9: [
"XX",
"XY",
"XZ",
"YX",
"YY",
"YZ",
"ZX",
"ZY",
"ZZ",
],
}

if "Principal Values of " in name:
component_labels_dict[2] = [
"(Max. Principal)",
"(Min. Principal)",
]
component_labels_dict[3] = [
"(Max. Principal)",
"(Int. Principal)",
"(Min. Principal)",
]
data_label = data_label[20:]

component_labels = np.arange(dim)
if dim in component_labels_dict.keys():
component_labels = component_labels_dict[dim]

component_label = component_labels[component]
label = f"{data_label} {component_label}"

if show_undeformed:
plotter.add_mesh(self.mesh, show_edges=False, opacity=0.2)

plotter.add_mesh(
mesh=self.mesh.warp_by_vector("Displacement", factor=factor),
scalars=name,
component=component,
show_edges=show_edges,
cmap=cmap,
scalar_bar_args={
"title": label,
"interactive": True,
"vertical": scalar_bar_vertical,
**scalar_bar_args,
},
**kwargs,
)
show_edges_undeformed = False
opacity_undeformed = 0.2

if name is None:
show_edges_undeformed = show_edges
opacity_undeformed = None

plotter.add_mesh(
self.mesh, show_edges=show_edges_undeformed, opacity=opacity_undeformed
)

if name is not None:
plotter.add_mesh(
mesh=self.mesh.warp_by_vector("Displacement", factor=factor),
scalars=name,
component=component,
show_edges=show_edges,
cmap=cmap,
scalar_bar_args={
"title": label,
"interactive": True,
"vertical": scalar_bar_vertical,
**scalar_bar_args,
},
**kwargs,
)

if view == "default":

Expand Down
15 changes: 15 additions & 0 deletions tests/test_plot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,23 @@ def test_point_data():
pass


def test_model():

try:
mesh, field = pre(n=3)
result = fem.Result(field)
plotter = result.plot(
off_screen=True,
)
# plotter.show(screenshot="undeformed.png")

except ModuleNotFoundError:
pass


if __name__ == "__main__":
test_xdmf_cell_data()
test_xdmf_point_data()
test_cell_data()
test_point_data()
test_model()