diff --git a/Jenkinsfile b/Jenkinsfile
index 868c8c83569c18707f883602cf1a0face1b46e28..ba10d75009ab2d0d00a02b802dd79bb5e1b04950 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -338,7 +338,7 @@ pipeline {
sh "node_modules/.bin/webpack -p --mode=production"
script {
if (env.JOB_NAME == 'ufz/ogs/master') {
- sh "hugo --ignoreCache --baseURL https://benchmarks.opengeosys.org"
+ sh "hugo --ignoreCache"
sh ("node_modules/.bin/hugo-algolia --toml -s")
} else {
sh ("hugo --ignoreCache --baseURL " + env.JOB_URL + "Web/")
diff --git a/web/content/_index.pandoc b/web/content/_index.pandoc
index 8dc80bf574fcbd6013d19ea86c15a24528b697eb..6621598214dc8e45a6dda6e521a0384648385901 100644
--- a/web/content/_index.pandoc
+++ b/web/content/_index.pandoc
@@ -9,33 +9,44 @@ hero:
headline: Open-source multi-physics
textline: OpenGeoSys (OGS) is a scientific [open source project](https://github.com/ufz/ogs) for the development of numerical methods for the simulation of thermo-hydro-mechanical-chemical (THMC) processes in porous and fractured media. It has been successfully applied in the fields of contaminant hydrology, water resources and waste management, geotechnical applications, geothermal energy systems and energy storage.
quicklinks:
+ - name: Tools
+ anchor: tools
- name: HPC
anchor: hpc
- name: Vis
anchor: vis
- - name: Tools
- anchor: tools
features:
-- headline: Visualize results
+- headline: Comprehensive Pre-Processing Tools
textline: |
- By leveraging VTK data formats visualizing simulation result data sets becomes an easy task. The de-facto standard software for scientific visualtions [ParaView](https://www.paraview.org) can be used to explore and analyze complex data in a visual way.
+ A wide range of helper tools exist to get your model up and running with OpenGeoSys.
+
+ Convert your existing data sets into appropriate OGS data formats and structures.
- [Virtual reality enabled visualization](https://www.ufz.de/vislab) brings your data onto the large screen for intuitive exploration and assessment.
+ Create meshes approximating geometrically the domain of interest. Analyze mesh quality, cleanup the mesh or adding layers to it.
+
+ Parametrize the model with material parameters, boundary conditions and source terms.
+ visual:
+ permalink: "/docs/tools/meshing/extract-surface/TopBottomSideSurface.png"
+ alt: Extracted surfaces
+ links:
+ - text: See Docs
+ url: "/docs/tools"
layout: left
- carousel:
- slides:
- - permalink: /features/vis/layeredview2.png
- caption: Bar
- - permalink: /features/vis/vislab.png
- caption: Interactive exploration of river flow phenomenae at the TESSIN VISLab of the Helmholtz Centre for Environmental Research – UFZ
- - permalink: /features/vis/contours2-bw.png
- play: true
- anchor: vis
+ anchor: tools
+
+- headline: Process Coupling
+ textline: |
+ A coupled system of equations can be either solved in a fully coupled way of the monolithic method, or in the sequential manner of the staggered scheme. The monolithic scheme is applied for all coupled processes, while the staggered scheme are available for the coupled processes of themo-hydraulic, hydro-mechanical, and phase field mechanical problems.
+ visual:
+ permalink: /features/StaggeredCouplingScheme.png
+ alt: Staggered coupling scheme
+ layout: right
+
- headline: Data integration
textline: |
Integrate and visualize data sets for OpenGeoSys by using the OpenGeoSys Data Explorer. It provides functionality to visually assess the data and see possible artefacts, inconsistencies between data sets or missing information.
- layout: right
+ layout: left
carousel:
slides:
- permalink: /features/vis/chaohu_paper_mesh.png
@@ -44,9 +55,26 @@ features:
caption: Bar
- permalink: /features/vis/DEMSelke3D.png
play: false
- links:
- - text: "Learn More: Data Explorer"
- url: "/features/data-explorer"
+# links:
+# - text: "Learn More: Data Explorer"
+# url: "/features/data-explorer"
+
+- headline: Visualize results
+ textline: |
+ By leveraging VTK data formats visualizing simulation result data sets becomes an easy task. The de-facto standard software for scientific visualtions [ParaView](https://www.paraview.org) can be used to explore and analyze complex data in a visual way.
+
+ [Virtual reality enabled visualization](https://www.ufz.de/vislab) brings your data onto the large screen for intuitive exploration and assessment.
+ layout: right
+ carousel:
+ slides:
+ - permalink: /features/vis/layeredview2.png
+ caption: Bar
+ - permalink: /features/vis/vislab.png
+ caption: Interactive exploration of river flow phenomenae at the TESSIN VISLab of the Helmholtz Centre for Environmental Research – UFZ
+ - permalink: /features/vis/contours2-bw.png
+ play: true
+ anchor: vis
+
- headline: High performance computing
textline: |
High performance computing (HPC) has became a necessity in the modelling of environmental and geotechnical problems for better characterization of the complexity of geo-systems as well as predicting their evolution in time. Parallel computing is the most efficient method in the high performance computing. In OGS, the parallalization of the finite element (FE) computation is based on the domain decomposition method (DDC).
@@ -58,34 +86,11 @@ features:
permalink: "/features/HPC-DDC.png"
alt: Domain decomposition for parallel processing
rounded: true
- links:
- - text: Learn more
- url: "/features/hpc"
+# links:
+# - text: Learn more
+# url: "/features/hpc"
anchor: hpc
-- headline: Comprehensive Pre-Processing Tools
- textline: |
- A wide range of helper tools exist to get your model up and running with OpenGeoSys.
-
- Convert your existing data sets into appropriate OGS data formats and structures.
-
- Create meshes approximating geometrically the domain of interest. Analyze mesh quality, cleanup the mesh or adding layers to it.
-
- Parametrize the model with material parameters, boundary conditions and source terms.
- visual:
- permalink: "/docs/tools/meshing/extract-surface/TopBottomSideSurface.png"
- alt: Extracted surfaces
- links:
- - text: See Docs
- url: "/docs/tools"
- layout: left
- anchor: tools
-- headline: Process Coupling
- textline: |
- A coupled system of equations can be either solved in a fully coupled way of the monolithic method, or in the sequential manner of the staggered scheme. The monolithic scheme is applied for all coupled processes, while the staggered scheme are available for the coupled processes of themo-hydraulic, hydro-mechanical, and phase field mechanical problems.
- visual:
- permalink: /features/StaggeredCouplingScheme.png
- alt: Staggered coupling scheme
- headline: Transparent development workflows
textline: |
Write front-end code with Jekyll or Hugo and push to your Git repo. Forestry will pull in your commits and update the CMS.
@@ -115,12 +120,21 @@ features:
- headline: Using OpenGeoSys
textline: |
Start using OpenGeoSys by [downloading](/downloads) a prebuilt package.
+ links:
+ - text: <i class="fas fa-download"></i> Download OpenGeoSys
+ url: /releases
- headline: Developing OpenGeoSys
textline: |
Getting started developing OpenGeoSys at the [Developer Guide](/docs/devguide).
+ links:
+ - text: <i class="fas fa-book"></i> Developer Guide
+ url: /docs/devguide
- headline: Become part of the Community
textline: |
Get in touch with the OpenGeoSys Community via the [Mailing List](https://groups.google.com/forum/#!forum/ogs-users), [GitHub](https://github.com/ufz/ogs) or by [email](mailto:info@opengeosys.org).
+ links:
+ - text: <i class="fab fa-github"></i> GitHub
+ url: https://github.com/ufz/ogs
layout: vertical
class: inverse
---
diff --git a/web/dist/bundle.js b/web/dist/bundle.js
index 58a20a87be51fb7b6b27c232da2d4ddc9b18babe..7a0e4106c4d6d8c9cc8cfc72a69be765685af21d 100644
--- a/web/dist/bundle.js
+++ b/web/dist/bundle.js
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:83d3491f415ec53af2edc3afcadcaab0318b8844b7c467b3b4aa43807abc30bd
-size 473501
+oid sha256:b108da72c8b0caf572e8fb96d5c40bfe744401e3df37393fa90a259b28156fc5
+size 750532
diff --git a/web/dist/styles.css b/web/dist/styles.css
index bc4c13a6d525014df62d0fc95805c2a4def87275..2f65b7aead3d5323d84d724f7ac431414d6bd023 100644
--- a/web/dist/styles.css
+++ b/web/dist/styles.css
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0975d33a8e936e581f31dc4e65e47025cd3a6e36cd00099f4d768d0adbf44cd3
-size 283236
+oid sha256:fa4fad98263503c839032d16e83d2e3b8416519488c71af9c8dc9e3087f01038
+size 307982
diff --git a/web/layouts/partials/components/feature.html b/web/layouts/partials/components/feature.html
index b2709a981c966625257eba89b368b6573103b75a..f0e5040287c95f86aff24ea51ab0dca30b8365c3 100644
--- a/web/layouts/partials/components/feature.html
+++ b/web/layouts/partials/components/feature.html
@@ -1,4 +1,4 @@
-<div class="py-8 {{ .feature.direction | default " left "}} {{ .feature.class }}">
+<div class="px-8 py-8 {{ .feature.direction | default " left "}} {{ .feature.class }}">
<div class="container">
{{ if or ( not .feature.layout ) ( or (eq .feature.layout "left") (eq .feature.layout "right") ) }}
@@ -10,7 +10,7 @@
</div>
<div class="flex my-4">
{{ range .feature.links }}
- <a class="button mr-2 btn-{{ .feature.class }}" href="{{ .feature.url }}">{{ .text }}</a>
+ <a class="button mr-2 btn-{{ .feature.class }}" href="{{ .url }}">{{ markdownify .text }}</a>
{{ end }}
</div>
</div>
diff --git a/web/layouts/partials/components/hero.html b/web/layouts/partials/components/hero.html
index 39b55d42b94335bfb8e5d01a8472f89059b9de45..ec7870c93c167b27956a00e30628e99ef0df3375 100644
--- a/web/layouts/partials/components/hero.html
+++ b/web/layouts/partials/components/hero.html
@@ -1,4 +1,4 @@
-<div class="pl-4 py-6">
+<div class="px-4 py-6">
<div class="container">
<div class="flex flex-wrap items-center justify-center">
<div>
diff --git a/web/layouts/partials/components/subfeatures.html b/web/layouts/partials/components/subfeatures.html
index 7daf5cfe029d2e60481dea39ec9cc24d9fbb772a..17076999ab25f40746c7510a9337a84f83750a71 100644
--- a/web/layouts/partials/components/subfeatures.html
+++ b/web/layouts/partials/components/subfeatures.html
@@ -2,9 +2,12 @@
{{- range . -}}
<div class="w-full md:w-1/3 md:px-4">
<h4>{{ markdownify .headline }}</h4>
- <div>
+ <div class="mb-8">
{{ markdownify .textline }}
</div>
+ {{ range .links }}
+ <a class="button mt-16 mr-2 btn-{{ .feature.class }}" href="{{ .url }}">{{ markdownify .text }}</a>
+ {{ end }}
</div>
{{- end -}}
</div>
diff --git a/web/layouts/partials/global-footer-nav.html b/web/layouts/partials/global-footer-nav.html
index 94a6b28023b8cc28cc95792d6f85e6d68d720ff1..06f190e89b910f509f0fe99aba3f5c4262aadc37 100644
--- a/web/layouts/partials/global-footer-nav.html
+++ b/web/layouts/partials/global-footer-nav.html
@@ -1,4 +1,4 @@
-<div class="mt-4 text-center text-sm">
+<div class="mt-4 mb-2 text-center text-sm">
<a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">
<img class="align-middle" alt="Creative Commons License" style="border-width:0"
src="https://i.creativecommons.org/l/by-sa/4.0/80x15.png" />
diff --git a/web/package.json b/web/package.json
index 49dd6f5db1c21b643661991295bb45d8bb05a2f2..58f5b9a0d1d1e7de3bf41b68f2d06ebae6bef2a6 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,9 +1,9 @@
{
"private": true,
"scripts": {
- "dev": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=webpack.config.js",
- "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=webpack.config.js",
- "prod": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=webpack.config.js",
+ "dev": "cross-env NODE_ENV=development node_modules/.bin/webpack --progress --hide-modules",
+ "watch": "cross-env NODE_ENV=development node_modules/.bin/webpack --watch --progress --hide-modules",
+ "prod": "node_modules/.bin/webpack -p --mode=production && hugo",
"index": "hugo-algolia -toml",
"index-and-send": "hugo-algolia -toml -s"
},
diff --git a/web/src/index.js b/web/src/index.js
index ea7a12229061f8ddd1a4a876fa116c96ebd6bb39..07e8d15f21184f248d4da1b53d8d982f2a64ebda 100644
--- a/web/src/index.js
+++ b/web/src/index.js
@@ -2,4 +2,4 @@ import styles from './styles.css'
import './js/osselector.js'
import './js/sitesearch.js'
import './js/fancybox.js'
-import './js/sharp.js'
+// import './js/sharp.js'
diff --git a/web/src/styles.css b/web/src/styles.css
index 3408bc0f04d341b79b7784bbfcf3269190ccf377..d38776ab433379a87ca9f078a7794d5465a94366 100644
--- a/web/src/styles.css
+++ b/web/src/styles.css
@@ -144,7 +144,7 @@ table {
/* -- Buttons -- */
a.button {
- @apply .bg-white .text-grey-darkest .py-4 .px-8 .border .border-grey-light .shadow;
+ @apply .bg-white .text-grey-darkest .py-4 .px-8 .border .border-grey-light .shadow .rounded-lg;
@apply .font-serif .font-medium .uppercase;
color: config('mycolors.text-primary');
}