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.

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

Add string representations for Region and FieldContainer #432

Merged
merged 1 commit into from
Apr 7, 2023
Merged
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -3,6 +3,9 @@ All notable changes to this project will be documented in this file. The format

## [Unreleased]

### Added
- Add string representations for `Region` and `FieldContainer.`

## [7.0.0] - 2023-04-07

### Added
11 changes: 11 additions & 0 deletions src/felupe/_field/_container.py
Original file line number Diff line number Diff line change
@@ -42,6 +42,17 @@ def __init__(self, fields):
self.fieldsizes = [f.indices.dof.size for f in self.fields]
self.offsets = np.cumsum(self.fieldsizes)[:-1]

def __repr__(self):
header = "<felupe FieldContainer object>"
size = f" Number of fields: {len(self.fields)}"
fields_header = " Dimension of fields:"
fields = [
f" {type(field).__name__}: {field.dim}"
for a, field in enumerate(self.fields)
]

return "\n".join([header, size, fields_header, *fields])

def extract(self, grad=True, sym=False, add_identity=True):
"""Generalized extraction method which evaluates either the gradient
or the field values at the integration points of all cells
2 changes: 1 addition & 1 deletion src/felupe/mesh/_mesh.py
Original file line number Diff line number Diff line change
@@ -81,7 +81,7 @@ def __init__(self, points, cells, cell_type=None):
self.__mesh__ = Mesh

def __repr__(self):
header = "<felupe mesh object>"
header = "<felupe Mesh object>"
points = f" Number of points: {len(self.points)}"
cells_header = " Number of cells:"
cells = [f" {self.cell_type}: {self.ncells}"]
8 changes: 8 additions & 0 deletions src/felupe/region/_region.py
Original file line number Diff line number Diff line change
@@ -122,3 +122,11 @@ def __init__(self, mesh, element, quadrature, grad=True):
# Partial derivative of element shape function
# w.r.t. undeformed coordinates
self.dhdX = np.einsum("aIpc,IJpc->aJpc", self.dhdr, self.drdX)

def __repr__(self):
header = "<felupe Region object>"
element = f" Element formulation: {type(self.element).__name__}"
quadrature = f" Quadrature rule: {type(self.quadrature).__name__}"
grad = f" Gradient evaluated: {hasattr(self, 'dV')}"

return "\n".join([header, element, quadrature, grad])
5 changes: 5 additions & 0 deletions tests/test_field.py
Original file line number Diff line number Diff line change
@@ -39,6 +39,7 @@ def pre(values=0):
r = fe.Region(m, e, q)
u = fe.Field(r, dim=3, values=values)
v = fe.FieldContainer([u])

return r, v


@@ -52,6 +53,8 @@ def pre_axi():
u = fe.FieldAxisymmetric(r)
v = fe.FieldContainer([u])

print(m), print(r), print(v)

return r, v


@@ -69,6 +72,8 @@ def pre_mixed():
f = fe.FieldContainer((u, p, J))
g = fe.FieldsMixed(fe.RegionHexahedron(m), n=3)

print(m), print(r), print(f)

u.values[0] = np.ones(3)
assert np.all(f.values()[0][0] == 1)
assert len(g.fields) == 3