diff --git a/README.md b/README.md index f8f99bc..9165861 100644 --- a/README.md +++ b/README.md @@ -32,8 +32,7 @@ If you don't want to provide a link to any webpage, include the whole `link` ite ## How to add an associated project -Adding another software project that is either a wrapper around 4C, or it uses some 4C code or provides a pre-/postprocessing tool -works in the same way as adding examples. The file to be modified is here +Adding another software project that is either a wrapper around 4C, or it uses some 4C code or provides a pre-/postprocessing tool works in the same way as adding examples. The file to be modified is here `associated.yml` @@ -46,8 +45,7 @@ Note that the names are in alphabetical order, so add it at the right place. ## How to add a new publication to the website? The 4C website contains a list of all publications, that have been created with the help of 4C. -When your new 4C-related publication has been published and all its bibliographic details (e.g. volume, issue, DOI, ...) are known, -please add the publication to the list of publications. +When your new 4C-related publication has been published and all its bibliographic details (e.g. volume, issue, DOI, ...) are known, please add the publication to the list of publications. Bibliographic data is stored in the `bibtex` format in two files: diff --git a/_config.yml b/_config.yml index d13794d..f1e325d 100755 --- a/_config.yml +++ b/_config.yml @@ -12,31 +12,6 @@ logo: desktop_width: "100px" banner: "/images/illustrations/fiber-fluidflow2.jpg" -collections: - capabilities: - output: true - community: - output: true - associated: - output: true - -defaults: - - scope: - path: "" - type: "capabilities" - values: - layout: "capability" - - scope: - path: "" - type: "community" - values: - layout: "contributor" - - scope: - path: "" - type: "associated" - values: - layout: "associate" - sass: indentWidth: 4 style: compressed # possible values: nested expanded compact compressed diff --git a/_data/contact.yml b/_data/contact.yml deleted file mode 100644 index b37201a..0000000 --- a/_data/contact.yml +++ /dev/null @@ -1 +0,0 @@ -contact_button_link: 'contact' diff --git a/_data/menus.yml b/_data/menus.yml index 56068d5..5291260 100644 --- a/_data/menus.yml +++ b/_data/menus.yml @@ -5,9 +5,6 @@ main: - name: "Capabilities and examples" url: "/capabilities/" weight: 1 - # - name: "Code" - # url: "/code.html" - # weight: 3 - name: "Associated projects" url: "/associated_projects/" weight: 4 diff --git a/_includes/header.html b/_includes/header.html index 716e06d..9ac4af0 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -28,7 +28,7 @@



banner{{ page.title }}
{{ content }}
- {% if page.intro_image %} + {% if page.image %}
{{ page.title }}
{% endif %} diff --git a/_layouts/capability.html b/_layouts/capability.html deleted file mode 100644 index 8d57e39..0000000 --- a/_layouts/capability.html +++ /dev/null @@ -1,15 +0,0 @@ ---- -layout: default -bodyClass: "page-weighted_capability" ---- - -
-
-
-
-

{{page.title}}

-
{{content}}
-
-
-
-
diff --git a/_layouts/home.html b/_layouts/home.html index c10e616..81ca96c 100755 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -11,17 +11,16 @@

4C: A Comprehensive Multiphysics Simulation Framework

- {{ content }} {% if page.show_call_box %} {% include mission.html - show_button=true %} {% endif %} + {{ content }}
- {% if page.intro_image %} + {% if page.image %}
{{ page.title }}
{% endif %} diff --git a/_sass/components/_call.scss b/_sass/components/_call.scss deleted file mode 100644 index 160a3b5..0000000 --- a/_sass/components/_call.scss +++ /dev/null @@ -1,60 +0,0 @@ -.call { - position: relative; - overflow: hidden; - background-color: $white-offset; - border-radius: 4px; - // box-shadow: 0 15px 35px rgba(50, 50, 93, 0.1), 0 5px 15px rgba(0, 0, 0, 0.07); - width: 100%; - display: flex; - align-items: center; - flex-direction: row; - flex-wrap: wrap; - z-index: 2; - @include media-breakpoint-up(sm) { - align-items: center; - flex-direction: row; - flex-wrap: wrap; - } - .call-box-top { - flex: 1 0 auto; - padding: 20px; - @include media-breakpoint-up(md) { - } - } - .call-box-bottom { - flex: auto; - padding: 20px; - border-top: 1px solid darken($white-offset, 5%); - @include media-breakpoint-up(sm) { - flex: 0 0 auto; - border: none; - } - } - .call-name { - font-size: 1.1rem; - font-weight: bold; - } - .call-phone { - margin-bottom: 5px; - } - .call-email { - a { - color: $black; - } - } - strong { - font-weight: bold; - } - svg { - fill: lighten($secondary, 40%); - position: absolute; - bottom: -9px; - right: 0; - width: 100px; - height: 100px; - @include media-breakpoint-up(sm) { - width: 120px; - height: 120px; - } - } -} diff --git a/_sass/components/_image.scss b/_sass/components/_image.scss new file mode 100644 index 0000000..fd483df --- /dev/null +++ b/_sass/components/_image.scss @@ -0,0 +1,11 @@ +.image { + width: 100%; + height: auto; + margin-top: -40px; +} +.image-hide-mobile { + display: none; + @include media-breakpoint-up(md) { + display: block; + } +} diff --git a/_sass/components/_intro-image.scss b/_sass/components/_intro-image.scss deleted file mode 100644 index fed75c3..0000000 --- a/_sass/components/_intro-image.scss +++ /dev/null @@ -1,59 +0,0 @@ -.intro-image { - width: 100%; - height: auto; - margin-top: -40px; -} -.intro-image-absolute { - max-width: none; - - padding: 0; - margin-bottom: 30px; - @include media-breakpoint-up(sm) { - } - @include media-breakpoint-up(md) { - position: absolute; - bottom: -50px; - left: -50px; - width: 700px; - } - @include media-breakpoint-up(lg) { - bottom: -60px; - left: -60px; - width: 800px; - } - @include media-breakpoint-up(xl) { - bottom: -100px; - left: -70px; - width: 850px; - } -} -.intro-image-community { - max-width: none; - - padding: 0; - margin-bottom: 0px; - @include media-breakpoint-up(sm) { - } - @include media-breakpoint-up(md) { - position: absolute; - bottom: 0px; - left: -50px; - width: 700px; - } - @include media-breakpoint-up(lg) { - bottom: -0px; - left: -60px; - width: 800px; - } - @include media-breakpoint-up(xl) { - bottom: -200px; - left: -70px; - width: 850px; - } -} -.intro-image-hide-mobile { - display: none; - @include media-breakpoint-up(md) { - display: block; - } -} diff --git a/_sass/components/_intro.scss b/_sass/components/_intro.scss index c0e2182..5126bc5 100644 --- a/_sass/components/_intro.scss +++ b/_sass/components/_intro.scss @@ -62,8 +62,3 @@ color: $steel; } } - -.intro-small { - padding-top: 100px; - padding-bottom: 30px; -} diff --git a/_sass/components/_mission.scss b/_sass/components/_mission.scss deleted file mode 100644 index 7518867..0000000 --- a/_sass/components/_mission.scss +++ /dev/null @@ -1,60 +0,0 @@ -.mission { - position: relative; - overflow: hidden; - background-color: $white-offset; - border-radius: 4px; - // box-shadow: 0 15px 35px rgba(50, 50, 93, 0.1), 0 5px 15px rgba(0, 0, 0, 0.07); - width: 100%; - display: flex; - align-items: center; - flex-direction: row; - flex-wrap: wrap; - z-index: 2; - @include media-breakpoint-up(sm) { - align-items: center; - flex-direction: row; - flex-wrap: wrap; - } - .mission-box-top { - flex: 1 0 auto; - padding: 20px; - @include media-breakpoint-up(md) { - } - } - .mission-box-bottom { - flex: auto; - padding: 20px; - border-top: 1px solid darken($white-offset, 5%); - @include media-breakpoint-up(sm) { - flex: 0 0 auto; - border: none; - } - } - .mission-name { - font-size: 1.1rem; - font-weight: bold; - } - .mission-phone { - margin-bottom: 5px; - } - .mission-email { - a { - color: $black; - } - } - strong { - font-weight: bold; - } - svg { - fill: lighten($secondary, 40%); - position: absolute; - bottom: -9px; - right: 0; - width: 100px; - height: 100px; - @include media-breakpoint-up(sm) { - width: 120px; - height: 120px; - } - } -} diff --git a/_sass/pages/_page-capabilities.scss b/_sass/pages/_page-capabilities.scss deleted file mode 100644 index 70241ae..0000000 --- a/_sass/pages/_page-capabilities.scss +++ /dev/null @@ -1,13 +0,0 @@ -.page-capability { - .content { - > p { - &:first-of-type { - font-size: 1.6rem; - line-height: 1.4; - margin-bottom: 40px; - font-weight: regular; - color: rgb(104, 104, 104); - } - } - } -} diff --git a/_sass/pages/_page-community.scss b/_sass/pages/_page-community.scss deleted file mode 100644 index 51a4d2d..0000000 --- a/_sass/pages/_page-community.scss +++ /dev/null @@ -1,58 +0,0 @@ -.page-community { - .community-summary { - display: flex; - flex-wrap: wrap; - flex-direction: row; - - .community-image { - height: 60px; - width: 60px; - margin-right: 10px; - overflow: hidden; - - img { - width: 60px; - } - } - - .contributor-meta { - flex: 1; - - h2 { - margin: 0; - font-size: 22px; - font-weight: normal; - } - - p { - color: $black; - text-transform: uppercase; - margin: 0; - font-size: 12px; - font-weight: 500; - } - } - - .contributor-content { - margin-top: 20px; - flex: 1 0 100%; - } - } - - .community-summary-large { - background-color: $white-offset; - padding: 30px; - border-radius: 3px; - - .contributor-image { - height: 90px; - width: 90px; - margin-right: 20px; - overflow: hidden; - - img { - width: 90px; - } - } - } -} diff --git a/_sass/pages/_page-home.scss b/_sass/pages/_page-home.scss deleted file mode 100644 index 1be946e..0000000 --- a/_sass/pages/_page-home.scss +++ /dev/null @@ -1,2 +0,0 @@ -.page-home { -} diff --git a/assets/css/style.scss b/assets/css/style.scss index 565c41d..2272af8 100644 --- a/assets/css/style.scss +++ b/assets/css/style.scss @@ -3,7 +3,6 @@ // Colors $primary: #3d85c6; -$primary-dark: #3d85c6; $secondary: #eeeeee; $black: #2f2f41; $white: #ffffff; @@ -53,22 +52,15 @@ $sub-footer-text-color: $white; @import "components/main-menu-mobile"; @import "components/hamburger"; @import "components/buttons"; -@import "components/call"; -@import "components/mission"; @import "components/title"; @import "components/content"; @import "components/intro"; -@import "components/intro-image"; +@import "components/image"; @import "components/strip"; @import "components/feature"; @import "components/social"; @import "components/fonts"; // Uncomment this line to self host font -// Pages -@import "pages/page-home"; -@import "pages/page-community"; -@import "pages/page-capabilities"; - body { font-size: 16px; line-height: 1.2; diff --git a/associated.md b/associated.md index 9d281af..7f4c92a 100644 --- a/associated.md +++ b/associated.md @@ -1,11 +1,10 @@ --- -title: 4C - associated projects +title: Associated projects layout: associated description: "Side projects based on the 4C code, postprocessing tools, wrappers, etc" permalink: "/associated_projects/" banner: true -intro_image: "/images/illustrations/associated_projects.svg" -intro_image_absolute: false +image: "/images/illustrations/associated_projects.svg" banner_hide_on_mobile: true --- diff --git a/capabilities.md b/capabilities.md index c9252d8..0f930c6 100644 --- a/capabilities.md +++ b/capabilities.md @@ -12,18 +12,13 @@ banner_hide_on_mobile: true 4C offers a variety of discretization techniques and numerical tools to its users: FEM serves as 4C’s main approach for spatial discretization, while extensions such as CutFEM (for fluid, solid, or FSI problems for example) or IGA using NURBS are available for selected problem types and applications. Time-dependent problems can be tackled with various implicit and explicit single- and multi-step methods. -To enable meshtying of non-matching grids, a tool box for mortar coupling is available (with example applications in different physics, -e.g., solid and contact mechanics, fluid flow, FSI, or lithium-ion cells). +To enable meshtying of non-matching grids, a tool box for mortar coupling is available (with example applications in different physics, e.g., solid and contact mechanics, fluid flow, FSI, or lithium-ion cells). To support the development of physical models, constitutive laws are collected in a unified framework to enable interoperability with abstract FEM evaluation routines. -4C implements a series of single-physics modules: While problems in solid mechanics can also encompass contact conditions and multi-point constraints, -structural models range from trusses over geometrically exact beam models (and beam interaction effects) to shell elements. +4C implements a series of single-physics modules: While problems in solid mechanics can also encompass contact conditions and multi-point constraints, structural models range from trusses over geometrically exact beam models (and beam interaction effects) to shell elements. For flow problems, 4C comes with an incompressible Navier–Stokes solver (including different turbulence models), low-Mach number flows, or two-phase flows. For biomedical applications, reduced order models for flow in arteries or airways are available alongside suitable Windkessel models. Finally, solvers for transport of scalar fields such as heat or chemical concentrations are available. With the intent to study multiphysics phenomena, 4C builds upon its single-field solvers to implement partitioned and monolithic multiphysics solvers for surface- and volume-coupled problems. -In surface coupling, existing capabilities from the solid and structural mechanics module are coupled to incompressible fluid flow, -resulting in partitioned and monolithic FSI solvers using an arbitrary Lagrangean-Eulerian (ALE) description for deforming fluid domains with scalable multi-level solvers, -monolithic solvers for fixed-grid FSI based on CutFEM, or partitioned approaches for fluid-beam interaction. In volume-coupling, -multi-field problems such as thermo-solid interaction (TSI), scatra-thermo interaction (STI), solid-scatra interaction (SSI), or porous media are available. +In surface coupling, existing capabilities from the solid and structural mechanics module are coupled to incompressible fluid flow, resulting in partitioned and monolithic FSI solvers using an arbitrary Lagrangean-Eulerian (ALE) description for deforming fluid domains with scalable multi-level solvers, monolithic solvers for fixed-grid FSI based on CutFEM, or partitioned approaches for fluid-beam interaction. In volume-coupling, multi-field problems such as thermo-solid interaction (TSI), scatra-thermo interaction (STI), solid-scatra interaction (SSI), or porous media are available. diff --git a/code.md b/code.md deleted file mode 100644 index 91bcb62..0000000 --- a/code.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -title: Code and Documentation -layout: page_serifheader -description: Code and documentation -# permalink: "/code/" -banner: true ---- - -## Code - -4C is written in modern c++ language, and it is open-source code, which can be found on [Github](https://www.github.com). -It leverages the Trilinos library - -## Documentation - -Documentation of the code is available for both developers and users. -The [Doxygen site](https://baci.pages.gitlab.lrz.de/baci/doxygen/index.html) is of course rather intended for programmers, -while users might be more interested in the [user documentation](https://baci.pages.gitlab.lrz.de/baci/readthedocs/index.html), which is written in a readthedocs style. -It contains a input file reference, tutorials and an extending part of simulation details and hints. diff --git a/contributor.md b/contributor.md index cc7dbce..ab90c99 100644 --- a/contributor.md +++ b/contributor.md @@ -10,6 +10,6 @@ Currently, it is developed in collaboration between the Technical University of the University of the Bundeswehr Munich (Germany), Hamburg University of Technology (Germany), the Helmholtz-Zentrum Hereon (Germany), and the German Aerospace Center (Germany). The collaboration is coordinated by -[Prof. W. Wall](https://www.epc.ed.tum.de/lnm/staff/wall/), +[Prof. W. A. Wall](https://www.epc.ed.tum.de/lnm/staff/wall/), [Prof. A. Popp](https://www.unibw.de/imcs/team/popp), and [Prof. C. J. Cyron](https://www.hereon.de/institutes/material_systems_modeling/team/098973/index.php.de). diff --git a/history.md b/history.md index 1fbe8f9..fac5cf0 100644 --- a/history.md +++ b/history.md @@ -7,13 +7,8 @@ banner: true banner_hide_on_mobile: true --- -The development of 4C arose from the need to tackle challenging research questions in and with numerical methods -for ordinary and partial differential equations and to advance complex models for real-world applications, -all based on a proper theoretical foundation and with verified and state-of-the-art methods and software implementations. -Since suitable tools are often not available either in commercial or in other (academic) research codes, -we want to close this gap by developing 4C, a comprehensive multiphysics simulation framework. +The development of 4C arose from the need to tackle challenging research questions in and with numerical methods for ordinary and partial differential equations and to advance complex models for real-world applications, all based on a proper theoretical foundation and with verified and state-of-the-art methods and software implementations. +Since suitable tools are often not available either in commercial or in other (academic) research codes, we want to close this gap by developing 4C, a comprehensive multiphysics simulation framework. -4C originated in the 2000s at the Institute for Computational Mechanics of the Technical University of Munich, -where the software has been developed under the name BACI. -This has been built upon the extensive experience of individual developers of the software ccarat -of the Institute for Structural Mechanics of the University of Stuttgart. +4C originated in the 2000s at the Institute for Computational Mechanics of the Technical University of Munich, where the software has been developed under the name BACI. +This has been built upon the extensive experience of individual developers of the software ccarat of the Institute for Structural Mechanics of the University of Stuttgart. diff --git a/index.md b/index.md index e6ea397..3d66e18 100755 --- a/index.md +++ b/index.md @@ -4,10 +4,8 @@ layout: home description: banner: true banner_hide_on_mobile: true -intro_image: "images/illustrations/4c_logo.png" -intro_image_absolute: false -intro_image_hide_on_mobile: true -show_call_box: false +image: "/images/logo/4C-logo-block_rgb.svg" +image_hide_on_mobile: true --- ## What is 4C Multiphysics?