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

Adapter precice 3.1 with 3D support and "point load" #26

Open
wants to merge 29 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
dbe3513
first commit
efirvida Jul 16, 2024
d91859b
First Release
efirvida Jul 26, 2024
f2fed88
Add turek-hron calculix
efirvida Jul 28, 2024
21e9034
refactor Tutorials
efirvida Jul 29, 2024
da285ff
add breaking-dam-2d tutorial
efirvida Jul 30, 2024
11a3e7b
rename perpendicular-flap tutorial folder
efirvida Jul 30, 2024
e91af7c
add elastic-tube-3d tutorial
efirvida Jul 30, 2024
58a0db9
remove old test
efirvida Jul 30, 2024
80380a5
Refactor Adapter solvers
efirvida Jul 31, 2024
452f027
Fix fluid domain tower stl mesh
efirvida Jul 31, 2024
844c9b4
Add flow-over-heated-plate tutorial first commit
efirvida Jul 31, 2024
fa29673
cht
efirvida Aug 1, 2024
5695abf
Store states as dynamic list of states
efirvida Aug 5, 2024
9a15064
Refactor adapter to use legacy class architecture
efirvida Aug 5, 2024
cbbc826
Add perpendicular flap tutorial
efirvida Aug 9, 2024
fc02757
Revert trivial changes.
BenjaminRodenberg Nov 26, 2024
8da8e15
Revert some more trivial changes.
BenjaminRodenberg Nov 26, 2024
45affcc
Revert changes related to versioneer.
BenjaminRodenberg Nov 26, 2024
d90736d
Revert some more changes and reduce diff.
BenjaminRodenberg Nov 26, 2024
55b5496
Merge branch 'develop' into efirvida_develop
BenjaminRodenberg Nov 26, 2024
867917a
Add and apply autopep8.
BenjaminRodenberg Nov 26, 2024
e94d5b7
Add linters again.
BenjaminRodenberg Nov 26, 2024
4aebb55
Add dockerfile again (removing it was unrelated to PR).
BenjaminRodenberg Nov 26, 2024
de46fbf
Add tests and CI again.
BenjaminRodenberg Nov 26, 2024
74eedce
Merge branch 'develop' into efirvida_develop
BenjaminRodenberg Nov 26, 2024
ac4a620
Move case.
BenjaminRodenberg Nov 26, 2024
8242c91
Merge branch 'develop' into efirvida_develop
BenjaminRodenberg Nov 26, 2024
6d1c52f
Merge branch 'develop' into efirvida_develop
BenjaminRodenberg Nov 26, 2024
3be54df
Merge branch 'develop' into efirvida_develop
BenjaminRodenberg Nov 26, 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
2 changes: 1 addition & 1 deletion LICENSE → LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -162,4 +162,4 @@ General Public License ever published by the Free Software Foundation.
whether future versions of the GNU Lesser General Public License shall
apply, that proxy's public statement of acceptance of any version is
permanent authorization for you to choose that version for the
Library.
Library.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets not change the license file. Can you please keep the original file?

2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1 @@
fenicsxprecice/_version.py export-subst
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as the license file.

fenicsxprecice/_version.py export-subst
44 changes: 0 additions & 44 deletions .github/workflows/build-and-test.yml
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should keep the build and test CI, hence we need this file, and the Action to pass.

This file was deleted.

47 changes: 0 additions & 47 deletions .github/workflows/build-docker.yml
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to keep this CI.

This file was deleted.

14 changes: 0 additions & 14 deletions .github/workflows/check-links.yml
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as other CI related files. Let us keep this file to keep the check.

This file was deleted.

14 changes: 0 additions & 14 deletions .github/workflows/check-markdown.yml
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as other CI related files. Let us keep this file to keep the check.

This file was deleted.

15 changes: 0 additions & 15 deletions .github/workflows/check-pep8.yml
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as other CI related files. Let us keep this file to keep the check.

This file was deleted.

35 changes: 0 additions & 35 deletions .github/workflows/run-tutorials.yml
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets keep this file. It is okay if the tutorial CI fails for now. Eventually when we move the case to the precice/tutorials repository, the CI will pass again.

This file was deleted.

2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ dist
.idea
*.pyc
.eggs/
.vscode
.venv
20 changes: 10 additions & 10 deletions .markdown-link-check-config.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"aliveStatusCodes": [429, 200, 0],
"ignorePatterns": [
{
"pattern": "^https://openfoamwiki.net/"
},
{
"pattern": "^https://doi.org/"
}
]
}
"aliveStatusCodes": [429, 200, 0],
"ignorePatterns": [
{
"pattern": "^https://openfoamwiki.net/"
},
{
"pattern": "^https://doi.org/"
}
]
}
2 changes: 1 addition & 1 deletion .markdownlint.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"MD013": false,
"MD033": false
}
}
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

## current development

* Forked initial version of this adapter from [`precice/[email protected]`](https://github.com/precice/fenics-adapter/releases/tag/v1.2.0).
* Forked initial version of this adapter from [`precice/[email protected]`](https://github.com/precice/fenics-adapter/releases/tag/v1.2.0).
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure what the change is here. Please add a separate CHANGELOG entry describing the changes introduced in this pull request.

2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
include versioneer.py
include fenicsxprecice/_version.py
include fenicsxprecice/_version.py
9 changes: 6 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ Notes:

* This adapter is a fork from the original [FEniCS-preCICE adapter](https://github.com/precice/fenics-adapter). Based on [v1.2.0](https://github.com/precice/fenics-adapter/releases/tag/v1.2.0).
* This adapter is currently under development and experimental.
* Target version: dolfinx v0.5.2. Other version that have been tested and might also work: v0.4.1
* Target version: dolfinx v0.8.0.
* Target version: preCICE v3.

## Installing the package

Expand All @@ -40,11 +41,11 @@ This should work out of the box, if all dependencies are installed correctly and

Make sure to install the following dependencies:

* [preCICE](https://github.com/precice/precice/wiki)
* [preCICE v3](https://github.com/precice/precice/wiki)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
* [preCICE v3](https://github.com/precice/precice/wiki)
* [preCICE](https://precice.org/)

* python3 (this adapter **only supports python3**)
* [the python language bindings for preCICE](https://github.com/precice/python-bindings)
* :construction: [FEniCSx](https://fenicsproject.org/) (with python interface, installed by default) (under construction refer to notes on FEniCSx below) :construction:
* and scipy (`pip3 install scipy`)

Comment on lines -47 to +48
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We no longer need scipy?


#### Build and install the adapter

Expand Down Expand Up @@ -91,3 +92,5 @@ If you are using FEniCSx, please also consider the information on [the official
2021: For development of FEniCSx support, `precice/[email protected]` was forked as `precice/fenicsx-adapter`. The required modifications were carried out by [Benjamin Rodenberg](https://www.cs.cit.tum.de/sccs/personen/benjamin-rodenberg/) and [Ishaan Desai](https://www.ipvs.uni-stuttgart.de/institute/team/Desai/).

2023: [Philip Hildebrand](https://github.com/PhilipHildebrand) updated the adapter to a first minimal working version (https://github.com/precice/fenicsx-adapter/pull/15) and contributed a first tutorial (https://github.com/precice/tutorials/pull/317) in the scope of his Bachelor's thesis ["Extending the FEniCSx Adapter for the Coupling Library preCICE"](https://mediatum.ub.tum.de/node?id=1706280) under supervision of [Benjamin Rodenberg](https://www.cs.cit.tum.de/sccs/personen/benjamin-rodenberg/) and [Ishaan Desai](https://www.ipvs.uni-stuttgart.de/institute/team/Desai/).

2024: [Eduardo Firvida](https://github.com/efirvida) updated the adapter to a minimal working version (https://github.com/precice/fenicsx-adapter/pull/26) with FSI and 3D support for preCICEv3. In the scope of his PhD Thesis.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
2024: [Eduardo Firvida](https://github.com/efirvida) updated the adapter to a minimal working version (https://github.com/precice/fenicsx-adapter/pull/26) with FSI and 3D support for preCICEv3. In the scope of his PhD Thesis.
2024: [Eduardo Firvida](https://github.com/efirvida) updated the adapter to support 3D FSI simulations and also made the adapter compatible with preCICE version 3 (https://github.com/precice/fenicsx-adapter/pull/26).

23 changes: 0 additions & 23 deletions docs/ReleaseGuide.md
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to keep the documentation.

This file was deleted.

3 changes: 2 additions & 1 deletion fenicsxprecice/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
warnings.warn("No FEniCSx installation found on system. Please check whether it is found correctly. "
"The FEniCSx adapter might not work as expected.\n\n")

from .fenicsxprecice import Adapter
from . import _version
from .fenicsxprecice import Adapter

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this reordering necessary?

__version__ = _version.get_versions()['version']
4 changes: 2 additions & 2 deletions fenicsxprecice/_version.py
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is generated by versioneer. Please revert the changes.

Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
"""Git implementation of _version.py."""

import errno
import functools
import os
import re
import subprocess
import sys
from typing import Any, Callable, Dict, List, Optional, Tuple
import functools


def get_keywords() -> Dict[str, str]:
Expand Down Expand Up @@ -162,7 +162,7 @@ def git_get_keywords(versionfile_abs: str) -> Dict[str, str]:
# _version.py.
keywords: Dict[str, str] = {}
try:
with open(versionfile_abs, "r") as fobj:
with open(versionfile_abs) as fobj:
for line in fobj:
if line.strip().startswith("git_refnames ="):
mo = re.search(r'=\s*"(.*)"', line)
Expand Down
Loading