Skip to content

Commit 1cfbe35

Browse files
author
aradermacher
committed
Merge branch '161-dolfinx09' of https://github.com/BAMresearch/FenicsXConcrete into 161-dolfinx09
2 parents aadeb16 + 104940e commit 1cfbe35

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

src/fenicsxconcrete/finite_element_problem/concrete_am_fc.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,7 @@ def setup(self) -> None:
161161

162162
# define problem:
163163
self.mechanics_problem = ProblemAM(
164-
law, self.fields.displacement, bcs, body_force_fct, q_degree=self.p["q_degree"], del_t=self.p["dt"]
165-
)
164+
law, self.fields.displacement, bcs, body_force_fct, q_degree=self.p["q_degree"], del_t=self.p["dt"])
166165
self.mechanics_problem._time = self.p["dt"]
167166

168167
# additional output fields

src/fenicsxconcrete/finite_element_problem/fenics_constitutive.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ def setup(self) -> None:
127127

128128
# problem
129129
self.mechanics_problem = IncrSmallStrainProblem(
130-
law, self.fields.displacement, bcs, q_degree=self.p["q_degree"]
130+
law, self.fields.displacement, bcs, self.p["q_degree"], del_t=self.p["dt"]
131131
)
132132
# add external force and body force not implemented in IncrSmallStrainProblem
133133
v = ufl.TestFunction(self.V)

tests/finite_element_problem/material_for_am_fc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def evaluate(
9797
raise ValueError("factor must be a float, int, or np.ndarray")
9898

9999
@property
100-
def constraint(self) -> Constraint:
100+
def constraint(self) -> StressStrainConstraint:
101101
return self._constraint
102102

103103
@property

0 commit comments

Comments
 (0)