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

Revert #554 and require fenicsadapter 2.2.0 to fix subcycling #578

Merged
merged 6 commits into from
Nov 7, 2024
Merged

Revert #554 and require fenicsadapter 2.2.0 to fix subcycling #578

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d8e6a29
revert changes
NiklasVin Oct 22, 2024
0495678
Merge branch 'precice:develop' into i573
NiklasVin Oct 22, 2024
4319fce
Remove changelog entry
NiklasVin Oct 22, 2024
46c7d2b
Merge branch 'i573' of github.com:NiklasVin/tutorials into i573
NiklasVin Oct 22, 2024
804175c
Require fenicsprecice==2.2.0rc1 to avoid subcycling bug.
BenjaminRodenberg Oct 25, 2024
53fea5c
Update perpendicular-flap/solid-fenics/requirements.txt
BenjaminRodenberg Nov 4, 2024
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
1 change: 0 additions & 1 deletion changelog-entries/554.md
View file
Open in desktop

This file was deleted.

15 changes: 9 additions & 6 deletions perpendicular-flap/solid-fenics/solid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,14 +158,16 @@ def update_v(a, u_old, v_old, a_old, ufl=True):
def update_fields(u, u_old, v_old, a_old):
"""Update all fields at the end of a timestep."""

u_vec, u0_vec = u.vector(), u_old.vector()
v0_vec, a0_vec = v_old.vector(), a_old.vector()

# call update functions
a_new = update_a(u, u_old, v_old, a_old)
v_new = update_v(u, u_old, v_old, a_old)
a_vec = update_a(u_vec, u0_vec, v0_vec, a0_vec, ufl=False)
v_vec = update_v(a_vec, u0_vec, v0_vec, a0_vec, ufl=False)

# update values
a_old.assign(project(a_new, V))
v_old.assign(project(v_new, V))
u_old.assign(u)
# assign u->u_old
v_old.vector()[:], a_old.vector()[:] = v_vec, a_vec
u_old.vector()[:] = u.vector()


def avg(x_old, x_new, alpha):
Expand Down Expand Up @@ -236,6 +238,7 @@ def avg(x_old, x_new, alpha):
n = n_cp
else:
update_fields(u_np1, u_n, v_n, a_n)
u_n.assign(u_np1)
t += float(dt)
n += 1

Expand Down