Skip to content

Commit 4584766

Browse files
committed
Merge branch 'master' into precice-v3
2 parents c8740c3 + 936b8ac commit 4584766

31 files changed

+322
-31
lines changed

.gitmodules

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,11 @@
1010
path = imported/aste
1111
url = https://github.com/precice/aste.git
1212
branch = develop
13+
[submodule "imported/micro-manager"]
14+
path = imported/micro-manager
15+
url = https://github.com/precice/micro-manager.git
16+
branch = develop
17+
[submodule "imported/fmi-runner"]
18+
path = imported/fmi-runner
19+
url = https://github.com/precice/fmi-runner
20+
branch = develop

.markdownlint.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
22
"MD013": false,
3-
"MD033": false
4-
}
3+
"MD033": false,
4+
"MD034": false
5+
}

_config.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,30 @@ defaults:
149149
topnav: topnav
150150
toc: true
151151
github_editme_path: https://github.com/precice/aste/edit/develop/ # ends in /
152+
-
153+
scope:
154+
path: "imported/micro-manager/"
155+
type: "pages"
156+
values:
157+
layout: "page"
158+
comments: false
159+
search: true
160+
sidebar: docs_sidebar
161+
topnav: topnav
162+
toc: true
163+
github_editme_path: https://github.com/precice/micro-manager/edit/develop/ # ends in /
164+
-
165+
scope:
166+
path: "imported/fmi-runner/"
167+
type: "pages"
168+
values:
169+
layout: "page"
170+
comments: false
171+
search: true
172+
sidebar: docs_sidebar
173+
topnav: topnav
174+
toc: true
175+
github_editme_path: https://github.com/precice/fmi-runner/edit/develop/ # ends in /
152176
-
153177
scope:
154178
path: "pages/community"
@@ -209,11 +233,15 @@ subprojects:
209233
- imported/tutorials/perpendicular-flap
210234
- imported/tutorials/turek-hron-fsi3
211235
- imported/tutorials/partitioned-pipe
236+
- imported/tutorials/partitioned-backwards-facing-step
237+
- imported/tutorials/flow-over-heated-plate-partitioned-flow
212238
- imported/tutorials/volume-coupled-diffusion
213239
- imported/tutorials/channel-transport
214240
- imported/tutorials/channel-transport-reaction
215241
- imported/tutorials/aste-turbine
216242
- imported/openfoam-adapter/docs
243+
- imported/micro-manager/docs
244+
- imported/fmi-runner/docs
217245
- imported/aste/docs
218246

219247
# We use these versions to centrally update links

_data/sidebars/docs_sidebar.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,36 @@ entries:
232232
- title: Config visualization
233233
url: /tooling-config-visualization.html
234234
output: web, pdf
235+
236+
- title: FMI runner
237+
url: /tooling-fmi-runner.html
238+
output: web, pdf
239+
240+
subfolders:
241+
- title: Micro Manager
242+
output: web, pdf
243+
subfolderitems:
244+
245+
- title: Overview
246+
url: /tooling-micro-manager-overview.html
247+
output: web, pdf
248+
249+
- title: Get the Micro Manager
250+
url: /tooling-micro-manager-installation.html
251+
output: web, pdf
252+
253+
- title: Preparing micro simulation
254+
url: /tooling-micro-manager-prepare-micro-simulation.html
255+
output: web, pdf
256+
257+
- title: Configuration
258+
url: /tooling-micro-manager-configuration.html
259+
output: web, pdf
235260

261+
- title: Running
262+
url: /tooling-micro-manager-running.html
263+
output: web, pdf
264+
236265
- title: Performance analysis
237266
url: /tooling-performance-analysis.html
238267
output: web, pdf
@@ -453,6 +482,10 @@ entries:
453482
url: /couple-your-code-waveform.html
454483
output: web, pdf
455484

485+
- title: Global data
486+
url: /couple-your-code-global-data.html
487+
output: web, pdf
488+
456489
- title: Porting guides for major versions
457490
output: web, pdf
458491
subfolderitems:

_data/sidebars/tutorial_sidebar.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,14 @@ entries:
7777
- title: Partitioned pipe
7878
url: /tutorials-partitioned-pipe.html
7979
output: web
80+
81+
- title: Partitioned flow over a step
82+
url: /tutorials-partitioned-backwards-facing-step.html
83+
output: web
84+
85+
- title: Partitioned flow over heated plate
86+
url: /tutorials-flow-over-heated-plate-partitioned-flow.html
87+
output: web
8088

8189
- title: Oscillator
8290
url: /tutorials-oscillator.html

_includes/head.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<meta charset="utf-8">
22
<meta http-equiv="X-UA-Compatible" content="IE=edge">
33
<meta name="viewport" content="width=device-width, initial-scale=1">
4-
<meta name="description" content="{% if page.summary %}{{ page.summary | strip_html | strip_newlines | truncate: 160 }}{% endif %}">
4+
{% if page.summary %}
5+
<meta name="description" content="{{ page.summary | strip_html | strip_newlines }}">
6+
{% endif %}
57
<meta name="keywords" content="{{page.tags}}{% if page.tags %}, {% endif %} {{page.keywords}}">
68
<meta name="theme-color" content="#0A76BB">
79
<meta name="msapplication-square310x310logo" content="images/icon-310x310.png">

_includes/news_banner.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88

99
{% endraw %}{% endcomment %}
1010

11-
{% if include.onlanding %}
11+
{% if false %}
1212

1313
<div class="background-light banner-container">
1414
<div class="container">
1515
<div class="row no-margin">
1616
<div class="col-lg-12 banner">
1717
<p class="no-margin">
18-
New paper: <a href="https://doi.org/10.51560/ofj.v3.88">OpenFOAM-preCICE: Coupling OpenFOAM with external solvers for multi-physics simulations</a>, OpenFOAM® Journal
18+
Find preCICE at the <a href="https://precice.org/eccomas-coupled-2023.html">ECCOMAS COUPLED 2023</a> this June
1919
</p>
2020
</div>
2121
</div>

_plugins/googlescholar.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def generate(site)
1717
citations = doc.css('#gs_ab_md .gs_ab_mdw').text.split[1]
1818
data = { 'id' => CITATION_ID,
1919
'citations' => citations }
20-
rescue OpenURI::HTTPError => e
20+
rescue OpenURI::HTTPError, SocketError => e
2121
Jekyll.logger.warn "Fetching citation data failed with: #{e.message}"
2222
data = {}
2323
end

images/docs/install-wsl.png

1.02 MB
Loading

imported/fmi-runner

Submodule fmi-runner added at 680ce07

imported/micro-manager

Submodule micro-manager added at a8b827c

imported/tutorials

Submodule tutorials updated 115 files

pages/community/community-contribute-to-precice.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,19 @@ There are a few technical things to take care of before we can merge your contri
154154
We automate many of these checks with [GitHub actions](https://github.com/features/actions), which you will see running at the bottom of each pull request. To avoid pushing and waiting for the actions to run while you develop, you can alternatively install [act](https://github.com/nektos/act) to execute all or specific workflows locally, running `act` or `act -j <job_name>`. It requires [Docker](https://www.docker.com/) and you can get the latest binary from the [act releases](https://github.com/nektos/act/releases/latest).
155155
</details>
156156

157+
### Adding a new tutorial to the website
158+
159+
The content of the tutorials is sourced from the develop branch of the tutorials repository, which is specified in the `.gitmodules` file of the website repository. Hence, in general, anything merged to develop in the tutorials appears on the website. Consider putting some `note` [alert box](docs-meta-cheatsheet.html#alerts) on top of your new tutorial page to describe any unreleased requirements.
160+
161+
*New* tutorials will not directly appear on the website, but they need some additional steps. After merging to the tutorials develop, open a pull request with the following changes in the [website repository](https://github.com/precice/precice.github.io) ([example](https://github.com/precice/precice.github.io/pull/275)):
162+
163+
1. Trigger the [update submodules workflow](https://github.com/precice/precice.github.io/actions/workflows/update-submodules.yml) and, after it completes, create a new branch and pull request (this may also happen automatically, or someone from the preCICE team may have to do it for you).
164+
2. Edit the [`_config.yml` file](https://github.com/precice/precice.github.io/blob/master/_config.yml) to append the directory name of your tutorial under `subprojects:`.
165+
3. Edit the [tutorials sidebar](https://github.com/precice/precice.github.io/blob/master/_data/sidebars/tutorial_sidebar.yml) to add your tutorial permalink (defined in the heading of the `README.md` you created) to a fitting place, next to a similar tutorial.
166+
4. Edit the [tutorials landing page](https://github.com/precice/precice.github.io/blob/sidebar-ff-tuts/pages/tutorials/tutorials.md) to add your tutorial to the overview.
167+
168+
After your PR gets reviewed, approved, and merged, the website will be built automatically, and your tutorial will appear online in a couple of minutes.
169+
157170
## Sharing a simulation case
158171

159172
Did you create a nice simulation case that could be useful for more people, but is not simple enough to serve as a tutorial? You can alternatively share it in the [community projects](https://precice.discourse.group/c/community-projects/11) category of our forum.

pages/community/community.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,15 @@ editme: true
1212

1313
## preCICE workshops
1414

15-
Do you want to meet the community and learn what is new in preCICE? There is no better way than to join one of our workshops! We already had preCICE workshops in [February 2020](precice-workshop-2020.html) (Munich), [February 2021](precice-workshop-2021.html) (online/Stuttgart), and [February 2022](precice-workshop-2022.html) (online/Stuttgart). We are currently organizing our next workshop again in presence, in Munich, in [February 2023](precice-workshop-2023.html). We are excited to continue to interact with all users/developers/interested-persons and enthusiasts of preCICE.
15+
Do you want to meet the community and learn what is new in preCICE? There is no better way than to join one of our workshops! We already had preCICE workshops in [February 2020](precice-workshop-2020.html) (Munich), [February 2021](precice-workshop-2021.html) (online/Stuttgart), and [February 2022](precice-workshop-2022.html) (online/Stuttgart). We recently organized our workshop again in presence, in Munich, in [February 2023](precice-workshop-2023.html). We are excited to continue to interact with all users/developers/interested-persons and enthusiasts of preCICE.
16+
17+
Note: The next workshop will probably not be in February 2024, but some other time in 2024. Watch out for announcements.
18+
19+
## The preCICE forum
20+
21+
Meet the community online, ask questions, and help others at the [preCICE forum on Discourse](https://precice.discourse.group/). Structured conversations, which help the future reader. We also post [announcements](https://precice.discourse.group/c/news/5) from time to time, so make sure to register to be the first one to learn about new workshops and releases.
22+
23+
Are you looking for something else? Maybe one of the other [community channels](community-channels.html) is for you.
1624

1725
## Support preCICE
1826

pages/community/eccomas-coupled-2023.md

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,44 @@ toc: false
88

99
The [ECCOMAS Coupled Problems 2023](https://coupled2023.cimne.com/) will take place on Crete from June 5 to June 7.
1010

11-
We are again organizing a preCICE minisymposium: [Multi-Physics and Multi-Scale Simulations with the Coupling Library preCICE](https://coupled2023.cimne.com/area/d41c23af-2df5-11ed-8e5b-000c29ddfc0c)
11+
We are again organizing a preCICE minisymposium: [Multi-Physics and Multi-Scale Simulations with the Coupling Library preCICE](https://coupled2023.cimne.com/area/d41c23af-2df5-11ed-8e5b-000c29ddfc0c) (IS14).
1212

13-
Please submit contributions to the minisymposium through the [conference website](https://coupled2023.cimne.com/) after logging in. Please choose our minisymposium code `IS14` as "area" when uploading your abstract.
13+
Feel free to ask questions in the [corresponding thread of the forum](https://precice.discourse.group/t/call-for-contributions-eccomas-coupled-problems-2023/1278).
1414

15-
We are open for any research developing or using preCICE, particularly research that is of interest to more people in the preCICE community. We are also open for work-in-progress talks.
15+
## Schedule of the Minisymposium
1616

17-
Current **deadline for one-page abstracts is February 3, 2023**. Submission of conference papers is optional and due till March 20.
17+
### Tuesday, June 6, 8:30 - 10:30
1818

19-
Feel free to ask questions in the [corresponding thread of the forum](https://precice.discourse.group/t/call-for-contributions-eccomas-coupled-problems-2023/1278).
19+
Room: Impreial - Hall II,
20+
Session: [IS14 - I](https://coupled2023.cimne.com/event/session/80059f84-e478-11ed-9a1c-000c29ddfc0c)
21+
22+
* **Frédéric Simonis et al.:** [An introduction to the preCICE coupling library](https://coupled2023.cimne.com/event/contribution/f525c38f-a2f6-11ed-b019-000c29ddfc0c)
23+
* **Prasad Adhav et al.:** [Investigation of CFD-DEM momentum coupling results for AWJC Nozzle using preCICE](https://coupled2023.cimne.com/event/contribution/088c6322-b693-11ed-9760-000c29ddfc0c)
24+
* **Bhargav Krishna Chitneedi et al.:** [Hemodynamic evaluation of aortic aneurysms using FSI simulations](https://coupled2023.cimne.com/event/contribution/228163a7-a3c8-11ed-b019-000c29ddfc0c)
25+
* **Matthias Freimuth et al.:** [Towards Computational Efficient Fully Coupled Aeroelastic Simulations of Turbomachinery Blades with TRACE and CalculiX](https://coupled2023.cimne.com/event/contribution/01f72245-a305-11ed-b019-000c29ddfc0c)
26+
* **Ettore Fadiga et al.:** [An HPC Multi-Physics Framework for Next-Generation Industrial Aircraft Simulations](https://coupled2023.cimne.com/event/contribution/2b77d5d8-a3df-11ed-b019-000c29ddfc0c)
27+
28+
### Tuesday, June 6, 16:30 - 18:30
29+
30+
Room: Imperial - Hall II,
31+
Session: [IS14 - II](https://coupled2023.cimne.com/event/session/5ef3d5c8-e503-11ed-9a1c-000c29ddfc0c)
32+
33+
* **David Schneider et al:** [Efficient Application of Accelerator Cards for Simulation of Coupled Problems](https://coupled2023.cimne.com/event/contribution/665d7477-a3a9-11ed-b019-000c29ddfc0c)
34+
* **Chaitanya Kandekar et al.:** [An advanced Coupling Approach for Solving Corrosion and Fracture Mechanics using preCICE](https://coupled2023.cimne.com/event/contribution/3cc282be-a3ab-11ed-b019-000c29ddfc0c)
35+
* **Jean-Marc Gratien et al.:** [Implementing a Comprehensive Hydromechanical Model for Sedimentary Basins by Coupling a 3D Mechanical Code to a Classic Basin Fluid Flow Code with the PreCICE Library](https://coupled2023.cimne.com/event/contribution/11266a17-a20f-11ed-b019-000c29ddfc0c)
36+
* **Willem Roos et al.:** [Coupled Multiphysics Models in the Field of Pyrometallurgy](https://coupled2023.cimne.com/event/contribution/90b353e2-a388-11ed-b019-000c29ddfc0c)
37+
* **Alfred Bogaers et al.:** [Implementation and Formulation of a Multi-Region, Electromagnetic Solver for Discontinuous Media](https://coupled2023.cimne.com/event/contribution/f3ab72ed-a38f-11ed-b019-000c29ddfc0c)
38+
39+
### Wednesday, June 7, 09:00 - 10:00
40+
41+
Room: Imprerial - Hall II,
42+
Session: [IS14 - III](https://coupled2023.cimne.com/event/session/a022f5b7-e50c-11ed-9a1c-000c29ddfc0c)
43+
44+
* **Markus Mühlhäußer et al.:** [Partitioned Flow Simulations with preCICE and OpenFOAM](https://coupled2023.cimne.com/event/contribution/a6344f6f-a346-11ed-b019-000c29ddfc0c)
45+
* **Gerasimos Chourdakis et al.:** [Flexible and sustainable software for coupling mixed-dimension simulations](https://coupled2023.cimne.com/event/contribution/d6ebfb35-a3f7-11ed-b019-000c29ddfc0c)
46+
* **Carme Homs-Pons et al.:** [A Biophysically-Based Model of an Agonist-Antagonist Muscle Pair Using the Coupling Library preCICE](https://coupled2023.cimne.com/event/contribution/39fa5b5d-a3ea-11ed-b019-000c29ddfc0c)
47+
48+
## Related talks in other sessions
2049

21-
We will add more details here once we have a preliminary schedule.
50+
* **Benjamin Uekermann et al.:** [The Community-Driven preCICE Ecosystem](https://coupled2023.cimne.com/event/contribution/e4fce83e-a3d7-11ed-b019-000c29ddfc0c), in [IS33 - I - Progress in Computational Multiphysics Using Open-source Software](https://coupled2023.cimne.com/event/session/802c20f1-e478-11ed-9a1c-000c29ddfc0c) (Monday, June 5, 11:10 - 13:10)
51+
* **Benjamin Rodenberg et al.:** [A black-box coupling scheme for higher-order multirate time stepping with preCICE](https://coupled2023.cimne.com/event/contribution/8be04eb8-a3ef-11ed-b019-000c29ddfc0c), in [IS03 - I - Advances in analysis, algorithms, and software for the coupling of conventional and data-driven models for heterogeneous multi-scale, multi-physics simulations](https://coupled2023.cimne.com/event/session/7f633f85-e478-11ed-9a1c-000c29ddfc0c) (Wednesday, June 7, 09:00 - 11:00)

pages/docs/adapters/adapter-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@ There are various codes - free and proprietary ones - currently coupled with pre
1212
We host adapters for the following codes in the [preCICE GitHub organization](https://github.com/precice/) and we maintain them to work with the latest release of preCICE (unless stated otherwise).
1313

1414
| Adapter for | Contact | Resources | Typical applications | Comments |
15-
| [Ansys Fluent](https://www.ansys.com/products/fluids/ansys-fluent) | preCICE Developers | [code](https://github.com/precice/fluent-adapter), [docs](https://github.com/precice/fluent-adapter/wiki) | Fluid part in FSI | Experimental |
1615
| [CalculiX](http://www.calculix.de/) | preCICE Developers | [code](https://github.com/precice/calculix-adapter), [docs](adapter-calculix-overview.html) | Structure part in CHT, FSI | |
1716
| [code_aster](https://code-aster.org/) | preCICE Developers | [code](https://github.com/precice/code_aster-adapter), [docs](adapter-code_aster.html) | Structure part in CHT | |
18-
| [COMSOL Multiphysics](https://www.comsol.com/comsol-multiphysics) | preCICE Developers | [code](https://github.com/precice/comsol-adapter) | Structure part in FSI | Currently not maintained |
1917
| [deal.II](https://www.dealii.org/) | preCICE Developers | [code](https://github.com/precice/dealii-adapter), [docs](adapter-dealii-overview.html) | Structure part in FSI, any FEM | |
2018
| [FEniCS](https://fenicsproject.org/) | preCICE Developers | [code](https://github.com/precice/fenics-adapter), [docs](adapter-fenics.html) | Structure part in CHT, FSI, any FEM | See also [FEniCS-X](https://github.com/precice/fenicsx-adapter) below (WIP) |
2119
| [Nutils](http://www.nutils.org/) | preCICE Developers | [docs](adapter-nutils.html) | Structure part in CHT, any FEM | |
@@ -29,7 +27,9 @@ Wherever meaningful (license, maturity of the project, no other home), we host t
2927

3028
| Adapter for | Contact | Resources | Typical applications | Comments |
3129
| [Alya](https://www.bsc.es/research-development/research-areas/engineering-simulations/alya-high-performance-computational) | [TUM SCCS](https://www.in.tum.de/en/i05/) | | Fluid and structure part in FSI | Not actively maintained (but not abandoned) |
30+
| [Ansys Fluent](https://www.ansys.com/products/fluids/ansys-fluent) | preCICE Developers | [code](https://github.com/precice/fluent-adapter), [docs](https://github.com/precice/fluent-adapter/wiki) | Fluid part in FSI | Experimental |
3231
| [Ateles (APES)](https://apes.osdn.io/pages/ateles) | [Univ. Siegen STS](https://www.mb.uni-siegen.de/sts/index.html) | [code](https://osdn.net/projects/apes/scm/hg/ateles) | Fluid-Acousting, Fluid-Fluid coupling | |
32+
| [COMSOL Multiphysics](https://www.comsol.com/comsol-multiphysics) | preCICE Developers | [code](https://github.com/precice/comsol-adapter) | Structure part in FSI | Currently not maintained |
3333
| [DuMuX](https://dumux.org/) | [Alexander Jaust, University of Stuttgart](https://www.ipvs.uni-stuttgart.de/institute/team/Jaust-00001/) | [code](https://github.com/precice/dumux-adapter) | Free flow and porous-medium flow | Currently only coupled DuMuX to DuMuX. Feedback appreciated. |
3434
| [DUNE](https://dune-project.org/) | [Max Firmbach, UniBW M](https://www.unibw.de/imcs/team/firmbach) | [Thesis](https://mediatum.ub.tum.de/node?id=1609293), [code](https://github.com/precice/dune-adapter) | Structure part in FSI | |
3535
| [DUNE-Fem](https://www.dune-project.org/sphinx/content/sphinx/dune-fem/) | [Niklas Kotarsky, Lund University](https://www.lunduniversity.lu.se/lucat/user/9a5a021777b3e7cb0b8aea7ee9094808) | [coupled example code](https://github.com/precice/tutorials/tree/develop/flow-over-heated-plate/solid-dunefem) | Structure part in CHT, any FEM | |

0 commit comments

Comments
 (0)