From 55a655889128e07c65c73f18cc27ee25ff393048 Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Tue, 29 Mar 2022 11:28:33 +0200 Subject: [PATCH 01/17] [web] Converted to page bundle: elliptic-dirichlet. --- .../index.md} | 2 +- .../square_1e2_pcs_0_ts_1_t_1.000000.png | Bin 2 files changed, 1 insertion(+), 1 deletion(-) rename web/content/docs/benchmarks/elliptic/{elliptic-dirichlet.md => elliptic-dirichlet/index.md} (97%) rename web/content/docs/benchmarks/elliptic/{ => elliptic-dirichlet}/square_1e2_pcs_0_ts_1_t_1.000000.png (100%) diff --git a/web/content/docs/benchmarks/elliptic/elliptic-dirichlet.md b/web/content/docs/benchmarks/elliptic/elliptic-dirichlet/index.md similarity index 97% rename from web/content/docs/benchmarks/elliptic/elliptic-dirichlet.md rename to web/content/docs/benchmarks/elliptic/elliptic-dirichlet/index.md index a58c4d9066..0cc4af0b0d 100644 --- a/web/content/docs/benchmarks/elliptic/elliptic-dirichlet.md +++ b/web/content/docs/benchmarks/elliptic/elliptic-dirichlet/index.md @@ -111,4 +111,4 @@ A major part of the output was produced by the linear equation solver (LIS in th -![The result can be visualized with Paraview.](../square_1e2_pcs_0_ts_1_t_1.000000.png) +![The result can be visualized with Paraview.](square_1e2_pcs_0_ts_1_t_1.000000.png) diff --git a/web/content/docs/benchmarks/elliptic/square_1e2_pcs_0_ts_1_t_1.000000.png b/web/content/docs/benchmarks/elliptic/elliptic-dirichlet/square_1e2_pcs_0_ts_1_t_1.000000.png similarity index 100% rename from web/content/docs/benchmarks/elliptic/square_1e2_pcs_0_ts_1_t_1.000000.png rename to web/content/docs/benchmarks/elliptic/elliptic-dirichlet/square_1e2_pcs_0_ts_1_t_1.000000.png -- GitLab From fabdee6d8d9c88f954eb05023f9f37adbeaebec5 Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Tue, 29 Mar 2022 11:40:06 +0200 Subject: [PATCH 02/17] [web] Converted to page bundle: drainage_diffusion. --- .../drainage_excavation.png | Bin .../index.md} | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename web/content/docs/benchmarks/elliptic/{ => drainage_diffusion}/drainage_excavation.png (100%) rename web/content/docs/benchmarks/elliptic/{drainage_diffusion.md => drainage_diffusion/index.md} (91%) diff --git a/web/content/docs/benchmarks/elliptic/drainage_excavation.png b/web/content/docs/benchmarks/elliptic/drainage_diffusion/drainage_excavation.png similarity index 100% rename from web/content/docs/benchmarks/elliptic/drainage_excavation.png rename to web/content/docs/benchmarks/elliptic/drainage_diffusion/drainage_excavation.png diff --git a/web/content/docs/benchmarks/elliptic/drainage_diffusion.md b/web/content/docs/benchmarks/elliptic/drainage_diffusion/index.md similarity index 91% rename from web/content/docs/benchmarks/elliptic/drainage_diffusion.md rename to web/content/docs/benchmarks/elliptic/drainage_diffusion/index.md index 4695fbc4d5..209a31afc4 100644 --- a/web/content/docs/benchmarks/elliptic/drainage_diffusion.md +++ b/web/content/docs/benchmarks/elliptic/drainage_diffusion/index.md @@ -18,4 +18,4 @@ We present the drainage of an excavation benchmark in this [this PDF](../web/con Here's an impression of the problem and its results: -{{< img src="../drainage_excavation.png" >}} +{{< img src="drainage_excavation.png" >}} -- GitLab From cb07cd1f82ea90bda0c3e44ad9b96a0028b9736d Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Tue, 29 Mar 2022 11:43:52 +0200 Subject: [PATCH 03/17] [web] Converted to page bundle: remaining elliptic pages. --- .../index.md} | 6 +++--- ...sure_AnalyticalSolution_VolumetricSourceTerm.png | Bin ...s_1_t_1.000000_Pressure_VolumetricSourceTerm.png | Bin ...sure_AnalyticalSolution_VolumetricSourceTerm.png | Bin .../index.md} | 4 ++-- .../square_1e2_neumann_abs_err.png | Bin .../square_1e2_neumann_gradients.png | Bin ...h_nodal_source_term_analytical_solution_head.png | Bin ...al_source_term_diff_analytical_solution_head.png | Bin ...term_diff_analytical_solution_head_log_scale.png | Bin .../index.md} | 6 +++--- .../{elliptic-robin.md => elliptic-robin/index.md} | 2 +- .../{ => elliptic-robin}/line_1e1_robin_left.png | Bin .../index.md} | 6 +++--- ...Pressure_AnalyticalSolution_PythonSourceTerm.png | Bin ...x_sin_y_sourceterm_Pressure_PythonSourceTerm.png | Bin ...Pressure_AnalyticalSolution_PythonSourceTerm.png | Bin 17 files changed, 12 insertions(+), 12 deletions(-) rename web/content/docs/benchmarks/elliptic/{elliptic-dirichlet-volumetric-source-term.md => elliptic-dirichlet-volumetric-source-term/index.md} (91%) rename web/content/docs/benchmarks/elliptic/{ => elliptic-dirichlet-volumetric-source-term}/square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_Pressure_AnalyticalSolution_VolumetricSourceTerm.png (100%) rename web/content/docs/benchmarks/elliptic/{ => elliptic-dirichlet-volumetric-source-term}/square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_Pressure_VolumetricSourceTerm.png (100%) rename web/content/docs/benchmarks/elliptic/{ => elliptic-dirichlet-volumetric-source-term}/square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_diff_Pressure_AnalyticalSolution_VolumetricSourceTerm.png (100%) rename web/content/docs/benchmarks/elliptic/{elliptic-neumann.md => elliptic-neumann/index.md} (98%) rename web/content/docs/benchmarks/elliptic/{ => elliptic-neumann}/square_1e2_neumann_abs_err.png (100%) rename web/content/docs/benchmarks/elliptic/{ => elliptic-neumann}/square_1e2_neumann_gradients.png (100%) rename web/content/docs/benchmarks/elliptic/{ => elliptic-pde-with-dirichlet-and-nodal-source-term}/circle_1e6_gwf_with_nodal_source_term_analytical_solution_head.png (100%) rename web/content/docs/benchmarks/elliptic/{ => elliptic-pde-with-dirichlet-and-nodal-source-term}/circle_1e6_gwf_with_nodal_source_term_diff_analytical_solution_head.png (100%) rename web/content/docs/benchmarks/elliptic/{ => elliptic-pde-with-dirichlet-and-nodal-source-term}/circle_1e6_gwf_with_nodal_source_term_diff_analytical_solution_head_log_scale.png (100%) rename web/content/docs/benchmarks/elliptic/{elliptic-pde-with-dirichlet-and-nodal-source-term.md => elliptic-pde-with-dirichlet-and-nodal-source-term/index.md} (89%) rename web/content/docs/benchmarks/elliptic/{elliptic-robin.md => elliptic-robin/index.md} (99%) rename web/content/docs/benchmarks/elliptic/{ => elliptic-robin}/line_1e1_robin_left.png (100%) rename web/content/docs/benchmarks/elliptic/{poisson_equation.md => poisson_equation/index.md} (95%) rename web/content/docs/benchmarks/elliptic/{ => poisson_equation}/square_1e3_poisson_sin_x_sin_y_sourceterm_Diff_Pressure_AnalyticalSolution_PythonSourceTerm.png (100%) rename web/content/docs/benchmarks/elliptic/{ => poisson_equation}/square_1e3_poisson_sin_x_sin_y_sourceterm_Pressure_PythonSourceTerm.png (100%) rename web/content/docs/benchmarks/elliptic/{ => poisson_equation}/square_1e5_poisson_sin_x_sin_y_sourceterm_Diff_Pressure_AnalyticalSolution_PythonSourceTerm.png (100%) diff --git a/web/content/docs/benchmarks/elliptic/elliptic-dirichlet-volumetric-source-term.md b/web/content/docs/benchmarks/elliptic/elliptic-dirichlet-volumetric-source-term/index.md similarity index 91% rename from web/content/docs/benchmarks/elliptic/elliptic-dirichlet-volumetric-source-term.md rename to web/content/docs/benchmarks/elliptic/elliptic-dirichlet-volumetric-source-term/index.md index 89856f1a10..888c518821 100644 --- a/web/content/docs/benchmarks/elliptic/elliptic-dirichlet-volumetric-source-term.md +++ b/web/content/docs/benchmarks/elliptic/elliptic-dirichlet-volumetric-source-term/index.md @@ -104,11 +104,11 @@ info: OGS terminated on 2018-10-12 06:30:13+020 The numerical solution shown in the following picture is almost a linear gradient: -{{< img src="../square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_Pressure_VolumetricSourceTerm.png" >}} +{{< img src="square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_Pressure_VolumetricSourceTerm.png" >}} The line plot along the $x$ axis shows that the solution is a quadratic function and is in very good agreement to the analytical solution: -{{< img src="../square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_Pressure_AnalyticalSolution_VolumetricSourceTerm.png" >}} +{{< img src="square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_Pressure_AnalyticalSolution_VolumetricSourceTerm.png" >}} The difference between the computed solution and the analytical solution is in the range of machine precision and therefore almost negligible: -{{< img src="../square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_diff_Pressure_AnalyticalSolution_VolumetricSourceTerm.png" >}} +{{< img src="square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_diff_Pressure_AnalyticalSolution_VolumetricSourceTerm.png" >}} diff --git a/web/content/docs/benchmarks/elliptic/square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_Pressure_AnalyticalSolution_VolumetricSourceTerm.png b/web/content/docs/benchmarks/elliptic/elliptic-dirichlet-volumetric-source-term/square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_Pressure_AnalyticalSolution_VolumetricSourceTerm.png similarity index 100% rename from web/content/docs/benchmarks/elliptic/square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_Pressure_AnalyticalSolution_VolumetricSourceTerm.png rename to web/content/docs/benchmarks/elliptic/elliptic-dirichlet-volumetric-source-term/square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_Pressure_AnalyticalSolution_VolumetricSourceTerm.png diff --git a/web/content/docs/benchmarks/elliptic/square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_Pressure_VolumetricSourceTerm.png b/web/content/docs/benchmarks/elliptic/elliptic-dirichlet-volumetric-source-term/square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_Pressure_VolumetricSourceTerm.png similarity index 100% rename from web/content/docs/benchmarks/elliptic/square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_Pressure_VolumetricSourceTerm.png rename to web/content/docs/benchmarks/elliptic/elliptic-dirichlet-volumetric-source-term/square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_Pressure_VolumetricSourceTerm.png diff --git a/web/content/docs/benchmarks/elliptic/square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_diff_Pressure_AnalyticalSolution_VolumetricSourceTerm.png b/web/content/docs/benchmarks/elliptic/elliptic-dirichlet-volumetric-source-term/square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_diff_Pressure_AnalyticalSolution_VolumetricSourceTerm.png similarity index 100% rename from web/content/docs/benchmarks/elliptic/square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_diff_Pressure_AnalyticalSolution_VolumetricSourceTerm.png rename to web/content/docs/benchmarks/elliptic/elliptic-dirichlet-volumetric-source-term/square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_diff_Pressure_AnalyticalSolution_VolumetricSourceTerm.png diff --git a/web/content/docs/benchmarks/elliptic/elliptic-neumann.md b/web/content/docs/benchmarks/elliptic/elliptic-neumann/index.md similarity index 98% rename from web/content/docs/benchmarks/elliptic/elliptic-neumann.md rename to web/content/docs/benchmarks/elliptic/elliptic-neumann/index.md index 0d4a4d9ece..0e7fe7e72d 100644 --- a/web/content/docs/benchmarks/elliptic/elliptic-neumann.md +++ b/web/content/docs/benchmarks/elliptic/elliptic-neumann/index.md @@ -118,12 +118,12 @@ A last major part of the output was produced by the linear equation solver (LIS Compared to the analytical solution presented above the results are very good but in a single point: -{{< img src="../square_1e2_neumann_abs_err.png" >}} +{{< img src="square_1e2_neumann_abs_err.png" >}} Both Dirichlet boundary conditions are satisfied. The values of gradients in x direction along the right side and y directions along the top sides of the domain a shown below: -{{< img src="../square_1e2_neumann_gradients.png" >}} +{{< img src="square_1e2_neumann_gradients.png" >}} The homogeneous Neumann boundary condition on the top side is satisfied (ScalarGradient_Y is close to zero). The inhomogeneous Neumann boundary condition on the bottom is satisfied only for $y > 0.3$ (where the ScalarGradient_X is close to one) because of incompatible boundary conditions imposed on the bottom right corner of the domain. diff --git a/web/content/docs/benchmarks/elliptic/square_1e2_neumann_abs_err.png b/web/content/docs/benchmarks/elliptic/elliptic-neumann/square_1e2_neumann_abs_err.png similarity index 100% rename from web/content/docs/benchmarks/elliptic/square_1e2_neumann_abs_err.png rename to web/content/docs/benchmarks/elliptic/elliptic-neumann/square_1e2_neumann_abs_err.png diff --git a/web/content/docs/benchmarks/elliptic/square_1e2_neumann_gradients.png b/web/content/docs/benchmarks/elliptic/elliptic-neumann/square_1e2_neumann_gradients.png similarity index 100% rename from web/content/docs/benchmarks/elliptic/square_1e2_neumann_gradients.png rename to web/content/docs/benchmarks/elliptic/elliptic-neumann/square_1e2_neumann_gradients.png diff --git a/web/content/docs/benchmarks/elliptic/circle_1e6_gwf_with_nodal_source_term_analytical_solution_head.png b/web/content/docs/benchmarks/elliptic/elliptic-pde-with-dirichlet-and-nodal-source-term/circle_1e6_gwf_with_nodal_source_term_analytical_solution_head.png similarity index 100% rename from web/content/docs/benchmarks/elliptic/circle_1e6_gwf_with_nodal_source_term_analytical_solution_head.png rename to web/content/docs/benchmarks/elliptic/elliptic-pde-with-dirichlet-and-nodal-source-term/circle_1e6_gwf_with_nodal_source_term_analytical_solution_head.png diff --git a/web/content/docs/benchmarks/elliptic/circle_1e6_gwf_with_nodal_source_term_diff_analytical_solution_head.png b/web/content/docs/benchmarks/elliptic/elliptic-pde-with-dirichlet-and-nodal-source-term/circle_1e6_gwf_with_nodal_source_term_diff_analytical_solution_head.png similarity index 100% rename from web/content/docs/benchmarks/elliptic/circle_1e6_gwf_with_nodal_source_term_diff_analytical_solution_head.png rename to web/content/docs/benchmarks/elliptic/elliptic-pde-with-dirichlet-and-nodal-source-term/circle_1e6_gwf_with_nodal_source_term_diff_analytical_solution_head.png diff --git a/web/content/docs/benchmarks/elliptic/circle_1e6_gwf_with_nodal_source_term_diff_analytical_solution_head_log_scale.png b/web/content/docs/benchmarks/elliptic/elliptic-pde-with-dirichlet-and-nodal-source-term/circle_1e6_gwf_with_nodal_source_term_diff_analytical_solution_head_log_scale.png similarity index 100% rename from web/content/docs/benchmarks/elliptic/circle_1e6_gwf_with_nodal_source_term_diff_analytical_solution_head_log_scale.png rename to web/content/docs/benchmarks/elliptic/elliptic-pde-with-dirichlet-and-nodal-source-term/circle_1e6_gwf_with_nodal_source_term_diff_analytical_solution_head_log_scale.png diff --git a/web/content/docs/benchmarks/elliptic/elliptic-pde-with-dirichlet-and-nodal-source-term.md b/web/content/docs/benchmarks/elliptic/elliptic-pde-with-dirichlet-and-nodal-source-term/index.md similarity index 89% rename from web/content/docs/benchmarks/elliptic/elliptic-pde-with-dirichlet-and-nodal-source-term.md rename to web/content/docs/benchmarks/elliptic/elliptic-pde-with-dirichlet-and-nodal-source-term/index.md index 95c0c939f6..7d0037e0c2 100644 --- a/web/content/docs/benchmarks/elliptic/elliptic-pde-with-dirichlet-and-nodal-source-term.md +++ b/web/content/docs/benchmarks/elliptic/elliptic-pde-with-dirichlet-and-nodal-source-term/index.md @@ -71,8 +71,8 @@ It will produce some output and write the computed result into a data array of t ### Comparison of the analytical solution and the computed solution -{{< img src="../circle_1e6_gwf_with_nodal_source_term_analytical_solution_head.png" >}} +{{< img src="circle_1e6_gwf_with_nodal_source_term_analytical_solution_head.png" >}} -{{< img src="../circle_1e6_gwf_with_nodal_source_term_diff_analytical_solution_head.png" >}} +{{< img src="circle_1e6_gwf_with_nodal_source_term_diff_analytical_solution_head.png" >}} -{{< img src="../circle_1e6_gwf_with_nodal_source_term_diff_analytical_solution_head_log_scale.png" >}} +{{< img src="circle_1e6_gwf_with_nodal_source_term_diff_analytical_solution_head_log_scale.png" >}} diff --git a/web/content/docs/benchmarks/elliptic/elliptic-robin.md b/web/content/docs/benchmarks/elliptic/elliptic-robin/index.md similarity index 99% rename from web/content/docs/benchmarks/elliptic/elliptic-robin.md rename to web/content/docs/benchmarks/elliptic/elliptic-robin/index.md index 531c7cd9b4..3a518790a5 100644 --- a/web/content/docs/benchmarks/elliptic/elliptic-robin.md +++ b/web/content/docs/benchmarks/elliptic/elliptic-robin/index.md @@ -105,7 +105,7 @@ The left figure shows the pressure along the line, in the right figure the difference between the analytical solution and the numerical calculated solution is plotted. -{{< img src="../line_1e1_robin_left.png" >}} +{{< img src="line_1e1_robin_left.png" >}} ## Second benchmark: Problem specification and analytical solution diff --git a/web/content/docs/benchmarks/elliptic/line_1e1_robin_left.png b/web/content/docs/benchmarks/elliptic/elliptic-robin/line_1e1_robin_left.png similarity index 100% rename from web/content/docs/benchmarks/elliptic/line_1e1_robin_left.png rename to web/content/docs/benchmarks/elliptic/elliptic-robin/line_1e1_robin_left.png diff --git a/web/content/docs/benchmarks/elliptic/poisson_equation.md b/web/content/docs/benchmarks/elliptic/poisson_equation/index.md similarity index 95% rename from web/content/docs/benchmarks/elliptic/poisson_equation.md rename to web/content/docs/benchmarks/elliptic/poisson_equation/index.md index 474446c115..44484bb2a3 100644 --- a/web/content/docs/benchmarks/elliptic/poisson_equation.md +++ b/web/content/docs/benchmarks/elliptic/poisson_equation/index.md @@ -185,15 +185,15 @@ info: OGS terminated on 2018-10-10 09:22:17+020 ### Comparison of the numerical and analytical solutions -{{< img src="../square_1e3_poisson_sin_x_sin_y_sourceterm_Pressure_PythonSourceTerm.png" >}} +{{< img src="square_1e3_poisson_sin_x_sin_y_sourceterm_Pressure_PythonSourceTerm.png" >}} The above picture shows the numerical result. The solution conforms in the edges to the prescribed boundary conditions. -{{< img src="../square_1e3_poisson_sin_x_sin_y_sourceterm_Diff_Pressure_AnalyticalSolution_PythonSourceTerm.png" >}} +{{< img src="square_1e3_poisson_sin_x_sin_y_sourceterm_Diff_Pressure_AnalyticalSolution_PythonSourceTerm.png" >}} Since a coarse mesh ($32 \times 32$ elements) is used for the simulation the difference between the numerical and the analytical solution is relatively large. #### Comparison for higher resolution mesh ($316 \times 316$ elements) -{{< img src="../square_1e5_poisson_sin_x_sin_y_sourceterm_Diff_Pressure_AnalyticalSolution_PythonSourceTerm.png" >}} +{{< img src="square_1e5_poisson_sin_x_sin_y_sourceterm_Diff_Pressure_AnalyticalSolution_PythonSourceTerm.png" >}} The difference between the numerical and the analytical solution is much smaller than in the coarse mesh case. diff --git a/web/content/docs/benchmarks/elliptic/square_1e3_poisson_sin_x_sin_y_sourceterm_Diff_Pressure_AnalyticalSolution_PythonSourceTerm.png b/web/content/docs/benchmarks/elliptic/poisson_equation/square_1e3_poisson_sin_x_sin_y_sourceterm_Diff_Pressure_AnalyticalSolution_PythonSourceTerm.png similarity index 100% rename from web/content/docs/benchmarks/elliptic/square_1e3_poisson_sin_x_sin_y_sourceterm_Diff_Pressure_AnalyticalSolution_PythonSourceTerm.png rename to web/content/docs/benchmarks/elliptic/poisson_equation/square_1e3_poisson_sin_x_sin_y_sourceterm_Diff_Pressure_AnalyticalSolution_PythonSourceTerm.png diff --git a/web/content/docs/benchmarks/elliptic/square_1e3_poisson_sin_x_sin_y_sourceterm_Pressure_PythonSourceTerm.png b/web/content/docs/benchmarks/elliptic/poisson_equation/square_1e3_poisson_sin_x_sin_y_sourceterm_Pressure_PythonSourceTerm.png similarity index 100% rename from web/content/docs/benchmarks/elliptic/square_1e3_poisson_sin_x_sin_y_sourceterm_Pressure_PythonSourceTerm.png rename to web/content/docs/benchmarks/elliptic/poisson_equation/square_1e3_poisson_sin_x_sin_y_sourceterm_Pressure_PythonSourceTerm.png diff --git a/web/content/docs/benchmarks/elliptic/square_1e5_poisson_sin_x_sin_y_sourceterm_Diff_Pressure_AnalyticalSolution_PythonSourceTerm.png b/web/content/docs/benchmarks/elliptic/poisson_equation/square_1e5_poisson_sin_x_sin_y_sourceterm_Diff_Pressure_AnalyticalSolution_PythonSourceTerm.png similarity index 100% rename from web/content/docs/benchmarks/elliptic/square_1e5_poisson_sin_x_sin_y_sourceterm_Diff_Pressure_AnalyticalSolution_PythonSourceTerm.png rename to web/content/docs/benchmarks/elliptic/poisson_equation/square_1e5_poisson_sin_x_sin_y_sourceterm_Diff_Pressure_AnalyticalSolution_PythonSourceTerm.png -- GitLab From 1e14dce5e1a6d0c80a43aa4054253d8a41a618ed Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Tue, 29 Mar 2022 11:47:45 +0200 Subject: [PATCH 04/17] [web] Converted to page bundle: creep-after-excavation-bgra. --- .../{ => CreepAfterExcavation}/T.png | Bin .../index.md} | 12 ++++++------ .../{ => CreepAfterExcavation}/mesh.png | Bin .../{ => CreepAfterExcavation}/strain.png | Bin .../{ => CreepAfterExcavation}/stress_xx_yy_110.png | Bin .../{ => CreepAfterExcavation}/stress_xx_yy_20.png | Bin .../{ => CreepAfterExcavation}/stress_xx_yy_50.png | Bin 7 files changed, 6 insertions(+), 6 deletions(-) rename web/content/docs/benchmarks/creep-after-excavation-bgra/{ => CreepAfterExcavation}/T.png (100%) rename web/content/docs/benchmarks/creep-after-excavation-bgra/{CreepAfterExcavation.md => CreepAfterExcavation/index.md} (88%) rename web/content/docs/benchmarks/creep-after-excavation-bgra/{ => CreepAfterExcavation}/mesh.png (100%) rename web/content/docs/benchmarks/creep-after-excavation-bgra/{ => CreepAfterExcavation}/strain.png (100%) rename web/content/docs/benchmarks/creep-after-excavation-bgra/{ => CreepAfterExcavation}/stress_xx_yy_110.png (100%) rename web/content/docs/benchmarks/creep-after-excavation-bgra/{ => CreepAfterExcavation}/stress_xx_yy_20.png (100%) rename web/content/docs/benchmarks/creep-after-excavation-bgra/{ => CreepAfterExcavation}/stress_xx_yy_50.png (100%) diff --git a/web/content/docs/benchmarks/creep-after-excavation-bgra/T.png b/web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation/T.png similarity index 100% rename from web/content/docs/benchmarks/creep-after-excavation-bgra/T.png rename to web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation/T.png diff --git a/web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation.md b/web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation/index.md similarity index 88% rename from web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation.md rename to web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation/index.md index 7fc58ab627..e4f5b6e3fe 100644 --- a/web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation.md +++ b/web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation/index.md @@ -19,7 +19,7 @@ this example represents the creep in the near field of drift in the deep rock salt after excavation. The domain and the geometry are shown in the following figure: -![Mesh and Geometry.](../mesh.png#thwo-third "Mesh and Geometry.") +![Mesh and Geometry.](mesh.png "Mesh and Geometry.") The domain has two material groups, which are highlighted by different colors. The material group that is in the @@ -79,17 +79,17 @@ the left sub-figure show the time variations of horizontal and vertical stresses green vertical line in it marks the time of the displayed stress field.
- Stress distribution at the time of 109 days. + Stress distribution at the time of 109 days.
Stress distribution at the time of 109 days.
- Stress distribution at the time of 409 days. + Stress distribution at the time of 409 days.
Stress distribution at the time of 409 days.
- Stress distribution at the time of 1000 days. + Stress distribution at the time of 1000 days.
Stress distribution at the time of 1000 days.
@@ -101,13 +101,13 @@ horizontal stress. The following figure shows the strain distribution at the end of the simulation time at 1000 days.
- Strain distribution at the time of 1000 days. + Strain distribution at the time of 1000 days.
Strain distribution at the time of 1000 days.
The steady-state temperature distribution is displayed in the following figure
- Temperature distribution at the time of 1000 days. + Temperature distribution at the time of 1000 days.
Temperature distribution at the time of 1000 days.
diff --git a/web/content/docs/benchmarks/creep-after-excavation-bgra/mesh.png b/web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation/mesh.png similarity index 100% rename from web/content/docs/benchmarks/creep-after-excavation-bgra/mesh.png rename to web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation/mesh.png diff --git a/web/content/docs/benchmarks/creep-after-excavation-bgra/strain.png b/web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation/strain.png similarity index 100% rename from web/content/docs/benchmarks/creep-after-excavation-bgra/strain.png rename to web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation/strain.png diff --git a/web/content/docs/benchmarks/creep-after-excavation-bgra/stress_xx_yy_110.png b/web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation/stress_xx_yy_110.png similarity index 100% rename from web/content/docs/benchmarks/creep-after-excavation-bgra/stress_xx_yy_110.png rename to web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation/stress_xx_yy_110.png diff --git a/web/content/docs/benchmarks/creep-after-excavation-bgra/stress_xx_yy_20.png b/web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation/stress_xx_yy_20.png similarity index 100% rename from web/content/docs/benchmarks/creep-after-excavation-bgra/stress_xx_yy_20.png rename to web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation/stress_xx_yy_20.png diff --git a/web/content/docs/benchmarks/creep-after-excavation-bgra/stress_xx_yy_50.png b/web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation/stress_xx_yy_50.png similarity index 100% rename from web/content/docs/benchmarks/creep-after-excavation-bgra/stress_xx_yy_50.png rename to web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation/stress_xx_yy_50.png -- GitLab From 95828ca3804cd7b2025ff1419e67f0236e2aed93 Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Tue, 29 Mar 2022 11:51:21 +0200 Subject: [PATCH 05/17] [web] Converted to page bundle: creepbgra. --- .../index.md} | 0 .../benchmarks/creepbgra/{ => CreepBGRa}/bgra0.png | Bin .../creepbgra/{ => CreepBGRa}/doku_BGRa.pdf | Bin .../creepbgra/{CreepBRGa.md => CreepBGRa/index.md} | 6 ++++-- 4 files changed, 4 insertions(+), 2 deletions(-) rename web/content/docs/benchmarks/creepbgra/{BGRaVerificationExamples.md => BGRaVerificationExamples/index.md} (100%) rename web/content/docs/benchmarks/creepbgra/{ => CreepBGRa}/bgra0.png (100%) rename web/content/docs/benchmarks/creepbgra/{ => CreepBGRa}/doku_BGRa.pdf (100%) rename web/content/docs/benchmarks/creepbgra/{CreepBRGa.md => CreepBGRa/index.md} (98%) diff --git a/web/content/docs/benchmarks/creepbgra/BGRaVerificationExamples.md b/web/content/docs/benchmarks/creepbgra/BGRaVerificationExamples/index.md similarity index 100% rename from web/content/docs/benchmarks/creepbgra/BGRaVerificationExamples.md rename to web/content/docs/benchmarks/creepbgra/BGRaVerificationExamples/index.md diff --git a/web/content/docs/benchmarks/creepbgra/bgra0.png b/web/content/docs/benchmarks/creepbgra/CreepBGRa/bgra0.png similarity index 100% rename from web/content/docs/benchmarks/creepbgra/bgra0.png rename to web/content/docs/benchmarks/creepbgra/CreepBGRa/bgra0.png diff --git a/web/content/docs/benchmarks/creepbgra/doku_BGRa.pdf b/web/content/docs/benchmarks/creepbgra/CreepBGRa/doku_BGRa.pdf similarity index 100% rename from web/content/docs/benchmarks/creepbgra/doku_BGRa.pdf rename to web/content/docs/benchmarks/creepbgra/CreepBGRa/doku_BGRa.pdf diff --git a/web/content/docs/benchmarks/creepbgra/CreepBRGa.md b/web/content/docs/benchmarks/creepbgra/CreepBGRa/index.md similarity index 98% rename from web/content/docs/benchmarks/creepbgra/CreepBRGa.md rename to web/content/docs/benchmarks/creepbgra/CreepBGRa/index.md index 0370b638d1..225410b6a3 100644 --- a/web/content/docs/benchmarks/creepbgra/CreepBRGa.md +++ b/web/content/docs/benchmarks/creepbgra/CreepBGRa/index.md @@ -5,6 +5,8 @@ weight = 171 project = "ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreepWithAnalyticSolution.prj" author = "Wenqing Wang" +aliases = ["/docs/benchmarks/creepbgra/creepbrga"] + [menu] [menu.benchmarks] parent = "Thermo-Mechanics" @@ -135,7 +137,7 @@ $$\begin{aligned} *Note*: The above rate form of stress integration is implemented in ogs6. Alternatively, one can use a absolute stress integration form, which can be found in the attached - [PDF](../doku_BGRa.pdf). + [PDF](doku_BGRa.pdf). ## Example @@ -179,7 +181,7 @@ $$\begin{gathered} The comparison of the result of $\epsilon_z$ obtained by the present multidimensional scheme with the analytical solution is shown in the following figure: -{{< img src="../bgra0.png" >}} +{{< img src="bgra0.png" >}} ### Python code -- GitLab From 905a81120130fb72d398f9a47d0dbdca2b977b00 Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Tue, 29 Mar 2022 11:52:04 +0200 Subject: [PATCH 06/17] [web] Converted to page bundle: EhlersDamage. --- .../EhlersDamage/{EhlersDamage.md => EhlersDamage/index.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename web/content/docs/benchmarks/EhlersDamage/{EhlersDamage.md => EhlersDamage/index.md} (100%) diff --git a/web/content/docs/benchmarks/EhlersDamage/EhlersDamage.md b/web/content/docs/benchmarks/EhlersDamage/EhlersDamage/index.md similarity index 100% rename from web/content/docs/benchmarks/EhlersDamage/EhlersDamage.md rename to web/content/docs/benchmarks/EhlersDamage/EhlersDamage/index.md -- GitLab From ad63e7659b062022a0022daf9271dc430cfa5cb5 Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Tue, 29 Mar 2022 11:56:13 +0200 Subject: [PATCH 07/17] [web] Converted to page bundle: hydro-mechanics. --- .../HM_drainage_excavation.pdf | Bin .../index.md} | 2 +- .../InjectionProduction_model.png | Bin .../InjectionProduction_results.png | Bin .../index.md} | 4 ++-- .../{ => MandelCryer}/MandelCryer_mesh.png | Bin .../{ => MandelCryer}/MandelCryer_model.png | Bin .../{ => MandelCryer}/MandelCryer_results.png | Bin .../{MandelCryer.md => MandelCryer/index.md} | 6 +++--- .../PermeabilityMohrCoulombFailureIndexModel.pdf | Bin .../index.md} | 2 +- .../HM_confined_compression_analytical.png | Bin .../HM_confined_compression_simulation_error.png | Bin .../{hm-linear.md => hm-linear/index.md} | 4 ++-- .../index.md} | 8 ++++---- .../mesh_UC_final.png | Bin .../num_ana_1s_refined.png | Bin .../transient_validation_unconfined_compression.png | Bin .../verification_1000s_new-1.png | Bin .../{ => lie-hm-linear-single-fracture}/LIE_HM.pdf | Bin .../index.md} | 10 +++++----- .../single_fracture_3D.png | Bin .../x_b_t500.png | Bin .../x_p_t500.png | Bin .../index.md} | 2 +- .../{ => nodal_source_test}/nodal_source_test.png | Bin 26 files changed, 19 insertions(+), 19 deletions(-) rename web/content/docs/benchmarks/hydro-mechanics/{ => HM_drainage_excavation}/HM_drainage_excavation.pdf (100%) rename web/content/docs/benchmarks/hydro-mechanics/{HM_drainage_excavation.md => HM_drainage_excavation/index.md} (88%) rename web/content/docs/benchmarks/hydro-mechanics/{ => InjectionProduction}/InjectionProduction_model.png (100%) rename web/content/docs/benchmarks/hydro-mechanics/{ => InjectionProduction}/InjectionProduction_results.png (100%) rename web/content/docs/benchmarks/hydro-mechanics/{InjectionProduction.md => InjectionProduction/index.md} (98%) rename web/content/docs/benchmarks/hydro-mechanics/{ => MandelCryer}/MandelCryer_mesh.png (100%) rename web/content/docs/benchmarks/hydro-mechanics/{ => MandelCryer}/MandelCryer_model.png (100%) rename web/content/docs/benchmarks/hydro-mechanics/{ => MandelCryer}/MandelCryer_results.png (100%) rename web/content/docs/benchmarks/hydro-mechanics/{MandelCryer.md => MandelCryer/index.md} (96%) rename web/content/docs/benchmarks/hydro-mechanics/{ => PermeabilityMohrCoulombFailureIndexModel}/PermeabilityMohrCoulombFailureIndexModel.pdf (100%) rename web/content/docs/benchmarks/hydro-mechanics/{PermeabilityMohrCoulombFailureIndexModel.md => PermeabilityMohrCoulombFailureIndexModel/index.md} (81%) rename web/content/docs/benchmarks/hydro-mechanics/{ => hm-linear}/HM_confined_compression_analytical.png (100%) rename web/content/docs/benchmarks/hydro-mechanics/{ => hm-linear}/HM_confined_compression_simulation_error.png (100%) rename web/content/docs/benchmarks/hydro-mechanics/{hm-linear.md => hm-linear/index.md} (90%) rename web/content/docs/benchmarks/hydro-mechanics/{hm-unconfined-compression.md => hm-unconfined-compression/index.md} (94%) rename web/content/docs/benchmarks/hydro-mechanics/{ => hm-unconfined-compression}/mesh_UC_final.png (100%) rename web/content/docs/benchmarks/hydro-mechanics/{ => hm-unconfined-compression}/num_ana_1s_refined.png (100%) rename web/content/docs/benchmarks/hydro-mechanics/{ => hm-unconfined-compression}/transient_validation_unconfined_compression.png (100%) rename web/content/docs/benchmarks/hydro-mechanics/{ => hm-unconfined-compression}/verification_1000s_new-1.png (100%) rename web/content/docs/benchmarks/hydro-mechanics/{ => lie-hm-linear-single-fracture}/LIE_HM.pdf (100%) rename web/content/docs/benchmarks/hydro-mechanics/{lie-hm-linear-single-fracture.md => lie-hm-linear-single-fracture/index.md} (82%) rename web/content/docs/benchmarks/hydro-mechanics/{ => lie-hm-linear-single-fracture}/single_fracture_3D.png (100%) rename web/content/docs/benchmarks/hydro-mechanics/{ => lie-hm-linear-single-fracture}/x_b_t500.png (100%) rename web/content/docs/benchmarks/hydro-mechanics/{ => lie-hm-linear-single-fracture}/x_p_t500.png (100%) rename web/content/docs/benchmarks/hydro-mechanics/{nodal_source_test.md => nodal_source_test/index.md} (98%) rename web/content/docs/benchmarks/hydro-mechanics/{ => nodal_source_test}/nodal_source_test.png (100%) diff --git a/web/content/docs/benchmarks/hydro-mechanics/HM_drainage_excavation.pdf b/web/content/docs/benchmarks/hydro-mechanics/HM_drainage_excavation/HM_drainage_excavation.pdf similarity index 100% rename from web/content/docs/benchmarks/hydro-mechanics/HM_drainage_excavation.pdf rename to web/content/docs/benchmarks/hydro-mechanics/HM_drainage_excavation/HM_drainage_excavation.pdf diff --git a/web/content/docs/benchmarks/hydro-mechanics/HM_drainage_excavation.md b/web/content/docs/benchmarks/hydro-mechanics/HM_drainage_excavation/index.md similarity index 88% rename from web/content/docs/benchmarks/hydro-mechanics/HM_drainage_excavation.md rename to web/content/docs/benchmarks/hydro-mechanics/HM_drainage_excavation/index.md index 23fe56e986..ce0aac26f9 100644 --- a/web/content/docs/benchmarks/hydro-mechanics/HM_drainage_excavation.md +++ b/web/content/docs/benchmarks/hydro-mechanics/HM_drainage_excavation/index.md @@ -14,5 +14,5 @@ project = "HydroMechanics/Linear/DrainageEexcavation/HMdrainage.prj" ## Problem description -We present the hydro-mechanical drainage of an excavation benchmark in this [this PDF](../HM_drainage_excavation.pdf). +We present the hydro-mechanical drainage of an excavation benchmark in this [this PDF](HM_drainage_excavation.pdf). diff --git a/web/content/docs/benchmarks/hydro-mechanics/InjectionProduction_model.png b/web/content/docs/benchmarks/hydro-mechanics/InjectionProduction/InjectionProduction_model.png similarity index 100% rename from web/content/docs/benchmarks/hydro-mechanics/InjectionProduction_model.png rename to web/content/docs/benchmarks/hydro-mechanics/InjectionProduction/InjectionProduction_model.png diff --git a/web/content/docs/benchmarks/hydro-mechanics/InjectionProduction_results.png b/web/content/docs/benchmarks/hydro-mechanics/InjectionProduction/InjectionProduction_results.png similarity index 100% rename from web/content/docs/benchmarks/hydro-mechanics/InjectionProduction_results.png rename to web/content/docs/benchmarks/hydro-mechanics/InjectionProduction/InjectionProduction_results.png diff --git a/web/content/docs/benchmarks/hydro-mechanics/InjectionProduction.md b/web/content/docs/benchmarks/hydro-mechanics/InjectionProduction/index.md similarity index 98% rename from web/content/docs/benchmarks/hydro-mechanics/InjectionProduction.md rename to web/content/docs/benchmarks/hydro-mechanics/InjectionProduction/index.md index 9bb8f8fa29..dc3e798014 100644 --- a/web/content/docs/benchmarks/hydro-mechanics/InjectionProduction.md +++ b/web/content/docs/benchmarks/hydro-mechanics/InjectionProduction/index.md @@ -21,7 +21,7 @@ This benchmark simulates a soil column with fluid injection at the bottom and a It is taken from from Kim [[1]](#1), in detail it coincides with one of his examples (case 2, coupling strength $\tau=1.21$). A brief description of the used staggered scheme follows at the end. -{{< img src="../InjectionProduction_model.png" >}} +{{< img src="InjectionProduction_model.png" >}} _Simulation model with fluid source, sink, observation point and boundary conditions_ The fluid enters and leaves only via the source and sink in the domain, there is no flow across the boundaries. @@ -178,7 +178,7 @@ The gravity related terms are neglected in both: the Darcy velocity and the mome Note that 100 time steps were used for the following results, whereas the provided input file is set to 1 time step (1 day = 86400 s). Kim plots his results over nondimensional time, referring to the time at which the produced fluid volume equals the pore volume of the domain (450 days). -{{< img src="../InjectionProduction_results.png" >}} +{{< img src="InjectionProduction_results.png" >}} _Pressure at observation point (marked by circle) versus time (t=0...100 days) and spatial pressure distribution at t=100 days_ ## Staggered Scheme: Fixed-stress splitting ## diff --git a/web/content/docs/benchmarks/hydro-mechanics/MandelCryer_mesh.png b/web/content/docs/benchmarks/hydro-mechanics/MandelCryer/MandelCryer_mesh.png similarity index 100% rename from web/content/docs/benchmarks/hydro-mechanics/MandelCryer_mesh.png rename to web/content/docs/benchmarks/hydro-mechanics/MandelCryer/MandelCryer_mesh.png diff --git a/web/content/docs/benchmarks/hydro-mechanics/MandelCryer_model.png b/web/content/docs/benchmarks/hydro-mechanics/MandelCryer/MandelCryer_model.png similarity index 100% rename from web/content/docs/benchmarks/hydro-mechanics/MandelCryer_model.png rename to web/content/docs/benchmarks/hydro-mechanics/MandelCryer/MandelCryer_model.png diff --git a/web/content/docs/benchmarks/hydro-mechanics/MandelCryer_results.png b/web/content/docs/benchmarks/hydro-mechanics/MandelCryer/MandelCryer_results.png similarity index 100% rename from web/content/docs/benchmarks/hydro-mechanics/MandelCryer_results.png rename to web/content/docs/benchmarks/hydro-mechanics/MandelCryer/MandelCryer_results.png diff --git a/web/content/docs/benchmarks/hydro-mechanics/MandelCryer.md b/web/content/docs/benchmarks/hydro-mechanics/MandelCryer/index.md similarity index 96% rename from web/content/docs/benchmarks/hydro-mechanics/MandelCryer.md rename to web/content/docs/benchmarks/hydro-mechanics/MandelCryer/index.md index 1dd64b8503..239303166a 100644 --- a/web/content/docs/benchmarks/hydro-mechanics/MandelCryer.md +++ b/web/content/docs/benchmarks/hydro-mechanics/MandelCryer/index.md @@ -21,13 +21,13 @@ This is a classical example to demonstrate the effect of hydromechanical couplin For more details we refer to a textbook [[1]](#1), in which also the analytical solution is derived. As domain we consider a sphere, by symmetry we need to simulate only an octant. -{{< img src="../MandelCryer_mesh.png" >}} +{{< img src="MandelCryer_mesh.png" >}} _Mesh_ The boundary conditions of hydraulics are atmospheric pressure on the sphere surface and impermeable elsewhere. The boundary conditions of mechanics are an overburden (Neumann) applied as step load on the sphere surface at initial time $t=0$. The remaining sides are fixed in normal direction (Dirichlet). -{{< img src="../MandelCryer_model.png" >}} +{{< img src="MandelCryer_model.png" >}} _Boundary conditions_ The material is isotropic, linear elastic. Solid and fluid are assumed to be incompressible. @@ -134,7 +134,7 @@ All parameters are concluded in the following tables. As predicted, the pressure in the center exceeds the applied load and then levels out. -{{< img src="../MandelCryer_results.png" >}} +{{< img src="MandelCryer_results.png" >}} _Pressure at center of sphere_ For more details about the staggered scheme we refer to the [user guide - conventions]({{< ref "conventions.md#staggered-scheme" >}}). diff --git a/web/content/docs/benchmarks/hydro-mechanics/PermeabilityMohrCoulombFailureIndexModel.pdf b/web/content/docs/benchmarks/hydro-mechanics/PermeabilityMohrCoulombFailureIndexModel/PermeabilityMohrCoulombFailureIndexModel.pdf similarity index 100% rename from web/content/docs/benchmarks/hydro-mechanics/PermeabilityMohrCoulombFailureIndexModel.pdf rename to web/content/docs/benchmarks/hydro-mechanics/PermeabilityMohrCoulombFailureIndexModel/PermeabilityMohrCoulombFailureIndexModel.pdf diff --git a/web/content/docs/benchmarks/hydro-mechanics/PermeabilityMohrCoulombFailureIndexModel.md b/web/content/docs/benchmarks/hydro-mechanics/PermeabilityMohrCoulombFailureIndexModel/index.md similarity index 81% rename from web/content/docs/benchmarks/hydro-mechanics/PermeabilityMohrCoulombFailureIndexModel.md rename to web/content/docs/benchmarks/hydro-mechanics/PermeabilityMohrCoulombFailureIndexModel/index.md index e5d2d4dd66..8a6334bd7d 100644 --- a/web/content/docs/benchmarks/hydro-mechanics/PermeabilityMohrCoulombFailureIndexModel.md +++ b/web/content/docs/benchmarks/hydro-mechanics/PermeabilityMohrCoulombFailureIndexModel/index.md @@ -14,4 +14,4 @@ author = "Wenqing Wang" {{< data-link >}} For the description of the benchmark and its related permeability model, - please read [the PDF](../PermeabilityMohrCoulombFailureIndexModel.pdf). + please read [the PDF](PermeabilityMohrCoulombFailureIndexModel.pdf). diff --git a/web/content/docs/benchmarks/hydro-mechanics/HM_confined_compression_analytical.png b/web/content/docs/benchmarks/hydro-mechanics/hm-linear/HM_confined_compression_analytical.png similarity index 100% rename from web/content/docs/benchmarks/hydro-mechanics/HM_confined_compression_analytical.png rename to web/content/docs/benchmarks/hydro-mechanics/hm-linear/HM_confined_compression_analytical.png diff --git a/web/content/docs/benchmarks/hydro-mechanics/HM_confined_compression_simulation_error.png b/web/content/docs/benchmarks/hydro-mechanics/hm-linear/HM_confined_compression_simulation_error.png similarity index 100% rename from web/content/docs/benchmarks/hydro-mechanics/HM_confined_compression_simulation_error.png rename to web/content/docs/benchmarks/hydro-mechanics/hm-linear/HM_confined_compression_simulation_error.png diff --git a/web/content/docs/benchmarks/hydro-mechanics/hm-linear.md b/web/content/docs/benchmarks/hydro-mechanics/hm-linear/index.md similarity index 90% rename from web/content/docs/benchmarks/hydro-mechanics/hm-linear.md rename to web/content/docs/benchmarks/hydro-mechanics/hm-linear/index.md index 43d5070b1a..d83481668c 100644 --- a/web/content/docs/benchmarks/hydro-mechanics/hm-linear.md +++ b/web/content/docs/benchmarks/hydro-mechanics/hm-linear/index.md @@ -23,8 +23,8 @@ The analytical solution of the problem can be found in Mov _et.al._ (1980)"Bipha The result showing initial pore pressure increase in the bottom of the domain due to applied displacement on the top and subsequent pressure drop after the displacement ramp finishes at time 100s: -{{< img src="../HM_confined_compression_analytical.png" >}} +{{< img src="HM_confined_compression_analytical.png" >}} Comparison with the numerical solution shows good agreement with the analytical solution: -{{< img src="../HM_confined_compression_simulation_error.png" >}} +{{< img src="HM_confined_compression_simulation_error.png" >}} diff --git a/web/content/docs/benchmarks/hydro-mechanics/hm-unconfined-compression.md b/web/content/docs/benchmarks/hydro-mechanics/hm-unconfined-compression/index.md similarity index 94% rename from web/content/docs/benchmarks/hydro-mechanics/hm-unconfined-compression.md rename to web/content/docs/benchmarks/hydro-mechanics/hm-unconfined-compression/index.md index 0be58e4b1d..f137e77f4b 100644 --- a/web/content/docs/benchmarks/hydro-mechanics/hm-unconfined-compression.md +++ b/web/content/docs/benchmarks/hydro-mechanics/hm-unconfined-compression/index.md @@ -40,7 +40,7 @@ where $p$ could be pressure, $\mathbf{u}$ could be displacement, $\tilde{\mathbf We solve a hydro-mechanical linear biphasic model (small deformation, linear elastic, Darcy flow, incompressible constituents) in square domain where on the top boundary a constant displacement boundary is applied. On the right boundary a constant pressure boundary equals zero and zeros traction boundary are applied. All other boundaries are constrained in their normal direction and all boundaries except for outer radius are sealed. The fluid is allowed to escape through the right boundary. The drainage process can be concluded into two stages. During drainage, the total stress is the sum of effective stresses in the solid and the pore pressure. Once the material is fully drained, the pore pressure is zero, so that stress- and displacement fields are determined exclusively by the properties of the solid skeleton. An axisymmetric domain is used in this model. The mesh is refined based on the distance to the outer radius. -{{< img src="../mesh_UC_final.png" >}} +{{< img src="mesh_UC_final.png" >}} ## Assumptions @@ -53,12 +53,12 @@ Compression of Articular Cartilage." The result after 1s shows that due to the direct displacement on the boundary, the displacement on the x direction is quite large. Where the location is close enough to the outer radius, some water has already flowed out, the pore pressure is decreased and the gradient of displacement curve is modified. -{{< img src="../num_ana_1s_refined.png" >}} +{{< img src="num_ana_1s_refined.png" >}} The result after 1000s shows that when the drainage process is finished. The displacement has bounced back and the curve is almost straight due to the linear elastic behavior of the solid. -{{< img src="../verification_1000s_new-1.png" >}} +{{< img src="verification_1000s_new-1.png" >}} In order to capture the transient process at certain location, a point at the outer boundary is chosen to show the displacement during the whole compression process. -{{< img src="../transient_validation_unconfined_compression.png" >}} +{{< img src="transient_validation_unconfined_compression.png" >}} diff --git a/web/content/docs/benchmarks/hydro-mechanics/mesh_UC_final.png b/web/content/docs/benchmarks/hydro-mechanics/hm-unconfined-compression/mesh_UC_final.png similarity index 100% rename from web/content/docs/benchmarks/hydro-mechanics/mesh_UC_final.png rename to web/content/docs/benchmarks/hydro-mechanics/hm-unconfined-compression/mesh_UC_final.png diff --git a/web/content/docs/benchmarks/hydro-mechanics/num_ana_1s_refined.png b/web/content/docs/benchmarks/hydro-mechanics/hm-unconfined-compression/num_ana_1s_refined.png similarity index 100% rename from web/content/docs/benchmarks/hydro-mechanics/num_ana_1s_refined.png rename to web/content/docs/benchmarks/hydro-mechanics/hm-unconfined-compression/num_ana_1s_refined.png diff --git a/web/content/docs/benchmarks/hydro-mechanics/transient_validation_unconfined_compression.png b/web/content/docs/benchmarks/hydro-mechanics/hm-unconfined-compression/transient_validation_unconfined_compression.png similarity index 100% rename from web/content/docs/benchmarks/hydro-mechanics/transient_validation_unconfined_compression.png rename to web/content/docs/benchmarks/hydro-mechanics/hm-unconfined-compression/transient_validation_unconfined_compression.png diff --git a/web/content/docs/benchmarks/hydro-mechanics/verification_1000s_new-1.png b/web/content/docs/benchmarks/hydro-mechanics/hm-unconfined-compression/verification_1000s_new-1.png similarity index 100% rename from web/content/docs/benchmarks/hydro-mechanics/verification_1000s_new-1.png rename to web/content/docs/benchmarks/hydro-mechanics/hm-unconfined-compression/verification_1000s_new-1.png diff --git a/web/content/docs/benchmarks/hydro-mechanics/LIE_HM.pdf b/web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture/LIE_HM.pdf similarity index 100% rename from web/content/docs/benchmarks/hydro-mechanics/LIE_HM.pdf rename to web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture/LIE_HM.pdf diff --git a/web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture.md b/web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture/index.md similarity index 82% rename from web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture.md rename to web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture/index.md index 839eab4521..dee7413f17 100644 --- a/web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture.md +++ b/web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture/index.md @@ -18,14 +18,14 @@ author = "Norihiro Watanabe" We solve a hydromechanics problem (small deformation, linear elastic, Darcy flow) with a pre-existing fracture using the lower-dimensional interface element (LIE) approach. -See [this PDF](../LIE_HM.pdf) for detailed problem description. +See [this PDF](LIE_HM.pdf) for detailed problem description. ## Results and evaluation Result showing pore pressure increase due to the injection and subsequent fracture aperture increases at t=500s. A small discrepancy of the aperture near the injection is due to the interpolation method for converting cell data to point data in ParaView. -{{< img src="../x_p_t500.png" >}} -{{< img src="../x_b_t500.png" >}} +{{< img src="x_p_t500.png" >}} +{{< img src="x_b_t500.png" >}} ## 3D setup @@ -33,10 +33,10 @@ Same setup as for the given 2D case above with additional plane strain conditions in the front and back x-y planes. Warp of the 1000-times oversized displacement and the fracture's aperture are shown in the following figure. -{{< img src="../single_fracture_3D.png" >}} +{{< img src="single_fracture_3D.png" >}} Comparison with 2D setup yields identical results (up to numerical differences in order of 1e-15): TODO: Image missing! - + diff --git a/web/content/docs/benchmarks/hydro-mechanics/single_fracture_3D.png b/web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture/single_fracture_3D.png similarity index 100% rename from web/content/docs/benchmarks/hydro-mechanics/single_fracture_3D.png rename to web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture/single_fracture_3D.png diff --git a/web/content/docs/benchmarks/hydro-mechanics/x_b_t500.png b/web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture/x_b_t500.png similarity index 100% rename from web/content/docs/benchmarks/hydro-mechanics/x_b_t500.png rename to web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture/x_b_t500.png diff --git a/web/content/docs/benchmarks/hydro-mechanics/x_p_t500.png b/web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture/x_p_t500.png similarity index 100% rename from web/content/docs/benchmarks/hydro-mechanics/x_p_t500.png rename to web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture/x_p_t500.png diff --git a/web/content/docs/benchmarks/hydro-mechanics/nodal_source_test.md b/web/content/docs/benchmarks/hydro-mechanics/nodal_source_test/index.md similarity index 98% rename from web/content/docs/benchmarks/hydro-mechanics/nodal_source_test.md rename to web/content/docs/benchmarks/hydro-mechanics/nodal_source_test/index.md index 22aecceaec..f402b6ac76 100644 --- a/web/content/docs/benchmarks/hydro-mechanics/nodal_source_test.md +++ b/web/content/docs/benchmarks/hydro-mechanics/nodal_source_test/index.md @@ -79,4 +79,4 @@ The time period of 86400 is discretised into 100 steps. The distributions of pressure and displacement at the end time are shown in the following figure: -{{< img src="../nodal_source_test.png" >}} +{{< img src="nodal_source_test.png" >}} diff --git a/web/content/docs/benchmarks/hydro-mechanics/nodal_source_test.png b/web/content/docs/benchmarks/hydro-mechanics/nodal_source_test/nodal_source_test.png similarity index 100% rename from web/content/docs/benchmarks/hydro-mechanics/nodal_source_test.png rename to web/content/docs/benchmarks/hydro-mechanics/nodal_source_test/nodal_source_test.png -- GitLab From e904f913d73a3b4720e3584bebe60d9e0ecff3eb Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Tue, 29 Mar 2022 11:58:23 +0200 Subject: [PATCH 08/17] [web] Converted to page bundle: hydro-thermal. --- ...heat_transport_in_stationary_flow_domain.png | Bin ...eat_transport_in_stationary_flow_profile.png | Bin .../index.md} | 4 ++-- .../hydro-thermal/InitialPressure.png | Bin 14753 -> 0 bytes ...TemperatureResult_ts_149-InitialGradient.png | Bin 57693 -> 0 bytes .../hydro-thermal/TemperatureResult_ts_149.png | Bin 44145 -> 0 bytes .../{ => constant-viscosity}/HT-Process.pdf | Bin .../{ => constant-viscosity}/compare.png | Bin .../index.md} | 4 ++-- .../{ => decovalex-TH}/decovalex_TH_domain.png | Bin .../decovalex_TH_domain_pT.png | Bin .../{decovalex-TH.md => decovalex-TH/index.md} | 4 ++-- 12 files changed, 6 insertions(+), 6 deletions(-) rename web/content/docs/benchmarks/hydro-thermal/{ => HeatTransportInStationaryFlow}/heat_transport_in_stationary_flow_domain.png (100%) rename web/content/docs/benchmarks/hydro-thermal/{ => HeatTransportInStationaryFlow}/heat_transport_in_stationary_flow_profile.png (100%) rename web/content/docs/benchmarks/hydro-thermal/{HeatTransportInStationaryFlow.md => HeatTransportInStationaryFlow/index.md} (95%) delete mode 100644 web/content/docs/benchmarks/hydro-thermal/InitialPressure.png delete mode 100644 web/content/docs/benchmarks/hydro-thermal/TemperatureResult_ts_149-InitialGradient.png delete mode 100644 web/content/docs/benchmarks/hydro-thermal/TemperatureResult_ts_149.png rename web/content/docs/benchmarks/hydro-thermal/{ => constant-viscosity}/HT-Process.pdf (100%) rename web/content/docs/benchmarks/hydro-thermal/{ => constant-viscosity}/compare.png (100%) rename web/content/docs/benchmarks/hydro-thermal/{constant-viscosity.md => constant-viscosity/index.md} (96%) rename web/content/docs/benchmarks/hydro-thermal/{ => decovalex-TH}/decovalex_TH_domain.png (100%) rename web/content/docs/benchmarks/hydro-thermal/{ => decovalex-TH}/decovalex_TH_domain_pT.png (100%) rename web/content/docs/benchmarks/hydro-thermal/{decovalex-TH.md => decovalex-TH/index.md} (98%) diff --git a/web/content/docs/benchmarks/hydro-thermal/heat_transport_in_stationary_flow_domain.png b/web/content/docs/benchmarks/hydro-thermal/HeatTransportInStationaryFlow/heat_transport_in_stationary_flow_domain.png similarity index 100% rename from web/content/docs/benchmarks/hydro-thermal/heat_transport_in_stationary_flow_domain.png rename to web/content/docs/benchmarks/hydro-thermal/HeatTransportInStationaryFlow/heat_transport_in_stationary_flow_domain.png diff --git a/web/content/docs/benchmarks/hydro-thermal/heat_transport_in_stationary_flow_profile.png b/web/content/docs/benchmarks/hydro-thermal/HeatTransportInStationaryFlow/heat_transport_in_stationary_flow_profile.png similarity index 100% rename from web/content/docs/benchmarks/hydro-thermal/heat_transport_in_stationary_flow_profile.png rename to web/content/docs/benchmarks/hydro-thermal/HeatTransportInStationaryFlow/heat_transport_in_stationary_flow_profile.png diff --git a/web/content/docs/benchmarks/hydro-thermal/HeatTransportInStationaryFlow.md b/web/content/docs/benchmarks/hydro-thermal/HeatTransportInStationaryFlow/index.md similarity index 95% rename from web/content/docs/benchmarks/hydro-thermal/HeatTransportInStationaryFlow.md rename to web/content/docs/benchmarks/hydro-thermal/HeatTransportInStationaryFlow/index.md index 3e8705cf61..2442c08f6c 100644 --- a/web/content/docs/benchmarks/hydro-thermal/HeatTransportInStationaryFlow.md +++ b/web/content/docs/benchmarks/hydro-thermal/HeatTransportInStationaryFlow/index.md @@ -63,9 +63,9 @@ This example is also set as one of the benchmarks of The temperature distribution at t= 5.e+4 s together with the mesh is illustrated in the following figure: -{{< img src="../heat_transport_in_stationary_flow_domain.png" >}} +{{< img src="heat_transport_in_stationary_flow_domain.png" >}} The temperature profile at t= 5.e+4 s along a horizontal line in the 2D domain is given in the following figure: -{{< img src="../heat_transport_in_stationary_flow_profile.png" >}} +{{< img src="heat_transport_in_stationary_flow_profile.png" >}} diff --git a/web/content/docs/benchmarks/hydro-thermal/InitialPressure.png b/web/content/docs/benchmarks/hydro-thermal/InitialPressure.png deleted file mode 100644 index 4d53d9f7533a28836644adb81039c13645e026f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14753 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 diff --git a/web/content/docs/benchmarks/hydro-thermal/TemperatureResult_ts_149-InitialGradient.png b/web/content/docs/benchmarks/hydro-thermal/TemperatureResult_ts_149-InitialGradient.png deleted file mode 100644 index 82112876c1ca347c4f5cbc7fa0c252b9fc12b4f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 57693 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 NvA1!uerV;J^dDjF4}} +{{< img src="compare.png" >}} diff --git a/web/content/docs/benchmarks/hydro-thermal/decovalex_TH_domain.png b/web/content/docs/benchmarks/hydro-thermal/decovalex-TH/decovalex_TH_domain.png similarity index 100% rename from web/content/docs/benchmarks/hydro-thermal/decovalex_TH_domain.png rename to web/content/docs/benchmarks/hydro-thermal/decovalex-TH/decovalex_TH_domain.png diff --git a/web/content/docs/benchmarks/hydro-thermal/decovalex_TH_domain_pT.png b/web/content/docs/benchmarks/hydro-thermal/decovalex-TH/decovalex_TH_domain_pT.png similarity index 100% rename from web/content/docs/benchmarks/hydro-thermal/decovalex_TH_domain_pT.png rename to web/content/docs/benchmarks/hydro-thermal/decovalex-TH/decovalex_TH_domain_pT.png diff --git a/web/content/docs/benchmarks/hydro-thermal/decovalex-TH.md b/web/content/docs/benchmarks/hydro-thermal/decovalex-TH/index.md similarity index 98% rename from web/content/docs/benchmarks/hydro-thermal/decovalex-TH.md rename to web/content/docs/benchmarks/hydro-thermal/decovalex-TH/index.md index fbc1d3d9a8..37578f184f 100644 --- a/web/content/docs/benchmarks/hydro-thermal/decovalex-TH.md +++ b/web/content/docs/benchmarks/hydro-thermal/decovalex-TH/index.md @@ -33,7 +33,7 @@ The TASK D_THM1 of the DECOVALEX-THMC project studies the coupled thermal hydrau

With such simplifications, the geometry of the present example is illustrated in the following figure:

-{{< img src="../decovalex_TH_domain.png" >}} +{{< img src="decovalex_TH_domain.png" >}}

In the above figure, the domain in the annulus sector represents the sealing material, bentonite. A heat power, which is generated by the nuclear waste with one million year variation, is applied onto the inner arc of the annulus @@ -126,7 +126,7 @@ The TASK D_THM1 of the DECOVALEX-THMC project studies the coupled thermal hydrau domain at the time of 18 years are shown in the following figure, in which the thermal convection effective can be seen clearly.

-{{< img src="../decovalex_TH_domain_pT.png" >}} +{{< img src="decovalex_TH_domain_pT.png" >}} ## Reference -- GitLab From cc068aa43178123df2b4fc077ada60a9512d0f72 Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Tue, 29 Mar 2022 12:00:08 +0200 Subject: [PATCH 09/17] [web] Converted to page bundle: liquid-flow. --- .../liquid-flow/{ => buildup_test}/comparison.png | Bin .../liquid-flow/{ => buildup_test}/error.png | Bin .../liquid-flow/{ => buildup_test}/horner.png | Bin .../{buildup_test.md => buildup_test/index.md} | 6 +++--- .../drainage_LiquidFlow.pdf | Bin .../drainage_excavation.png | Bin .../index.md} | 4 ++-- .../inclined_1D_in_3D_sphere.png | Bin .../{ => flow_in_fracture}/inclined_2D_in_3D.png | Bin .../{ => flow_in_fracture}/inclined_2D_mesh.png | Bin .../index.md} | 6 +++--- .../index.md} | 2 +- .../theis_comparison.png | Bin .../PVCDBC_1_ts_2.png | Bin .../index.md} | 2 +- ...HeterogeneousBoundaryConditionsAndSourceTerm.mp4 | Bin .../index.md} | 4 ++-- .../{ => unconfined-aquifer}/Dupuit_Scenario_A.jpg | Bin .../{ => unconfined-aquifer}/Dupuit_Scenario_B.jpg | Bin .../{ => unconfined-aquifer}/Dupuit_Scenario_C.jpg | Bin .../{ => unconfined-aquifer}/Dupuit_Scenario_D.jpg | Bin .../index.md} | 8 ++++---- 22 files changed, 16 insertions(+), 16 deletions(-) rename web/content/docs/benchmarks/liquid-flow/{ => buildup_test}/comparison.png (100%) rename web/content/docs/benchmarks/liquid-flow/{ => buildup_test}/error.png (100%) rename web/content/docs/benchmarks/liquid-flow/{ => buildup_test}/horner.png (100%) rename web/content/docs/benchmarks/liquid-flow/{buildup_test.md => buildup_test/index.md} (98%) rename web/content/docs/benchmarks/liquid-flow/{ => drainage_Liquid_Flow}/drainage_LiquidFlow.pdf (100%) rename web/content/docs/benchmarks/liquid-flow/{ => drainage_Liquid_Flow}/drainage_excavation.png (100%) rename web/content/docs/benchmarks/liquid-flow/{drainage_Liquid_Flow.md => drainage_Liquid_Flow/index.md} (84%) rename web/content/docs/benchmarks/liquid-flow/{ => flow_in_fracture}/inclined_1D_in_3D_sphere.png (100%) rename web/content/docs/benchmarks/liquid-flow/{ => flow_in_fracture}/inclined_2D_in_3D.png (100%) rename web/content/docs/benchmarks/liquid-flow/{ => flow_in_fracture}/inclined_2D_mesh.png (100%) rename web/content/docs/benchmarks/liquid-flow/{flow_in_fracture.md => flow_in_fracture/index.md} (95%) rename web/content/docs/benchmarks/liquid-flow/{liquid-flow-theis-problem.md => liquid-flow-theis-problem/index.md} (99%) rename web/content/docs/benchmarks/liquid-flow/{ => liquid-flow-theis-problem}/theis_comparison.png (100%) rename web/content/docs/benchmarks/liquid-flow/{ => primary-variable-constrain-dirichlet-boundary-condition}/PVCDBC_1_ts_2.png (100%) rename web/content/docs/benchmarks/liquid-flow/{primary-variable-constrain-dirichlet-boundary-condition.md => primary-variable-constrain-dirichlet-boundary-condition/index.md} (98%) rename web/content/docs/benchmarks/liquid-flow/{ => time-dependent-heterogeneous-source-term-and-boundary-conditions}/TimeDependentHeterogeneousBoundaryConditionsAndSourceTerm.mp4 (100%) rename web/content/docs/benchmarks/liquid-flow/{time-dependent-heterogeneous-source-term-and-boundary-conditions.md => time-dependent-heterogeneous-source-term-and-boundary-conditions/index.md} (93%) rename web/content/docs/benchmarks/liquid-flow/{ => unconfined-aquifer}/Dupuit_Scenario_A.jpg (100%) rename web/content/docs/benchmarks/liquid-flow/{ => unconfined-aquifer}/Dupuit_Scenario_B.jpg (100%) rename web/content/docs/benchmarks/liquid-flow/{ => unconfined-aquifer}/Dupuit_Scenario_C.jpg (100%) rename web/content/docs/benchmarks/liquid-flow/{ => unconfined-aquifer}/Dupuit_Scenario_D.jpg (100%) rename web/content/docs/benchmarks/liquid-flow/{unconfined-aquifer.md => unconfined-aquifer/index.md} (96%) diff --git a/web/content/docs/benchmarks/liquid-flow/comparison.png b/web/content/docs/benchmarks/liquid-flow/buildup_test/comparison.png similarity index 100% rename from web/content/docs/benchmarks/liquid-flow/comparison.png rename to web/content/docs/benchmarks/liquid-flow/buildup_test/comparison.png diff --git a/web/content/docs/benchmarks/liquid-flow/error.png b/web/content/docs/benchmarks/liquid-flow/buildup_test/error.png similarity index 100% rename from web/content/docs/benchmarks/liquid-flow/error.png rename to web/content/docs/benchmarks/liquid-flow/buildup_test/error.png diff --git a/web/content/docs/benchmarks/liquid-flow/horner.png b/web/content/docs/benchmarks/liquid-flow/buildup_test/horner.png similarity index 100% rename from web/content/docs/benchmarks/liquid-flow/horner.png rename to web/content/docs/benchmarks/liquid-flow/buildup_test/horner.png diff --git a/web/content/docs/benchmarks/liquid-flow/buildup_test.md b/web/content/docs/benchmarks/liquid-flow/buildup_test/index.md similarity index 98% rename from web/content/docs/benchmarks/liquid-flow/buildup_test.md rename to web/content/docs/benchmarks/liquid-flow/buildup_test/index.md index a59a42993f..f1e3b2af98 100644 --- a/web/content/docs/benchmarks/liquid-flow/buildup_test.md +++ b/web/content/docs/benchmarks/liquid-flow/buildup_test/index.md @@ -50,7 +50,7 @@ increases in the opposite direction of the *X*-axis. Therefore, the linear section appears at the left side of the diagram. \centering -{{< img src="../horner.png" >}} +{{< img src="horner.png" >}} Figure 1: Horner plot ($p$ vs $(t_p+\Delta t)/\Delta t$) for buildup test showing the inferred Horner straight line @@ -105,11 +105,11 @@ fits with the analytical solution very well. The absolute and relative error between the analytical and numerical solution is depicted in Figure 3. -{{< img src="../comparison.png" >}} +{{< img src="comparison.png" >}} Figure 2: OGS 6 result compared with analytical solution -{{< img src="../error.png" >}} +{{< img src="error.png" >}} Figure 3: Absolute and relative error diff --git a/web/content/docs/benchmarks/liquid-flow/drainage_LiquidFlow.pdf b/web/content/docs/benchmarks/liquid-flow/drainage_Liquid_Flow/drainage_LiquidFlow.pdf similarity index 100% rename from web/content/docs/benchmarks/liquid-flow/drainage_LiquidFlow.pdf rename to web/content/docs/benchmarks/liquid-flow/drainage_Liquid_Flow/drainage_LiquidFlow.pdf diff --git a/web/content/docs/benchmarks/liquid-flow/drainage_excavation.png b/web/content/docs/benchmarks/liquid-flow/drainage_Liquid_Flow/drainage_excavation.png similarity index 100% rename from web/content/docs/benchmarks/liquid-flow/drainage_excavation.png rename to web/content/docs/benchmarks/liquid-flow/drainage_Liquid_Flow/drainage_excavation.png diff --git a/web/content/docs/benchmarks/liquid-flow/drainage_Liquid_Flow.md b/web/content/docs/benchmarks/liquid-flow/drainage_Liquid_Flow/index.md similarity index 84% rename from web/content/docs/benchmarks/liquid-flow/drainage_Liquid_Flow.md rename to web/content/docs/benchmarks/liquid-flow/drainage_Liquid_Flow/index.md index 31f7965a09..25dbc424d4 100644 --- a/web/content/docs/benchmarks/liquid-flow/drainage_Liquid_Flow.md +++ b/web/content/docs/benchmarks/liquid-flow/drainage_Liquid_Flow/index.md @@ -14,8 +14,8 @@ project = "/Parabolic/LiquidFlow/DrainageExcavation/drainage_LiquidFlow.prj" ## Problem description -We present the drainage of an excavation benchmark in this [this PDF](../drainage_LiquidFlow.pdf). +We present the drainage of an excavation benchmark in this [this PDF](drainage_LiquidFlow.pdf). Here's an impression of the problem and its results: -{{< img src="../drainage_excavation.png" >}} +{{< img src="drainage_excavation.png" >}} diff --git a/web/content/docs/benchmarks/liquid-flow/inclined_1D_in_3D_sphere.png b/web/content/docs/benchmarks/liquid-flow/flow_in_fracture/inclined_1D_in_3D_sphere.png similarity index 100% rename from web/content/docs/benchmarks/liquid-flow/inclined_1D_in_3D_sphere.png rename to web/content/docs/benchmarks/liquid-flow/flow_in_fracture/inclined_1D_in_3D_sphere.png diff --git a/web/content/docs/benchmarks/liquid-flow/inclined_2D_in_3D.png b/web/content/docs/benchmarks/liquid-flow/flow_in_fracture/inclined_2D_in_3D.png similarity index 100% rename from web/content/docs/benchmarks/liquid-flow/inclined_2D_in_3D.png rename to web/content/docs/benchmarks/liquid-flow/flow_in_fracture/inclined_2D_in_3D.png diff --git a/web/content/docs/benchmarks/liquid-flow/inclined_2D_mesh.png b/web/content/docs/benchmarks/liquid-flow/flow_in_fracture/inclined_2D_mesh.png similarity index 100% rename from web/content/docs/benchmarks/liquid-flow/inclined_2D_mesh.png rename to web/content/docs/benchmarks/liquid-flow/flow_in_fracture/inclined_2D_mesh.png diff --git a/web/content/docs/benchmarks/liquid-flow/flow_in_fracture.md b/web/content/docs/benchmarks/liquid-flow/flow_in_fracture/index.md similarity index 95% rename from web/content/docs/benchmarks/liquid-flow/flow_in_fracture.md rename to web/content/docs/benchmarks/liquid-flow/flow_in_fracture/index.md index 0c2f96a23f..2b2d27045e 100644 --- a/web/content/docs/benchmarks/liquid-flow/flow_in_fracture.md +++ b/web/content/docs/benchmarks/liquid-flow/flow_in_fracture/index.md @@ -28,7 +28,7 @@ Under this topic, there are two benchmarks using the same 2D mesh on an inclined For the hydro-steady state one, it gives zero velocity. For the transient simulation, the orientation calculated velocity is shown in the following figure, which is parallel to the mesh plane as what expected. -{{< img src="../inclined_2D_mesh.png" >}} +{{< img src="inclined_2D_mesh.png" >}} ## Flow in rock matrix with two intersected fractures The input files are given in the sub-directory of FractureIn3D. @@ -47,7 +47,7 @@ the permeability of and the gravity. The following figure shows the pressure distribution and the flow orientation on the fractures. It can be seen that the flow orientation is exactly parallel to the fracture planes as what expected. -{{< img src="../inclined_2D_in_3D.png" >}} +{{< img src="inclined_2D_in_3D.png" >}} ## Line elements on a sphere The input files are given in the sub-directory of 1Din3D. @@ -58,4 +58,4 @@ This an artificial example is used to test the simulation with a mesh only with A fixed pressure difference is applied at the two poles of the sphere. As shown in the following figure, the computed flow orientation is exactly on the tangent of the boundary of the vertical splices of the sphere. -{{< img src="../inclined_1D_in_3D_sphere.png" >}} +{{< img src="inclined_1D_in_3D_sphere.png" >}} diff --git a/web/content/docs/benchmarks/liquid-flow/liquid-flow-theis-problem.md b/web/content/docs/benchmarks/liquid-flow/liquid-flow-theis-problem/index.md similarity index 99% rename from web/content/docs/benchmarks/liquid-flow/liquid-flow-theis-problem.md rename to web/content/docs/benchmarks/liquid-flow/liquid-flow-theis-problem/index.md index 9b578cd0c9..842dd67206 100644 --- a/web/content/docs/benchmarks/liquid-flow/liquid-flow-theis-problem.md +++ b/web/content/docs/benchmarks/liquid-flow/liquid-flow-theis-problem/index.md @@ -59,7 +59,7 @@ where $\gamma\approx$ 0.5772 is the Euler-Mascheroni constant. For practical pur The following figure compares the analytical solution, the result by ogs5, and the result by ogs6 (labeled as `pressure`) within the range that satisfies $u <$ 0.05. -{{< img src="../theis_comparison.png" >}} +{{< img src="theis_comparison.png" >}} The figure shows that there is a good match between the analytical solution and the numerical solution obtained by using ogs5 or ogs6. diff --git a/web/content/docs/benchmarks/liquid-flow/theis_comparison.png b/web/content/docs/benchmarks/liquid-flow/liquid-flow-theis-problem/theis_comparison.png similarity index 100% rename from web/content/docs/benchmarks/liquid-flow/theis_comparison.png rename to web/content/docs/benchmarks/liquid-flow/liquid-flow-theis-problem/theis_comparison.png diff --git a/web/content/docs/benchmarks/liquid-flow/PVCDBC_1_ts_2.png b/web/content/docs/benchmarks/liquid-flow/primary-variable-constrain-dirichlet-boundary-condition/PVCDBC_1_ts_2.png similarity index 100% rename from web/content/docs/benchmarks/liquid-flow/PVCDBC_1_ts_2.png rename to web/content/docs/benchmarks/liquid-flow/primary-variable-constrain-dirichlet-boundary-condition/PVCDBC_1_ts_2.png diff --git a/web/content/docs/benchmarks/liquid-flow/primary-variable-constrain-dirichlet-boundary-condition.md b/web/content/docs/benchmarks/liquid-flow/primary-variable-constrain-dirichlet-boundary-condition/index.md similarity index 98% rename from web/content/docs/benchmarks/liquid-flow/primary-variable-constrain-dirichlet-boundary-condition.md rename to web/content/docs/benchmarks/liquid-flow/primary-variable-constrain-dirichlet-boundary-condition/index.md index a81ac70813..7e013d3a1c 100644 --- a/web/content/docs/benchmarks/liquid-flow/primary-variable-constrain-dirichlet-boundary-condition.md +++ b/web/content/docs/benchmarks/liquid-flow/primary-variable-constrain-dirichlet-boundary-condition/index.md @@ -64,4 +64,4 @@ At the beginning of the simulation the PVCDBC is inactive. Because of the after the first time step and the PVCDBC is activated in the second time step. The effect is depicted in the figure: -{{< img src="../PVCDBC_1_ts_2.png" >}} +{{< img src="PVCDBC_1_ts_2.png" >}} diff --git a/web/content/docs/benchmarks/liquid-flow/TimeDependentHeterogeneousBoundaryConditionsAndSourceTerm.mp4 b/web/content/docs/benchmarks/liquid-flow/time-dependent-heterogeneous-source-term-and-boundary-conditions/TimeDependentHeterogeneousBoundaryConditionsAndSourceTerm.mp4 similarity index 100% rename from web/content/docs/benchmarks/liquid-flow/TimeDependentHeterogeneousBoundaryConditionsAndSourceTerm.mp4 rename to web/content/docs/benchmarks/liquid-flow/time-dependent-heterogeneous-source-term-and-boundary-conditions/TimeDependentHeterogeneousBoundaryConditionsAndSourceTerm.mp4 diff --git a/web/content/docs/benchmarks/liquid-flow/time-dependent-heterogeneous-source-term-and-boundary-conditions.md b/web/content/docs/benchmarks/liquid-flow/time-dependent-heterogeneous-source-term-and-boundary-conditions/index.md similarity index 93% rename from web/content/docs/benchmarks/liquid-flow/time-dependent-heterogeneous-source-term-and-boundary-conditions.md rename to web/content/docs/benchmarks/liquid-flow/time-dependent-heterogeneous-source-term-and-boundary-conditions/index.md index 93eeb49914..f399a9e7f1 100644 --- a/web/content/docs/benchmarks/liquid-flow/time-dependent-heterogeneous-source-term-and-boundary-conditions.md +++ b/web/content/docs/benchmarks/liquid-flow/time-dependent-heterogeneous-source-term-and-boundary-conditions/index.md @@ -77,9 +77,9 @@ quarter as a source, and in the last quarter as a sink again. ## Results diff --git a/web/content/docs/benchmarks/liquid-flow/Dupuit_Scenario_A.jpg b/web/content/docs/benchmarks/liquid-flow/unconfined-aquifer/Dupuit_Scenario_A.jpg similarity index 100% rename from web/content/docs/benchmarks/liquid-flow/Dupuit_Scenario_A.jpg rename to web/content/docs/benchmarks/liquid-flow/unconfined-aquifer/Dupuit_Scenario_A.jpg diff --git a/web/content/docs/benchmarks/liquid-flow/Dupuit_Scenario_B.jpg b/web/content/docs/benchmarks/liquid-flow/unconfined-aquifer/Dupuit_Scenario_B.jpg similarity index 100% rename from web/content/docs/benchmarks/liquid-flow/Dupuit_Scenario_B.jpg rename to web/content/docs/benchmarks/liquid-flow/unconfined-aquifer/Dupuit_Scenario_B.jpg diff --git a/web/content/docs/benchmarks/liquid-flow/Dupuit_Scenario_C.jpg b/web/content/docs/benchmarks/liquid-flow/unconfined-aquifer/Dupuit_Scenario_C.jpg similarity index 100% rename from web/content/docs/benchmarks/liquid-flow/Dupuit_Scenario_C.jpg rename to web/content/docs/benchmarks/liquid-flow/unconfined-aquifer/Dupuit_Scenario_C.jpg diff --git a/web/content/docs/benchmarks/liquid-flow/Dupuit_Scenario_D.jpg b/web/content/docs/benchmarks/liquid-flow/unconfined-aquifer/Dupuit_Scenario_D.jpg similarity index 100% rename from web/content/docs/benchmarks/liquid-flow/Dupuit_Scenario_D.jpg rename to web/content/docs/benchmarks/liquid-flow/unconfined-aquifer/Dupuit_Scenario_D.jpg diff --git a/web/content/docs/benchmarks/liquid-flow/unconfined-aquifer.md b/web/content/docs/benchmarks/liquid-flow/unconfined-aquifer/index.md similarity index 96% rename from web/content/docs/benchmarks/liquid-flow/unconfined-aquifer.md rename to web/content/docs/benchmarks/liquid-flow/unconfined-aquifer/index.md index f598a190c1..609cf1ae3e 100644 --- a/web/content/docs/benchmarks/liquid-flow/unconfined-aquifer.md +++ b/web/content/docs/benchmarks/liquid-flow/unconfined-aquifer/index.md @@ -81,26 +81,26 @@ The basic scenario for the two-dimensional unconfined aquifer: - In the north there is a fixed head boundary condition with 15 m. - The southern boundary has a fixed head boundary condition with 25 m. - the Specific Yield is set to $S_y = 0.0$ -{{< img src="../Dupuit_Scenario_A.jpg" >}} +{{< img src="Dupuit_Scenario_A.jpg" >}} ### Scenario B - Like scenario A and additionally - with an average groundwater recharge rate = 3.54745E-09 m/s -{{< img src="../Dupuit_Scenario_B.jpg" >}} +{{< img src="Dupuit_Scenario_B.jpg" >}} ### Scenario C - like scenario A but - with an inflow rate of 4.62963E-05 m3/s per meter at the southern boundary -{{< img src="../Dupuit_Scenario_C.jpg" >}} +{{< img src="Dupuit_Scenario_C.jpg" >}} ### Scenario D - like scenario A but transient and - with a Specific Yield $S_y_ = 0.25$. - Simulation time = 100 days. -{{< img src="../Dupuit_Scenario_D.jpg" >}} +{{< img src="Dupuit_Scenario_D.jpg" >}} ### References -- GitLab From f09a5829f628bbb19d020de5e5fd572d78e530a8 Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Tue, 29 Mar 2022 12:01:08 +0200 Subject: [PATCH 10/17] [web] Converted to page bundle: phase-field. --- .../{ => pf_perc}/ME2_stress_state_1.pdf | Bin .../{ => pf_perc}/ME2_stress_state_2.pdf | Bin .../phase-field/{ => pf_perc}/VPF_ME2_case1.png | Bin .../phase-field/{ => pf_perc}/VPF_ME2_case2.png | Bin .../{ => pf_perc}/Yoshioka_percolation.pdf | Bin .../phase-field/{pf_perc.md => pf_perc/index.md} | 10 +++++----- .../benchmarks/phase-field/{ => pf_tpb}/TPB_exp.png | Bin .../{ => pf_tpb}/VPF_ME1_NF_CMOD_comp.png | Bin .../phase-field/{ => pf_tpb}/VPF_ME1_frac.png | Bin .../phase-field/{pf_tpb.md => pf_tpb/index.md} | 6 +++--- .../{ => pf_tpb_ani}/ME1_ext_2D_orth_result.png | Bin .../{ => pf_tpb_ani}/ME1_ext_2D_orthogonal_init.png | Bin .../{ => pf_tpb_ani}/ME1_ext_2D_para_result.png | Bin .../{ => pf_tpb_ani}/ME1_ext_2D_parallel_init.png | Bin .../{ => pf_tpb_ani}/VPF_ME1_ex_NF_CMOD.png | Bin .../{pf_tpb_ani.md => pf_tpb_ani/index.md} | 10 +++++----- .../phase-field/{ => phasefield}/Miao_Biot2017.pdf | Bin .../phase-field/{ => phasefield}/beam.png | Bin .../phase-field/{ => phasefield}/beam_d.png | Bin .../phase-field/{ => phasefield}/beam_u.png | Bin .../phase-field/{ => phasefield}/error_u.png | Bin .../{phasefield.md => phasefield/index.md} | 10 +++++----- 22 files changed, 18 insertions(+), 18 deletions(-) rename web/content/docs/benchmarks/phase-field/{ => pf_perc}/ME2_stress_state_1.pdf (100%) rename web/content/docs/benchmarks/phase-field/{ => pf_perc}/ME2_stress_state_2.pdf (100%) rename web/content/docs/benchmarks/phase-field/{ => pf_perc}/VPF_ME2_case1.png (100%) rename web/content/docs/benchmarks/phase-field/{ => pf_perc}/VPF_ME2_case2.png (100%) rename web/content/docs/benchmarks/phase-field/{ => pf_perc}/Yoshioka_percolation.pdf (100%) rename web/content/docs/benchmarks/phase-field/{pf_perc.md => pf_perc/index.md} (67%) rename web/content/docs/benchmarks/phase-field/{ => pf_tpb}/TPB_exp.png (100%) rename web/content/docs/benchmarks/phase-field/{ => pf_tpb}/VPF_ME1_NF_CMOD_comp.png (100%) rename web/content/docs/benchmarks/phase-field/{ => pf_tpb}/VPF_ME1_frac.png (100%) rename web/content/docs/benchmarks/phase-field/{pf_tpb.md => pf_tpb/index.md} (88%) rename web/content/docs/benchmarks/phase-field/{ => pf_tpb_ani}/ME1_ext_2D_orth_result.png (100%) rename web/content/docs/benchmarks/phase-field/{ => pf_tpb_ani}/ME1_ext_2D_orthogonal_init.png (100%) rename web/content/docs/benchmarks/phase-field/{ => pf_tpb_ani}/ME1_ext_2D_para_result.png (100%) rename web/content/docs/benchmarks/phase-field/{ => pf_tpb_ani}/ME1_ext_2D_parallel_init.png (100%) rename web/content/docs/benchmarks/phase-field/{ => pf_tpb_ani}/VPF_ME1_ex_NF_CMOD.png (100%) rename web/content/docs/benchmarks/phase-field/{pf_tpb_ani.md => pf_tpb_ani/index.md} (77%) rename web/content/docs/benchmarks/phase-field/{ => phasefield}/Miao_Biot2017.pdf (100%) rename web/content/docs/benchmarks/phase-field/{ => phasefield}/beam.png (100%) rename web/content/docs/benchmarks/phase-field/{ => phasefield}/beam_d.png (100%) rename web/content/docs/benchmarks/phase-field/{ => phasefield}/beam_u.png (100%) rename web/content/docs/benchmarks/phase-field/{ => phasefield}/error_u.png (100%) rename web/content/docs/benchmarks/phase-field/{phasefield.md => phasefield/index.md} (86%) diff --git a/web/content/docs/benchmarks/phase-field/ME2_stress_state_1.pdf b/web/content/docs/benchmarks/phase-field/pf_perc/ME2_stress_state_1.pdf similarity index 100% rename from web/content/docs/benchmarks/phase-field/ME2_stress_state_1.pdf rename to web/content/docs/benchmarks/phase-field/pf_perc/ME2_stress_state_1.pdf diff --git a/web/content/docs/benchmarks/phase-field/ME2_stress_state_2.pdf b/web/content/docs/benchmarks/phase-field/pf_perc/ME2_stress_state_2.pdf similarity index 100% rename from web/content/docs/benchmarks/phase-field/ME2_stress_state_2.pdf rename to web/content/docs/benchmarks/phase-field/pf_perc/ME2_stress_state_2.pdf diff --git a/web/content/docs/benchmarks/phase-field/VPF_ME2_case1.png b/web/content/docs/benchmarks/phase-field/pf_perc/VPF_ME2_case1.png similarity index 100% rename from web/content/docs/benchmarks/phase-field/VPF_ME2_case1.png rename to web/content/docs/benchmarks/phase-field/pf_perc/VPF_ME2_case1.png diff --git a/web/content/docs/benchmarks/phase-field/VPF_ME2_case2.png b/web/content/docs/benchmarks/phase-field/pf_perc/VPF_ME2_case2.png similarity index 100% rename from web/content/docs/benchmarks/phase-field/VPF_ME2_case2.png rename to web/content/docs/benchmarks/phase-field/pf_perc/VPF_ME2_case2.png diff --git a/web/content/docs/benchmarks/phase-field/Yoshioka_percolation.pdf b/web/content/docs/benchmarks/phase-field/pf_perc/Yoshioka_percolation.pdf similarity index 100% rename from web/content/docs/benchmarks/phase-field/Yoshioka_percolation.pdf rename to web/content/docs/benchmarks/phase-field/pf_perc/Yoshioka_percolation.pdf diff --git a/web/content/docs/benchmarks/phase-field/pf_perc.md b/web/content/docs/benchmarks/phase-field/pf_perc/index.md similarity index 67% rename from web/content/docs/benchmarks/phase-field/pf_perc.md rename to web/content/docs/benchmarks/phase-field/pf_perc/index.md index edcc4c598b..8ca6f0b38c 100644 --- a/web/content/docs/benchmarks/phase-field/pf_perc.md +++ b/web/content/docs/benchmarks/phase-field/pf_perc/index.md @@ -17,13 +17,13 @@ weight = 158 **Note**, this project file runs only with a modified version of OGS which you can find [here](https://github.com/KeitaYoshioka/ogs/tree/H2M_phasefield). -We simulate two different fluid percolation experiments performed on rock salt samples with a true tri-axial loading system as described in [this PDF](../Yoshioka_percolation.pdf). The experiments were performed under two different stress configurations as below. -{{< img src="../ME2_stress_state_1.pdf" >}} -{{< img src="../ME2_stress_state_2.pdf" >}} +We simulate two different fluid percolation experiments performed on rock salt samples with a true tri-axial loading system as described in [this PDF](Yoshioka_percolation.pdf). The experiments were performed under two different stress configurations as below. +{{< img src="ME2_stress_state_1.pdf" >}} +{{< img src="ME2_stress_state_2.pdf" >}} ## Results and evaluation Simulated crack paths (phase-field) for the two cases are shown below: -{{< img src="../VPF_ME2_case1.png" >}} -{{< img src="../VPF_ME2_case2.png" >}} +{{< img src="VPF_ME2_case1.png" >}} +{{< img src="VPF_ME2_case2.png" >}} diff --git a/web/content/docs/benchmarks/phase-field/TPB_exp.png b/web/content/docs/benchmarks/phase-field/pf_tpb/TPB_exp.png similarity index 100% rename from web/content/docs/benchmarks/phase-field/TPB_exp.png rename to web/content/docs/benchmarks/phase-field/pf_tpb/TPB_exp.png diff --git a/web/content/docs/benchmarks/phase-field/VPF_ME1_NF_CMOD_comp.png b/web/content/docs/benchmarks/phase-field/pf_tpb/VPF_ME1_NF_CMOD_comp.png similarity index 100% rename from web/content/docs/benchmarks/phase-field/VPF_ME1_NF_CMOD_comp.png rename to web/content/docs/benchmarks/phase-field/pf_tpb/VPF_ME1_NF_CMOD_comp.png diff --git a/web/content/docs/benchmarks/phase-field/VPF_ME1_frac.png b/web/content/docs/benchmarks/phase-field/pf_tpb/VPF_ME1_frac.png similarity index 100% rename from web/content/docs/benchmarks/phase-field/VPF_ME1_frac.png rename to web/content/docs/benchmarks/phase-field/pf_tpb/VPF_ME1_frac.png diff --git a/web/content/docs/benchmarks/phase-field/pf_tpb.md b/web/content/docs/benchmarks/phase-field/pf_tpb/index.md similarity index 88% rename from web/content/docs/benchmarks/phase-field/pf_tpb.md rename to web/content/docs/benchmarks/phase-field/pf_tpb/index.md index e766938611..bfc5b9523a 100644 --- a/web/content/docs/benchmarks/phase-field/pf_tpb.md +++ b/web/content/docs/benchmarks/phase-field/pf_tpb/index.md @@ -18,14 +18,14 @@ weight = 158 which you can find [here](https://github.com/KeitaYoshioka/ogs/tree/H2M_phasefield). We simulate a three point bending test performed on Rockville granite as shown below. Details of the experiment can be found in Tarok et al. 2017. -{{< img src="../TPB_exp.png" >}} +{{< img src="TPB_exp.png" >}} ## Results and evaluation Developed crack (phase-field) and the crack mouth opening displacement (CMOD) vs. the force are shown below. -{{< img src="../VPF_ME1_frac.png" >}} -{{< img src="../VPF_ME1_NF_CMOD_comp.png" >}} +{{< img src="VPF_ME1_frac.png" >}} +{{< img src="VPF_ME1_NF_CMOD_comp.png" >}} The model is able to simulate up to the brittle elastic failure, but as cracked surfaces are currently treated as frictionless, the behavior after the failure deviates from the experiment results. diff --git a/web/content/docs/benchmarks/phase-field/ME1_ext_2D_orth_result.png b/web/content/docs/benchmarks/phase-field/pf_tpb_ani/ME1_ext_2D_orth_result.png similarity index 100% rename from web/content/docs/benchmarks/phase-field/ME1_ext_2D_orth_result.png rename to web/content/docs/benchmarks/phase-field/pf_tpb_ani/ME1_ext_2D_orth_result.png diff --git a/web/content/docs/benchmarks/phase-field/ME1_ext_2D_orthogonal_init.png b/web/content/docs/benchmarks/phase-field/pf_tpb_ani/ME1_ext_2D_orthogonal_init.png similarity index 100% rename from web/content/docs/benchmarks/phase-field/ME1_ext_2D_orthogonal_init.png rename to web/content/docs/benchmarks/phase-field/pf_tpb_ani/ME1_ext_2D_orthogonal_init.png diff --git a/web/content/docs/benchmarks/phase-field/ME1_ext_2D_para_result.png b/web/content/docs/benchmarks/phase-field/pf_tpb_ani/ME1_ext_2D_para_result.png similarity index 100% rename from web/content/docs/benchmarks/phase-field/ME1_ext_2D_para_result.png rename to web/content/docs/benchmarks/phase-field/pf_tpb_ani/ME1_ext_2D_para_result.png diff --git a/web/content/docs/benchmarks/phase-field/ME1_ext_2D_parallel_init.png b/web/content/docs/benchmarks/phase-field/pf_tpb_ani/ME1_ext_2D_parallel_init.png similarity index 100% rename from web/content/docs/benchmarks/phase-field/ME1_ext_2D_parallel_init.png rename to web/content/docs/benchmarks/phase-field/pf_tpb_ani/ME1_ext_2D_parallel_init.png diff --git a/web/content/docs/benchmarks/phase-field/VPF_ME1_ex_NF_CMOD.png b/web/content/docs/benchmarks/phase-field/pf_tpb_ani/VPF_ME1_ex_NF_CMOD.png similarity index 100% rename from web/content/docs/benchmarks/phase-field/VPF_ME1_ex_NF_CMOD.png rename to web/content/docs/benchmarks/phase-field/pf_tpb_ani/VPF_ME1_ex_NF_CMOD.png diff --git a/web/content/docs/benchmarks/phase-field/pf_tpb_ani.md b/web/content/docs/benchmarks/phase-field/pf_tpb_ani/index.md similarity index 77% rename from web/content/docs/benchmarks/phase-field/pf_tpb_ani.md rename to web/content/docs/benchmarks/phase-field/pf_tpb_ani/index.md index cad5e75125..6c3452959e 100644 --- a/web/content/docs/benchmarks/phase-field/pf_tpb_ani.md +++ b/web/content/docs/benchmarks/phase-field/pf_tpb_ani/index.md @@ -18,16 +18,16 @@ weight = 158 which you can find [here](https://github.com/KeitaYoshioka/ogs/tree/H2M_phasefield). We simulate three point bending tests performed on lamination orthogonal and parallel. The layer lamination is represented through the fracture toughnss $G_c$ as shown below. -{{< img src="../ME1_ext_2D_orthogonal_init.png" >}} -{{< img src="../ME1_ext_2D_parallel_init.png" >}} +{{< img src="ME1_ext_2D_orthogonal_init.png" >}} +{{< img src="ME1_ext_2D_parallel_init.png" >}} ## Results and evaluation Simulated crack path (phase-field) for the lamination orthogonal and the parallel are shown below: -{{< img src="../ME1_ext_2D_orth_result.png" >}} -{{< img src="../ME1_ext_2D_para_result.png" >}} +{{< img src="ME1_ext_2D_orth_result.png" >}} +{{< img src="ME1_ext_2D_para_result.png" >}} The responses of crack mouth opening displacement (CMOD) vs. force is as follows. -{{< img src="../VPF_ME1_ex_NF_CMOD.png" >}} \ No newline at end of file +{{< img src="VPF_ME1_ex_NF_CMOD.png" >}} \ No newline at end of file diff --git a/web/content/docs/benchmarks/phase-field/Miao_Biot2017.pdf b/web/content/docs/benchmarks/phase-field/phasefield/Miao_Biot2017.pdf similarity index 100% rename from web/content/docs/benchmarks/phase-field/Miao_Biot2017.pdf rename to web/content/docs/benchmarks/phase-field/phasefield/Miao_Biot2017.pdf diff --git a/web/content/docs/benchmarks/phase-field/beam.png b/web/content/docs/benchmarks/phase-field/phasefield/beam.png similarity index 100% rename from web/content/docs/benchmarks/phase-field/beam.png rename to web/content/docs/benchmarks/phase-field/phasefield/beam.png diff --git a/web/content/docs/benchmarks/phase-field/beam_d.png b/web/content/docs/benchmarks/phase-field/phasefield/beam_d.png similarity index 100% rename from web/content/docs/benchmarks/phase-field/beam_d.png rename to web/content/docs/benchmarks/phase-field/phasefield/beam_d.png diff --git a/web/content/docs/benchmarks/phase-field/beam_u.png b/web/content/docs/benchmarks/phase-field/phasefield/beam_u.png similarity index 100% rename from web/content/docs/benchmarks/phase-field/beam_u.png rename to web/content/docs/benchmarks/phase-field/phasefield/beam_u.png diff --git a/web/content/docs/benchmarks/phase-field/error_u.png b/web/content/docs/benchmarks/phase-field/phasefield/error_u.png similarity index 100% rename from web/content/docs/benchmarks/phase-field/error_u.png rename to web/content/docs/benchmarks/phase-field/phasefield/error_u.png diff --git a/web/content/docs/benchmarks/phase-field/phasefield.md b/web/content/docs/benchmarks/phase-field/phasefield/index.md similarity index 86% rename from web/content/docs/benchmarks/phase-field/phasefield.md rename to web/content/docs/benchmarks/phase-field/phasefield/index.md index 7b98dcf335..6c58c7d46e 100644 --- a/web/content/docs/benchmarks/phase-field/phasefield.md +++ b/web/content/docs/benchmarks/phase-field/phasefield/index.md @@ -15,18 +15,18 @@ weight = 158 ## Problem description -We solve a homogeneous beam model under a given displacement loading. The length of the beam is 2\,mm. Detailed model description can refer [this PDF](../Miao_Biot2017.pdf). +We solve a homogeneous beam model under a given displacement loading. The length of the beam is 2\,mm. Detailed model description can refer [this PDF](Miao_Biot2017.pdf). ## Results and evaluation Results show crack Phase-Field and displacement field distributions through the length of the beam: -{{< img src="../beam.png" >}} -{{< img src="../beam_d.png" >}} -{{< img src="../beam_u.png" >}} +{{< img src="beam.png" >}} +{{< img src="beam_d.png" >}} +{{< img src="beam_u.png" >}} For highlighting the deviation between the analytical and numerical solution, we provide the absolute error of the analytical solution and numerical simulation as follows: -{{< img src="../error_u.png" >}} +{{< img src="error_u.png" >}} The analytical solution is: $$ -- GitLab From a15769104205b224e63d22820f697175695ac713 Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Tue, 29 Mar 2022 12:03:56 +0200 Subject: [PATCH 11/17] [web] Converted to page bundle: python-bc. --- .../elder-benchmark/{elder.md => elder/index.md} | 0 .../{ => hertz-contact}/contact_radii.png | Bin .../{ => hertz-contact}/hertz-contact.png | Bin .../{ => hertz-contact}/hertz-contact.svg | 0 .../{hertz-contact.md => hertz-contact/index.md} | 8 ++++---- .../{ => hertz-contact}/stress_at_contact.png | Bin .../{ => hertz-contact}/total_force.png | Bin .../index.md} | 4 ++-- .../python_laplace_eq_diff.png | Bin .../python_laplace_eq_solution.png | Bin .../python-bc/piston/{piston.md => piston/index.md} | 6 +++--- .../python-bc/piston/{ => piston}/load-steps.png | Bin .../piston/{ => piston}/pressure-displacement.png | Bin .../python-bc/piston/{ => piston}/sketch-piston.png | Bin .../python-bc/piston/{ => piston}/sketch-piston.svg | 0 15 files changed, 9 insertions(+), 9 deletions(-) rename web/content/docs/benchmarks/python-bc/elder-benchmark/{elder.md => elder/index.md} (100%) rename web/content/docs/benchmarks/python-bc/hertz-contact/{ => hertz-contact}/contact_radii.png (100%) rename web/content/docs/benchmarks/python-bc/hertz-contact/{ => hertz-contact}/hertz-contact.png (100%) rename web/content/docs/benchmarks/python-bc/hertz-contact/{ => hertz-contact}/hertz-contact.svg (100%) rename web/content/docs/benchmarks/python-bc/hertz-contact/{hertz-contact.md => hertz-contact/index.md} (94%) rename web/content/docs/benchmarks/python-bc/hertz-contact/{ => hertz-contact}/stress_at_contact.png (100%) rename web/content/docs/benchmarks/python-bc/hertz-contact/{ => hertz-contact}/total_force.png (100%) rename web/content/docs/benchmarks/python-bc/laplace-equation/{python-laplace-eq.md => python-laplace-eq/index.md} (96%) rename web/content/docs/benchmarks/python-bc/laplace-equation/{ => python-laplace-eq}/python_laplace_eq_diff.png (100%) rename web/content/docs/benchmarks/python-bc/laplace-equation/{ => python-laplace-eq}/python_laplace_eq_solution.png (100%) rename web/content/docs/benchmarks/python-bc/piston/{piston.md => piston/index.md} (91%) rename web/content/docs/benchmarks/python-bc/piston/{ => piston}/load-steps.png (100%) rename web/content/docs/benchmarks/python-bc/piston/{ => piston}/pressure-displacement.png (100%) rename web/content/docs/benchmarks/python-bc/piston/{ => piston}/sketch-piston.png (100%) rename web/content/docs/benchmarks/python-bc/piston/{ => piston}/sketch-piston.svg (100%) diff --git a/web/content/docs/benchmarks/python-bc/elder-benchmark/elder.md b/web/content/docs/benchmarks/python-bc/elder-benchmark/elder/index.md similarity index 100% rename from web/content/docs/benchmarks/python-bc/elder-benchmark/elder.md rename to web/content/docs/benchmarks/python-bc/elder-benchmark/elder/index.md diff --git a/web/content/docs/benchmarks/python-bc/hertz-contact/contact_radii.png b/web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact/contact_radii.png similarity index 100% rename from web/content/docs/benchmarks/python-bc/hertz-contact/contact_radii.png rename to web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact/contact_radii.png diff --git a/web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact.png b/web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact/hertz-contact.png similarity index 100% rename from web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact.png rename to web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact/hertz-contact.png diff --git a/web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact.svg b/web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact/hertz-contact.svg similarity index 100% rename from web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact.svg rename to web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact/hertz-contact.svg diff --git a/web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact.md b/web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact/index.md similarity index 94% rename from web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact.md rename to web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact/index.md index 5192589ec6..e660c8b9fd 100644 --- a/web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact.md +++ b/web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact/index.md @@ -29,7 +29,7 @@ The sphere centers are displaced towards each other by $w_0$, with increasing values in every load step. Due to symmetry reasons a flat circular contact area of radius $a$ forms. -{{< img src="../hertz-contact.png" >}} +{{< img src="hertz-contact.png" >}} The contact between the two spheres is modelled as a Dirichlet BC on a varying boundary. The exact boundary and Dirichlet values for the @@ -78,15 +78,15 @@ $$ Contact radii: -{{}} +{{}} Average pressure $\bar{p}$: -{{}} +{{}} Total force $F$: -{{}} +{{}} The simulation results for contact radii and total force reproduce the analytical square root and cubic laws, respectively. diff --git a/web/content/docs/benchmarks/python-bc/hertz-contact/stress_at_contact.png b/web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact/stress_at_contact.png similarity index 100% rename from web/content/docs/benchmarks/python-bc/hertz-contact/stress_at_contact.png rename to web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact/stress_at_contact.png diff --git a/web/content/docs/benchmarks/python-bc/hertz-contact/total_force.png b/web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact/total_force.png similarity index 100% rename from web/content/docs/benchmarks/python-bc/hertz-contact/total_force.png rename to web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact/total_force.png diff --git a/web/content/docs/benchmarks/python-bc/laplace-equation/python-laplace-eq.md b/web/content/docs/benchmarks/python-bc/laplace-equation/python-laplace-eq/index.md similarity index 96% rename from web/content/docs/benchmarks/python-bc/laplace-equation/python-laplace-eq.md rename to web/content/docs/benchmarks/python-bc/laplace-equation/python-laplace-eq/index.md index af09d761ec..eaf57cf227 100644 --- a/web/content/docs/benchmarks/python-bc/laplace-equation/python-laplace-eq.md +++ b/web/content/docs/benchmarks/python-bc/laplace-equation/python-laplace-eq/index.md @@ -87,9 +87,9 @@ There $n = (1, 0)$, which implies that $a \mathop{\mathrm{grad}} u \cdot n The numerical result obtained from OpenGeoSys is: -{{< img src="../python_laplace_eq_solution.png" >}} +{{< img src="python_laplace_eq_solution.png" >}} The absolute difference between the analytical and numerical solutions is smaller than $4 \cdot 10^{-4}$: -{{< img src="../python_laplace_eq_diff.png" >}} +{{< img src="python_laplace_eq_diff.png" >}} diff --git a/web/content/docs/benchmarks/python-bc/laplace-equation/python_laplace_eq_diff.png b/web/content/docs/benchmarks/python-bc/laplace-equation/python-laplace-eq/python_laplace_eq_diff.png similarity index 100% rename from web/content/docs/benchmarks/python-bc/laplace-equation/python_laplace_eq_diff.png rename to web/content/docs/benchmarks/python-bc/laplace-equation/python-laplace-eq/python_laplace_eq_diff.png diff --git a/web/content/docs/benchmarks/python-bc/laplace-equation/python_laplace_eq_solution.png b/web/content/docs/benchmarks/python-bc/laplace-equation/python-laplace-eq/python_laplace_eq_solution.png similarity index 100% rename from web/content/docs/benchmarks/python-bc/laplace-equation/python_laplace_eq_solution.png rename to web/content/docs/benchmarks/python-bc/laplace-equation/python-laplace-eq/python_laplace_eq_solution.png diff --git a/web/content/docs/benchmarks/python-bc/piston/piston.md b/web/content/docs/benchmarks/python-bc/piston/piston/index.md similarity index 91% rename from web/content/docs/benchmarks/python-bc/piston/piston.md rename to web/content/docs/benchmarks/python-bc/piston/piston/index.md index 60e7dc5d4b..e6e47a293d 100644 --- a/web/content/docs/benchmarks/python-bc/piston/piston.md +++ b/web/content/docs/benchmarks/python-bc/piston/piston/index.md @@ -28,18 +28,18 @@ piston. The position of the piston is varied between different load steps. Friction between the piston and the chamber wall is neglected. For simplicitly, also initially the elastic piston is in an unstressed state. -{{}} +{{}} ## Results -{{}} +{{}} The figure above shows that the piston is being compressed ($y$ displacement has larger negative values at the top) by the forces acting on it. The initial position of the top part of the piston is indicated as a wireframe. -{{}} +{{}} The plot shows that the relation between the stress in the piston and its displacement coincides with the pressure-volume relation of the chamber. diff --git a/web/content/docs/benchmarks/python-bc/piston/load-steps.png b/web/content/docs/benchmarks/python-bc/piston/piston/load-steps.png similarity index 100% rename from web/content/docs/benchmarks/python-bc/piston/load-steps.png rename to web/content/docs/benchmarks/python-bc/piston/piston/load-steps.png diff --git a/web/content/docs/benchmarks/python-bc/piston/pressure-displacement.png b/web/content/docs/benchmarks/python-bc/piston/piston/pressure-displacement.png similarity index 100% rename from web/content/docs/benchmarks/python-bc/piston/pressure-displacement.png rename to web/content/docs/benchmarks/python-bc/piston/piston/pressure-displacement.png diff --git a/web/content/docs/benchmarks/python-bc/piston/sketch-piston.png b/web/content/docs/benchmarks/python-bc/piston/piston/sketch-piston.png similarity index 100% rename from web/content/docs/benchmarks/python-bc/piston/sketch-piston.png rename to web/content/docs/benchmarks/python-bc/piston/piston/sketch-piston.png diff --git a/web/content/docs/benchmarks/python-bc/piston/sketch-piston.svg b/web/content/docs/benchmarks/python-bc/piston/piston/sketch-piston.svg similarity index 100% rename from web/content/docs/benchmarks/python-bc/piston/sketch-piston.svg rename to web/content/docs/benchmarks/python-bc/piston/piston/sketch-piston.svg -- GitLab From bace0665d9705dfbc4f26d2cb8b37ae868d064f5 Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Tue, 29 Mar 2022 12:37:30 +0200 Subject: [PATCH 12/17] [web] Converted to page bundle: remaining benchmarks. --- .../index.md} | 0 .../index.md} | 0 .../{liquid_flow.md => liquid_flow/index.md} | 0 .../{mechanics.md => mechanics/index.md} | 0 .../index.md} | 0 .../index.md} | 0 .../benchmarks/creepbgra/CreepBGRa/index.md | 2 ++ .../In_out_temperature_comparison.png | Bin .../{3D_2U_BHE.md => 3D_2U_BHE/index.md} | 6 +++--- .../vertical_temperature_distribution.png | Bin ...ertical_temperature_distribution_powerBC.png | Bin .../BHE_network.png | Bin .../BHE_network_closedloop.png | Bin .../Heat_extraction_rate.png | Bin .../Heat_extraction_rate_closedloop.png | Bin .../Inflow_and_outflow_temperature.png | Bin .../Inflow_temperature_and_flow_rate.png | Bin .../Soil_temperature.png | Bin .../index.md} | 14 +++++++------- .../BHE_GW_advection_2years.zip | Bin .../index.md} | 8 ++++---- .../mesh.png | Bin .../rel_err.png | Bin .../temperature_soil_2years.png | Bin .../Inflow_temp.png | Bin ...comparison_with_experiment_data_and_OGS5.png | Bin .../index.md} | 8 ++++---- .../numerical_geometry_of_BHE.png | Bin .../soil_temp_comparison.png | Bin .../Analytical_coaxial_BHE.zip | Bin .../coaxial_deep_BHE.png | Bin .../index.md} | 8 ++++---- .../numerical_geometry_model.png | Bin .../outflow_temperature_over_time_long-term.png | Bin .../temperature_distribution_3000s.png | Bin .../Analytical_wellbore_heat_transport.zip | Bin .../T_out_comparison.png | Bin .../absolute_error_fluid_T_30d.png | Bin .../index.md} | 8 ++++---- .../pipe_flow_3d_model.png | Bin .../bhe_array_analytical_solver.py | 0 .../bhe_array_benchmark.bib | 0 .../figure_1.png | Bin .../figure_2.png | Bin .../figure_3.png | Bin .../figure_4.png | Bin .../figure_5.png | Bin .../index.md} | 10 +++++----- .../index.md} | 2 +- .../validation-1.png | Bin ...temperature_line_source_term_in_cylinder.png | Bin ...temperature_line_source_term_in_cylinder.png | Bin .../index.md} | 14 +++++++------- ...ine_source_term_in_axisymmetric_cylinder.png | Bin ...ine_source_term_in_axisymmetric_cylinder.png | Bin ...istribution_line_source_term_in_cylinder.png | Bin ...ine_source_term_in_axisymmetric_cylinder.png | Bin ...ure_profile_line_source_term_in_cylinder.png | Bin .../index.md} | 8 ++++---- .../picard_vs_newton_ts_1_t_78125.png | Bin .../picard_vs_newton_ts_3_t_234375.png | Bin .../picard_vs_newton_ts_405_t_31640625.png | Bin .../picard_vs_newton_ts_65_t_5078125.png | Bin .../temperature_error_ts_1_t_78125.png | Bin .../temperature_error_ts_3_t_234375.png | Bin .../temperature_error_ts_405_t_31640625.png | Bin .../temperature_error_ts_65_t_5078125.png | Bin .../comparison_2d.png | Bin .../comparison_3d.png | Bin .../concentration_2d.png | Bin .../concentration_3d.png | Bin .../index.md} | 12 ++++++------ .../permeability_2d.png | Bin .../permeability_3d.png | Bin .../{ => ConTracer}/ConTracer1d_results.png | Bin .../{ => ConTracer}/ConTracer2d_results.png | Bin .../{ => ConTracer}/ConTracer_domain.png | Bin .../{ConTracer.md => ConTracer/index.md} | 6 +++--- .../hydro-component/{gif => elder}/elder.gif | Bin .../{elder.md => elder/index.md} | 2 +- .../{ => goswami}/Goswami_Exp_Num_Comp.png | Bin .../{ => goswami}/Goswami_Transient_States.png | Bin .../{gif => goswami}/goswami.gif | Bin .../{goswami.md => goswami/index.md} | 6 +++--- .../DiffusionAndStorage.gif | Bin .../DiffusionAndStorageAndAdvection.gif | Bin .../DiffusionAndStorageAndAdvectionAndDecay.gif | Bin ...usionAndStorageAndAdvectionAndDispersion.gif | Bin ...nAndStorageAndAdvectionAndDispersionHalf.gif | Bin ...ionAndStorageAndGravityAndDispersionHalf.gif | Bin .../{ => hydro-component}/HC-NonBoussinesq.pdf | Bin .../{ => hydro-component}/HC-Process.pdf | Bin .../index.md} | 16 ++++++++-------- .../theis/{ => HC_Theis}/BCs.png | Bin .../theis/{ => HC_Theis}/comparison.png | Bin .../theis/{HC_Theis.md => HC_Theis/index.md} | 4 ++-- .../hydro-component/{ => vdbc}/HC-VDBCTest.pdf | Bin .../{ => vdbc}/VDBC_num_ana_comp.png | Bin .../hydro-component/{vdbc.md => vdbc/index.md} | 4 ++-- .../python-bc/elder-benchmark/elder/index.md | 2 +- .../DiffusionThermalGradient.pdf | Bin .../index.md} | 2 +- .../ResultComparison.png | Bin .../ResultComparisonPH.png | Bin .../{calcite-Figures => calcite}/Scheme.png | Bin .../{calcite.md => calcite/index.md} | 6 +++--- .../exchange/{ => exchange}/fig1.png | Bin .../exchange/{ => exchange}/fig2.png | Bin .../exchange/{exchange.md => exchange/index.md} | 4 ++-- .../KineticReactant2_domain.png | Bin .../index.md} | 2 +- .../radionuclide/{ => radionuclide}/Fig1.png | Bin .../radionuclide/{ => radionuclide}/domain.png | Bin .../{radionuclide.md => radionuclide/index.md} | 4 ++-- .../wetland/{ => Wetland}/Wetland_cwm1.png | Bin .../wetland/{ => Wetland}/Wetland_domain.png | Bin .../wetland/{Wetland.md => Wetland/index.md} | 4 ++-- .../RichardsComponentTransport_Equations.pdf | Bin .../RichardsComponentTransport_Padilla.png | Bin .../index.md} | 4 ++-- .../index.md} | 2 +- .../{ => richards-flow}/richards-2.pdf | Bin .../BishopsEffectiveStress.png | Bin .../index.md} | 2 +- .../{liakopoulos.md => liakopoulos/index.md} | 4 ++-- .../{ => liakopoulos}/liak_S.png | Bin .../{ => liakopoulos}/liak_uy.png | Bin .../ModifiedCamClay_report.pdf | Bin .../index.md} | 2 +- .../arehs-salt-T_elements.png | Bin .../arehs_saltdome_creep_S.png | Bin .../arehs_saltdome_creep_u.png | Bin .../index.md} | 6 +++--- .../LIE_SD_m_result_uy.png | Bin .../LIE_fracture_incompressibility.pdf | Bin .../LIE_small_deformation.pdf | Bin .../index.md} | 10 +++++----- .../single_joint_3D.png | Bin .../single_joint_3D_2D_results.png | Bin .../Circular_hole.pdf | Bin .../disc_with_hole_pcs_0_ts_4_t_1.000000.png | Bin .../index.md} | 4 ++-- .../element_deactivation_2D.png | Bin .../element_deactivation_2D_3D_mesh.png | Bin .../element_deactivation_3D.png | Bin .../index.md} | 6 +++--- .../index.md} | 4 ++-- .../non-equilibrium_initial_states.pdf | Bin .../non-equilibrium_initial_states.png | Bin .../index.md} | 6 +++--- .../lubby2.pdf | Bin .../lubby2.png | Bin .../lubby2_creep_over_time.png | Bin .../dp_test.png | Bin .../index.md} | 4 ++-- .../ss_load.png | Bin .../Plasticity.pdf | Bin .../index.md} | 6 +++--- .../plasticity_ss.png | Bin .../ss_load.png | 1 + .../index.md} | 2 +- .../slope_stability.pdf | Bin .../{Pressure_BC.md => Pressure_BC/index.md} | 14 +++++++------- .../{ => Pressure_BC}/pipe_axisymmetric.png | Bin .../{ => Pressure_BC}/pipe_plane_strain.png | Bin .../{ => Pressure_BC}/pressure_bc.pdf | Bin .../pressure_bc/{ => Pressure_BC}/sphere_3d.png | Bin .../{ => Pressure_BC}/sphere_axisymmetric.png | Bin .../sphere_axisymmetric_pl.png | Bin .../sphere_axisymmetric_pl_residual_stress.png | Bin .../Fig1_SchematicDiagram.png | Bin .../Fig2_SimulationResults.png | Bin .../index.md} | 4 ++-- .../{ => heat-pipe}/heat-pipe-problem.pdf | Bin .../{heat-pipe.md => heat-pipe/index.md} | 2 +- .../errordispl_vs_t.png | Bin .../errorpT_vs_t.png | Bin .../index.md} | 8 ++++---- .../resp_vs_t_square.png | Bin .../resp_vs_x_square.png | Bin .../index.md} | 6 +++--- .../t_pf.png | Bin .../therm_exp_bc.png | Bin .../uncon_com_bc.png | Bin .../index.md} | 4 ++-- .../{ => thermomechanics}/stress.png | Bin .../{ => thermomechanics}/temperature.png | Bin .../{ => CTF1}/CTF1_results_S.jpg | Bin .../{ => CTF1}/CTF1_results_T.jpg | Bin .../{CTF1.md => CTF1/index.md} | 4 ++-- .../decovalex_2023_c.png | Bin .../decovalex_2023_c_S_t.png | Bin .../decovalex_2023_c_T_t.png | Bin .../index.md} | 6 +++--- .../index.md} | 2 +- .../two-phase-flow-pp-liakopoulos/main.pdf | 1 + .../index.md} | 2 +- .../{ => two-phase-flow-pp-mcwhorter}/main.pdf | Bin .../two-phase-flow/{ => momas}/MoMaS.pdf | Bin .../two-phase-flow/{momas.md => momas/index.md} | 2 +- 200 files changed, 142 insertions(+), 138 deletions(-) rename web/content/docs/benchmarks/bgr_verification_examples/{heatconduction.md => heatconduction/index.md} (100%) rename web/content/docs/benchmarks/bgr_verification_examples/{hydromechanics.md => hydromechanics/index.md} (100%) rename web/content/docs/benchmarks/bgr_verification_examples/{liquid_flow.md => liquid_flow/index.md} (100%) rename web/content/docs/benchmarks/bgr_verification_examples/{mechanics.md => mechanics/index.md} (100%) rename web/content/docs/benchmarks/bgr_verification_examples/{thermohydromechanics.md => thermohydromechanics/index.md} (100%) rename web/content/docs/benchmarks/bgr_verification_examples/{thermomechanics.md => thermomechanics/index.md} (100%) rename web/content/docs/benchmarks/heat-transport-bhe/{3D_2U_BHE_figures => 3D_2U_BHE}/In_out_temperature_comparison.png (100%) rename web/content/docs/benchmarks/heat-transport-bhe/{3D_2U_BHE.md => 3D_2U_BHE/index.md} (94%) rename web/content/docs/benchmarks/heat-transport-bhe/{3D_2U_BHE_figures => 3D_2U_BHE}/vertical_temperature_distribution.png (100%) rename web/content/docs/benchmarks/heat-transport-bhe/{3D_2U_BHE_figures => 3D_2U_BHE}/vertical_temperature_distribution_powerBC.png (100%) rename web/content/docs/benchmarks/heat-transport-bhe/{3D_3BHEs_array_figures => 3D_3BHEs_array}/BHE_network.png (100%) rename web/content/docs/benchmarks/heat-transport-bhe/{3D_3BHEs_array_figures => 3D_3BHEs_array}/BHE_network_closedloop.png (100%) rename web/content/docs/benchmarks/heat-transport-bhe/{3D_3BHEs_array_figures => 3D_3BHEs_array}/Heat_extraction_rate.png (100%) rename web/content/docs/benchmarks/heat-transport-bhe/{3D_3BHEs_array_figures => 3D_3BHEs_array}/Heat_extraction_rate_closedloop.png (100%) rename web/content/docs/benchmarks/heat-transport-bhe/{3D_3BHEs_array_figures => 3D_3BHEs_array}/Inflow_and_outflow_temperature.png (100%) rename web/content/docs/benchmarks/heat-transport-bhe/{3D_3BHEs_array_figures => 3D_3BHEs_array}/Inflow_temperature_and_flow_rate.png (100%) rename web/content/docs/benchmarks/heat-transport-bhe/{3D_3BHEs_array_figures => 3D_3BHEs_array}/Soil_temperature.png (100%) rename web/content/docs/benchmarks/heat-transport-bhe/{3D_3BHEs_array.md => 3D_3BHEs_array/index.md} (94%) rename web/content/docs/benchmarks/heat-transport-bhe/{ => 3D_BHE_GW_advection}/BHE_GW_advection_2years.zip (100%) rename web/content/docs/benchmarks/heat-transport-bhe/{3D_BHE_GW_advection.md => 3D_BHE_GW_advection/index.md} (94%) rename web/content/docs/benchmarks/heat-transport-bhe/{3D_BHE_GW_advection_figures => 3D_BHE_GW_advection}/mesh.png (100%) rename web/content/docs/benchmarks/heat-transport-bhe/{3D_BHE_GW_advection_figures => 3D_BHE_GW_advection}/rel_err.png (100%) rename web/content/docs/benchmarks/heat-transport-bhe/{3D_BHE_GW_advection_figures => 3D_BHE_GW_advection}/temperature_soil_2years.png (100%) rename web/content/docs/benchmarks/heat-transport-bhe/{3D_Beier_sandbox_figures => 3D_Beier_sandbox}/Inflow_temp.png (100%) rename web/content/docs/benchmarks/heat-transport-bhe/{3D_Beier_sandbox_figures => 3D_Beier_sandbox}/comparison_with_experiment_data_and_OGS5.png (100%) rename web/content/docs/benchmarks/heat-transport-bhe/{3D_Beier_sandbox.md => 3D_Beier_sandbox/index.md} (94%) rename web/content/docs/benchmarks/heat-transport-bhe/{3D_Beier_sandbox_figures => 3D_Beier_sandbox}/numerical_geometry_of_BHE.png (100%) rename web/content/docs/benchmarks/heat-transport-bhe/{3D_Beier_sandbox_figures => 3D_Beier_sandbox}/soil_temp_comparison.png (100%) rename web/content/docs/benchmarks/heat-transport-bhe/{ => 3D_coaxial_deep_BHE}/Analytical_coaxial_BHE.zip (100%) rename web/content/docs/benchmarks/heat-transport-bhe/{3D_coaxial_deep_BHE_figures => 3D_coaxial_deep_BHE}/coaxial_deep_BHE.png (100%) rename web/content/docs/benchmarks/heat-transport-bhe/{3D_coaxial_deep_BHE.md => 3D_coaxial_deep_BHE/index.md} (95%) rename web/content/docs/benchmarks/heat-transport-bhe/{3D_coaxial_deep_BHE_figures => 3D_coaxial_deep_BHE}/numerical_geometry_model.png (100%) rename web/content/docs/benchmarks/heat-transport-bhe/{3D_coaxial_deep_BHE_figures => 3D_coaxial_deep_BHE}/outflow_temperature_over_time_long-term.png (100%) rename web/content/docs/benchmarks/heat-transport-bhe/{3D_coaxial_deep_BHE_figures => 3D_coaxial_deep_BHE}/temperature_distribution_3000s.png (100%) rename web/content/docs/benchmarks/heat-transport-bhe/{ => pipe_flow_EBHE}/Analytical_wellbore_heat_transport.zip (100%) rename web/content/docs/benchmarks/heat-transport-bhe/{pipe_flow_EBHE_figures => pipe_flow_EBHE}/T_out_comparison.png (100%) rename web/content/docs/benchmarks/heat-transport-bhe/{pipe_flow_EBHE_figures => pipe_flow_EBHE}/absolute_error_fluid_T_30d.png (100%) rename web/content/docs/benchmarks/heat-transport-bhe/{pipe_flow_EBHE.md => pipe_flow_EBHE/index.md} (91%) rename web/content/docs/benchmarks/heat-transport-bhe/{pipe_flow_EBHE_figures => pipe_flow_EBHE}/pipe_flow_3d_model.png (100%) rename web/content/docs/benchmarks/heatconduction/{ => BHE_array_benchmark}/bhe_array_analytical_solver.py (100%) rename web/content/docs/benchmarks/heatconduction/{ => BHE_array_benchmark}/bhe_array_benchmark.bib (100%) rename web/content/docs/benchmarks/heatconduction/{BHE_array_benchmark_figures => BHE_array_benchmark}/figure_1.png (100%) rename web/content/docs/benchmarks/heatconduction/{BHE_array_benchmark_figures => BHE_array_benchmark}/figure_2.png (100%) rename web/content/docs/benchmarks/heatconduction/{BHE_array_benchmark_figures => BHE_array_benchmark}/figure_3.png (100%) rename web/content/docs/benchmarks/heatconduction/{BHE_array_benchmark_figures => BHE_array_benchmark}/figure_4.png (100%) rename web/content/docs/benchmarks/heatconduction/{BHE_array_benchmark_figures => BHE_array_benchmark}/figure_5.png (100%) rename web/content/docs/benchmarks/heatconduction/{BHE_array_benchmark.md => BHE_array_benchmark/index.md} (96%) rename web/content/docs/benchmarks/heatconduction/{heatconduction-dirichlet.md => heatconduction-dirichlet/index.md} (98%) rename web/content/docs/benchmarks/heatconduction/{ => heatconduction-dirichlet}/validation-1.png (100%) rename web/content/docs/benchmarks/heatconduction/{LineSourceTermFigures => heatconduction-line_source_term}/comparison_plot_over_line_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_cylinder.png (100%) rename web/content/docs/benchmarks/heatconduction/{LineSourceTermFigures => heatconduction-line_source_term}/comparison_plot_over_line_rel_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_cylinder.png (100%) rename web/content/docs/benchmarks/heatconduction/{heatconduction-line_source_term.md => heatconduction-line_source_term/index.md} (81%) rename web/content/docs/benchmarks/heatconduction/{LineSourceTermFigures => heatconduction-line_source_term}/plot_over_line_diff_and_rel_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_axisymmetric_cylinder.png (100%) rename web/content/docs/benchmarks/heatconduction/{LineSourceTermFigures => heatconduction-line_source_term}/simulated_temperature_distribution_line_source_term_in_axisymmetric_cylinder.png (100%) rename web/content/docs/benchmarks/heatconduction/{LineSourceTermFigures => heatconduction-line_source_term}/temperature_distribution_line_source_term_in_cylinder.png (100%) rename web/content/docs/benchmarks/heatconduction/{LineSourceTermFigures => heatconduction-line_source_term}/temperature_profile_line_source_term_in_axisymmetric_cylinder.png (100%) rename web/content/docs/benchmarks/heatconduction/{LineSourceTermFigures => heatconduction-line_source_term}/temperature_profile_line_source_term_in_cylinder.png (100%) rename web/content/docs/benchmarks/heatconduction/{heatconduction-neumann.md => heatconduction-neumann/index.md} (79%) rename web/content/docs/benchmarks/heatconduction/{ => heatconduction-neumann}/picard_vs_newton_ts_1_t_78125.png (100%) rename web/content/docs/benchmarks/heatconduction/{ => heatconduction-neumann}/picard_vs_newton_ts_3_t_234375.png (100%) rename web/content/docs/benchmarks/heatconduction/{ => heatconduction-neumann}/picard_vs_newton_ts_405_t_31640625.png (100%) rename web/content/docs/benchmarks/heatconduction/{ => heatconduction-neumann}/picard_vs_newton_ts_65_t_5078125.png (100%) rename web/content/docs/benchmarks/heatconduction/{ => heatconduction-neumann}/temperature_error_ts_1_t_78125.png (100%) rename web/content/docs/benchmarks/heatconduction/{ => heatconduction-neumann}/temperature_error_ts_3_t_234375.png (100%) rename web/content/docs/benchmarks/heatconduction/{ => heatconduction-neumann}/temperature_error_ts_405_t_31640625.png (100%) rename web/content/docs/benchmarks/heatconduction/{ => heatconduction-neumann}/temperature_error_ts_65_t_5078125.png (100%) rename web/content/docs/benchmarks/hydro-component/{heterogeneous => HC_ogs6-vs-ogs5}/comparison_2d.png (100%) rename web/content/docs/benchmarks/hydro-component/{heterogeneous => HC_ogs6-vs-ogs5}/comparison_3d.png (100%) rename web/content/docs/benchmarks/hydro-component/{heterogeneous => HC_ogs6-vs-ogs5}/concentration_2d.png (100%) rename web/content/docs/benchmarks/hydro-component/{heterogeneous => HC_ogs6-vs-ogs5}/concentration_3d.png (100%) rename web/content/docs/benchmarks/hydro-component/{HC_ogs6-vs-ogs5.md => HC_ogs6-vs-ogs5/index.md} (73%) rename web/content/docs/benchmarks/hydro-component/{heterogeneous => HC_ogs6-vs-ogs5}/permeability_2d.png (100%) rename web/content/docs/benchmarks/hydro-component/{heterogeneous => HC_ogs6-vs-ogs5}/permeability_3d.png (100%) rename web/content/docs/benchmarks/hydro-component/contracer/{ => ConTracer}/ConTracer1d_results.png (100%) rename web/content/docs/benchmarks/hydro-component/contracer/{ => ConTracer}/ConTracer2d_results.png (100%) rename web/content/docs/benchmarks/hydro-component/contracer/{ => ConTracer}/ConTracer_domain.png (100%) rename web/content/docs/benchmarks/hydro-component/contracer/{ConTracer.md => ConTracer/index.md} (96%) rename web/content/docs/benchmarks/hydro-component/{gif => elder}/elder.gif (100%) rename web/content/docs/benchmarks/hydro-component/{elder.md => elder/index.md} (93%) rename web/content/docs/benchmarks/hydro-component/{ => goswami}/Goswami_Exp_Num_Comp.png (100%) rename web/content/docs/benchmarks/hydro-component/{ => goswami}/Goswami_Transient_States.png (100%) rename web/content/docs/benchmarks/hydro-component/{gif => goswami}/goswami.gif (100%) rename web/content/docs/benchmarks/hydro-component/{goswami.md => goswami/index.md} (73%) rename web/content/docs/benchmarks/hydro-component/{gif => hydro-component}/DiffusionAndStorage.gif (100%) rename web/content/docs/benchmarks/hydro-component/{gif => hydro-component}/DiffusionAndStorageAndAdvection.gif (100%) rename web/content/docs/benchmarks/hydro-component/{gif => hydro-component}/DiffusionAndStorageAndAdvectionAndDecay.gif (100%) rename web/content/docs/benchmarks/hydro-component/{gif => hydro-component}/DiffusionAndStorageAndAdvectionAndDispersion.gif (100%) rename web/content/docs/benchmarks/hydro-component/{gif => hydro-component}/DiffusionAndStorageAndAdvectionAndDispersionHalf.gif (100%) rename web/content/docs/benchmarks/hydro-component/{gif => hydro-component}/DiffusionAndStorageAndGravityAndDispersionHalf.gif (100%) rename web/content/docs/benchmarks/hydro-component/{ => hydro-component}/HC-NonBoussinesq.pdf (100%) rename web/content/docs/benchmarks/hydro-component/{ => hydro-component}/HC-Process.pdf (100%) rename web/content/docs/benchmarks/hydro-component/{hydro-component.md => hydro-component/index.md} (80%) rename web/content/docs/benchmarks/hydro-component/theis/{ => HC_Theis}/BCs.png (100%) rename web/content/docs/benchmarks/hydro-component/theis/{ => HC_Theis}/comparison.png (100%) rename web/content/docs/benchmarks/hydro-component/theis/{HC_Theis.md => HC_Theis/index.md} (93%) rename web/content/docs/benchmarks/hydro-component/{ => vdbc}/HC-VDBCTest.pdf (100%) rename web/content/docs/benchmarks/hydro-component/{ => vdbc}/VDBC_num_ana_comp.png (100%) rename web/content/docs/benchmarks/hydro-component/{vdbc.md => vdbc/index.md} (55%) rename web/content/docs/benchmarks/reactive-transport/ThermalDiffusion/{ => ThermalDiffusion}/DiffusionThermalGradient.pdf (100%) rename web/content/docs/benchmarks/reactive-transport/ThermalDiffusion/{ThermalDiffusion.md => ThermalDiffusion/index.md} (97%) rename web/content/docs/benchmarks/reactive-transport/{calcite-Figures => calcite}/ResultComparison.png (100%) rename web/content/docs/benchmarks/reactive-transport/{calcite-Figures => calcite}/ResultComparisonPH.png (100%) rename web/content/docs/benchmarks/reactive-transport/{calcite-Figures => calcite}/Scheme.png (100%) rename web/content/docs/benchmarks/reactive-transport/{calcite.md => calcite/index.md} (92%) rename web/content/docs/benchmarks/reactive-transport/exchange/{ => exchange}/fig1.png (100%) rename web/content/docs/benchmarks/reactive-transport/exchange/{ => exchange}/fig2.png (100%) rename web/content/docs/benchmarks/reactive-transport/exchange/{exchange.md => exchange/index.md} (81%) rename web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/{ => KineticReactant2}/KineticReactant2_domain.png (100%) rename web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/{KineticReactant2.md => KineticReactant2/index.md} (98%) rename web/content/docs/benchmarks/reactive-transport/radionuclide/{ => radionuclide}/Fig1.png (100%) rename web/content/docs/benchmarks/reactive-transport/radionuclide/{ => radionuclide}/domain.png (100%) rename web/content/docs/benchmarks/reactive-transport/radionuclide/{radionuclide.md => radionuclide/index.md} (92%) rename web/content/docs/benchmarks/reactive-transport/wetland/{ => Wetland}/Wetland_cwm1.png (100%) rename web/content/docs/benchmarks/reactive-transport/wetland/{ => Wetland}/Wetland_domain.png (100%) rename web/content/docs/benchmarks/reactive-transport/wetland/{Wetland.md => Wetland/index.md} (98%) rename web/content/docs/benchmarks/richards-flow/{ => richards-component-transport}/RichardsComponentTransport_Equations.pdf (100%) rename web/content/docs/benchmarks/richards-flow/{ => richards-component-transport}/RichardsComponentTransport_Padilla.png (100%) rename web/content/docs/benchmarks/richards-flow/{richards-component-transport.md => richards-component-transport/index.md} (89%) rename web/content/docs/benchmarks/richards-flow/{richards-flow.md => richards-flow/index.md} (87%) rename web/content/docs/benchmarks/richards-flow/{ => richards-flow}/richards-2.pdf (100%) rename web/content/docs/benchmarks/richards-mechanics/{ => bishops-effective-stress}/BishopsEffectiveStress.png (100%) rename web/content/docs/benchmarks/richards-mechanics/{bishops-effective-stress.md => bishops-effective-stress/index.md} (95%) rename web/content/docs/benchmarks/richards-mechanics/{liakopoulos.md => liakopoulos/index.md} (90%) rename web/content/docs/benchmarks/richards-mechanics/{ => liakopoulos}/liak_S.png (100%) rename web/content/docs/benchmarks/richards-mechanics/{ => liakopoulos}/liak_uy.png (100%) rename web/content/docs/benchmarks/small-deformations/{ => ModifiedCamClay}/ModifiedCamClay_report.pdf (100%) rename web/content/docs/benchmarks/small-deformations/{ModifiedCamClay.md => ModifiedCamClay/index.md} (90%) rename web/content/docs/benchmarks/small-deformations/{ => arehs_salt_dome_creep_hete_T_ref}/arehs-salt-T_elements.png (100%) rename web/content/docs/benchmarks/small-deformations/{ => arehs_salt_dome_creep_hete_T_ref}/arehs_saltdome_creep_S.png (100%) rename web/content/docs/benchmarks/small-deformations/{ => arehs_salt_dome_creep_hete_T_ref}/arehs_saltdome_creep_u.png (100%) rename web/content/docs/benchmarks/small-deformations/{arehs_salt_dome_creep_hete_T_ref.md => arehs_salt_dome_creep_hete_T_ref/index.md} (87%) rename web/content/docs/benchmarks/small-deformations/{ => lie-m-linear-single-fracture}/LIE_SD_m_result_uy.png (100%) rename web/content/docs/benchmarks/small-deformations/{ => lie-m-linear-single-fracture}/LIE_fracture_incompressibility.pdf (100%) rename web/content/docs/benchmarks/small-deformations/{ => lie-m-linear-single-fracture}/LIE_small_deformation.pdf (100%) rename web/content/docs/benchmarks/small-deformations/{lie-m-linear-single-fracture.md => lie-m-linear-single-fracture/index.md} (75%) rename web/content/docs/benchmarks/small-deformations/{ => lie-m-linear-single-fracture}/single_joint_3D.png (100%) rename web/content/docs/benchmarks/small-deformations/{ => lie-m-linear-single-fracture}/single_joint_3D_2D_results.png (100%) rename web/content/docs/benchmarks/small-deformations/{ => mechanics-linear-disc-with-hole}/Circular_hole.pdf (100%) rename web/content/docs/benchmarks/small-deformations/{ => mechanics-linear-disc-with-hole}/disc_with_hole_pcs_0_ts_4_t_1.000000.png (100%) rename web/content/docs/benchmarks/small-deformations/{mechanics-linear-disc-with-hole.md => mechanics-linear-disc-with-hole/index.md} (75%) rename web/content/docs/benchmarks/small-deformations/{ => mechanics-linear-element_deactivation}/element_deactivation_2D.png (100%) rename web/content/docs/benchmarks/small-deformations/{ => mechanics-linear-element_deactivation}/element_deactivation_2D_3D_mesh.png (100%) rename web/content/docs/benchmarks/small-deformations/{ => mechanics-linear-element_deactivation}/element_deactivation_3D.png (100%) rename web/content/docs/benchmarks/small-deformations/{mechanics-linear-element_deactivation.md => mechanics-linear-element_deactivation/index.md} (91%) rename web/content/docs/benchmarks/small-deformations/{mechanics-linear-nonequilibrium-states.md => mechanics-linear-nonequilibrium-states/index.md} (82%) rename web/content/docs/benchmarks/small-deformations/{ => mechanics-linear-nonequilibrium-states}/non-equilibrium_initial_states.pdf (100%) rename web/content/docs/benchmarks/small-deformations/{ => mechanics-linear-nonequilibrium-states}/non-equilibrium_initial_states.png (100%) rename web/content/docs/benchmarks/small-deformations/{mechanics-lubby2-shear-traction.md => mechanics-lubby2-shear-traction/index.md} (82%) rename web/content/docs/benchmarks/small-deformations/{ => mechanics-lubby2-shear-traction}/lubby2.pdf (100%) rename web/content/docs/benchmarks/small-deformations/{ => mechanics-lubby2-shear-traction}/lubby2.png (100%) rename web/content/docs/benchmarks/small-deformations/{ => mechanics-lubby2-shear-traction}/lubby2_creep_over_time.png (100%) rename web/content/docs/benchmarks/small-deformations/{ => mechanics-plasticity-ehlers-specialcase-drucker-prager}/dp_test.png (100%) rename web/content/docs/benchmarks/small-deformations/{mechanics-plasticity-ehlers-specialcase-drucker-prager.md => mechanics-plasticity-ehlers-specialcase-drucker-prager/index.md} (92%) rename web/content/docs/benchmarks/small-deformations/{ => mechanics-plasticity-ehlers-specialcase-drucker-prager}/ss_load.png (100%) rename web/content/docs/benchmarks/small-deformations/{ => mechanics-plasticity-single-surface}/Plasticity.pdf (100%) rename web/content/docs/benchmarks/small-deformations/{mechanics-plasticity-single-surface.md => mechanics-plasticity-single-surface/index.md} (80%) rename web/content/docs/benchmarks/small-deformations/{ => mechanics-plasticity-single-surface}/plasticity_ss.png (100%) create mode 120000 web/content/docs/benchmarks/small-deformations/mechanics-plasticity-single-surface/ss_load.png rename web/content/docs/benchmarks/small-deformations/{mechanics-slope-stability.md => mechanics-slope-stability/index.md} (83%) rename web/content/docs/benchmarks/small-deformations/{ => mechanics-slope-stability}/slope_stability.pdf (100%) rename web/content/docs/benchmarks/small-deformations/pressure_bc/{Pressure_BC.md => Pressure_BC/index.md} (74%) rename web/content/docs/benchmarks/small-deformations/pressure_bc/{ => Pressure_BC}/pipe_axisymmetric.png (100%) rename web/content/docs/benchmarks/small-deformations/pressure_bc/{ => Pressure_BC}/pipe_plane_strain.png (100%) rename web/content/docs/benchmarks/small-deformations/pressure_bc/{ => Pressure_BC}/pressure_bc.pdf (100%) rename web/content/docs/benchmarks/small-deformations/pressure_bc/{ => Pressure_BC}/sphere_3d.png (100%) rename web/content/docs/benchmarks/small-deformations/pressure_bc/{ => Pressure_BC}/sphere_axisymmetric.png (100%) rename web/content/docs/benchmarks/small-deformations/pressure_bc/{ => Pressure_BC}/sphere_axisymmetric_pl.png (100%) rename web/content/docs/benchmarks/small-deformations/pressure_bc/{ => Pressure_BC}/sphere_axisymmetric_pl_residual_stress.png (100%) rename web/content/docs/benchmarks/stokes-flow/{ => parallel-plate-flow}/Fig1_SchematicDiagram.png (100%) rename web/content/docs/benchmarks/stokes-flow/{ => parallel-plate-flow}/Fig2_SimulationResults.png (100%) rename web/content/docs/benchmarks/stokes-flow/{parallel-plate-flow.md => parallel-plate-flow/index.md} (86%) rename web/content/docs/benchmarks/thermal-two-phase-flow/{ => heat-pipe}/heat-pipe-problem.pdf (100%) rename web/content/docs/benchmarks/thermal-two-phase-flow/{heat-pipe.md => heat-pipe/index.md} (85%) rename web/content/docs/benchmarks/thermo-hydro-mechanics/{images => consolidation_pointheatsource}/errordispl_vs_t.png (100%) rename web/content/docs/benchmarks/thermo-hydro-mechanics/{images => consolidation_pointheatsource}/errorpT_vs_t.png (100%) rename web/content/docs/benchmarks/thermo-hydro-mechanics/{consolidation_pointheatsource.md => consolidation_pointheatsource/index.md} (96%) rename web/content/docs/benchmarks/thermo-hydro-mechanics/{images => consolidation_pointheatsource}/resp_vs_t_square.png (100%) rename web/content/docs/benchmarks/thermo-hydro-mechanics/{images => consolidation_pointheatsource}/resp_vs_x_square.png (100%) rename web/content/docs/benchmarks/thermo-mechanical-phase-field/{thermo-mechanical-phase-field.md => thermo-mechanical-phase-field/index.md} (94%) rename web/content/docs/benchmarks/thermo-mechanical-phase-field/{ => thermo-mechanical-phase-field}/t_pf.png (100%) rename web/content/docs/benchmarks/thermo-mechanical-phase-field/{ => thermo-mechanical-phase-field}/therm_exp_bc.png (100%) rename web/content/docs/benchmarks/thermo-mechanical-phase-field/{ => thermo-mechanical-phase-field}/uncon_com_bc.png (100%) rename web/content/docs/benchmarks/thermo-mechanics/{thermomechanics.md => thermomechanics/index.md} (93%) rename web/content/docs/benchmarks/thermo-mechanics/{ => thermomechanics}/stress.png (100%) rename web/content/docs/benchmarks/thermo-mechanics/{ => thermomechanics}/temperature.png (100%) rename web/content/docs/benchmarks/thermo-richards-mechanics/{ => CTF1}/CTF1_results_S.jpg (100%) rename web/content/docs/benchmarks/thermo-richards-mechanics/{ => CTF1}/CTF1_results_T.jpg (100%) rename web/content/docs/benchmarks/thermo-richards-mechanics/{CTF1.md => CTF1/index.md} (91%) rename web/content/docs/benchmarks/thermo-richards-mechanics/{ => DECOVALEX2023-TaskC}/decovalex_2023_c.png (100%) rename web/content/docs/benchmarks/thermo-richards-mechanics/{ => DECOVALEX2023-TaskC}/decovalex_2023_c_S_t.png (100%) rename web/content/docs/benchmarks/thermo-richards-mechanics/{ => DECOVALEX2023-TaskC}/decovalex_2023_c_T_t.png (100%) rename web/content/docs/benchmarks/thermo-richards-mechanics/{DECOVALEX2023-TaskC.md => DECOVALEX2023-TaskC/index.md} (91%) rename web/content/docs/benchmarks/two-phase-flow-pp-form/{two-phase-flow-pp-liakopoulos.md => two-phase-flow-pp-liakopoulos/index.md} (95%) create mode 120000 web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-liakopoulos/main.pdf rename web/content/docs/benchmarks/two-phase-flow-pp-form/{two-phase-flow-pp-mcwhorter.md => two-phase-flow-pp-mcwhorter/index.md} (96%) rename web/content/docs/benchmarks/two-phase-flow-pp-form/{ => two-phase-flow-pp-mcwhorter}/main.pdf (100%) rename web/content/docs/benchmarks/two-phase-flow/{ => momas}/MoMaS.pdf (100%) rename web/content/docs/benchmarks/two-phase-flow/{momas.md => momas/index.md} (94%) diff --git a/web/content/docs/benchmarks/bgr_verification_examples/heatconduction.md b/web/content/docs/benchmarks/bgr_verification_examples/heatconduction/index.md similarity index 100% rename from web/content/docs/benchmarks/bgr_verification_examples/heatconduction.md rename to web/content/docs/benchmarks/bgr_verification_examples/heatconduction/index.md diff --git a/web/content/docs/benchmarks/bgr_verification_examples/hydromechanics.md b/web/content/docs/benchmarks/bgr_verification_examples/hydromechanics/index.md similarity index 100% rename from web/content/docs/benchmarks/bgr_verification_examples/hydromechanics.md rename to web/content/docs/benchmarks/bgr_verification_examples/hydromechanics/index.md diff --git a/web/content/docs/benchmarks/bgr_verification_examples/liquid_flow.md b/web/content/docs/benchmarks/bgr_verification_examples/liquid_flow/index.md similarity index 100% rename from web/content/docs/benchmarks/bgr_verification_examples/liquid_flow.md rename to web/content/docs/benchmarks/bgr_verification_examples/liquid_flow/index.md diff --git a/web/content/docs/benchmarks/bgr_verification_examples/mechanics.md b/web/content/docs/benchmarks/bgr_verification_examples/mechanics/index.md similarity index 100% rename from web/content/docs/benchmarks/bgr_verification_examples/mechanics.md rename to web/content/docs/benchmarks/bgr_verification_examples/mechanics/index.md diff --git a/web/content/docs/benchmarks/bgr_verification_examples/thermohydromechanics.md b/web/content/docs/benchmarks/bgr_verification_examples/thermohydromechanics/index.md similarity index 100% rename from web/content/docs/benchmarks/bgr_verification_examples/thermohydromechanics.md rename to web/content/docs/benchmarks/bgr_verification_examples/thermohydromechanics/index.md diff --git a/web/content/docs/benchmarks/bgr_verification_examples/thermomechanics.md b/web/content/docs/benchmarks/bgr_verification_examples/thermomechanics/index.md similarity index 100% rename from web/content/docs/benchmarks/bgr_verification_examples/thermomechanics.md rename to web/content/docs/benchmarks/bgr_verification_examples/thermomechanics/index.md diff --git a/web/content/docs/benchmarks/creepbgra/CreepBGRa/index.md b/web/content/docs/benchmarks/creepbgra/CreepBGRa/index.md index 225410b6a3..323808fe36 100644 --- a/web/content/docs/benchmarks/creepbgra/CreepBGRa/index.md +++ b/web/content/docs/benchmarks/creepbgra/CreepBGRa/index.md @@ -190,6 +190,7 @@ A short python snippet, to compute the values. Insert this into Paraview's ProgrammableFilter: + ```python A = self.GetInputDataObject(0, 0) numPoints = A.GetNumberOfPoints() @@ -226,4 +227,5 @@ output.GetPointData().AddArray(outSyy) output.GetPointData().AddArray(outSzz) output.GetPointData().AddArray(outSxy) ``` + diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE_figures/In_out_temperature_comparison.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE/In_out_temperature_comparison.png similarity index 100% rename from web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE_figures/In_out_temperature_comparison.png rename to web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE/In_out_temperature_comparison.png diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE.md b/web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE/index.md similarity index 94% rename from web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE.md rename to web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE/index.md index f692d9d23f..917f6db4c7 100644 --- a/web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE.md +++ b/web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE/index.md @@ -38,7 +38,7 @@ For this benchmark, Two different scenarios were carried out by applying two dif The detailed input parameters can be seen from the 3D_2U_BHE.prj file. The inflow temperature of the BHE, which was imposed as boundary condition of the BHE is shown in Figure 1. All the initial temperatures are set as 22 $^{\circ}$C. The flow rate within each U-pipe is set to $2.0\times10^{-4}$ $\mathrm{m^{3} s^{-1}}$ during the whole simulation time. -{{< img src="../3D_2U_BHE_figures/In_out_temperature_comparison.png" width="200">}} +{{< img src="In_out_temperature_comparison.png" width="200">}} Figure 1: Inflow temperature curve and outflow temperature comparison @@ -62,7 +62,7 @@ The computed resutls from scenario by adopting the fixed inflow boundary conditi The OGS numerical outflow temperature over time was compared against results of the FEFLOW software as shown in the Figure 1. And the vertical distributed temperature of circulating water was presented in Figure 2 after operation for 3300 s. The comparison figures demonstrate that the OGS numerical results and FEFLOW results can match very well and the biggest absolute error of outflow temperature is 0.20 $^{\circ}$C after 360 s' operation, while such error decreases to 0.037 $^{\circ}$C after 3600 s' operation. The maximum relative error of vertical temperature is 0.019 \% after operation for 3300 s. -{{< img src="../3D_2U_BHE_figures/vertical_temperature_distribution.png" width="200">}} +{{< img src="vertical_temperature_distribution.png" width="200">}} Figure 2: Comparison of vertical temperature distribution from scenario by adopting the fixed inflow boundary condition @@ -75,7 +75,7 @@ Besides, by setting python bindings, the current OGS `Heat_Transport_BHE` proces In this way, the computed vertical distributed circulating fluid temperature is updated to the black and red solid line illustrated in the figure 3. It shows that in this case, the difference between the OGS and FEFLOW models is becoming much closer to each other, which is about 0.037 $^{\circ}$C. -{{< img src="../3D_2U_BHE_figures/vertical_temperature_distribution_powerBC.png" width="200">}} +{{< img src="vertical_temperature_distribution_powerBC.png" width="200">}} Figure 3: Comparison of vertical temperature distribution from scenarios by adopting the power boundary conditions diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE_figures/vertical_temperature_distribution.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE/vertical_temperature_distribution.png similarity index 100% rename from web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE_figures/vertical_temperature_distribution.png rename to web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE/vertical_temperature_distribution.png diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE_figures/vertical_temperature_distribution_powerBC.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE/vertical_temperature_distribution_powerBC.png similarity index 100% rename from web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE_figures/vertical_temperature_distribution_powerBC.png rename to web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE/vertical_temperature_distribution_powerBC.png diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/BHE_network.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array/BHE_network.png similarity index 100% rename from web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/BHE_network.png rename to web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array/BHE_network.png diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/BHE_network_closedloop.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array/BHE_network_closedloop.png similarity index 100% rename from web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/BHE_network_closedloop.png rename to web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array/BHE_network_closedloop.png diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/Heat_extraction_rate.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array/Heat_extraction_rate.png similarity index 100% rename from web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/Heat_extraction_rate.png rename to web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array/Heat_extraction_rate.png diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/Heat_extraction_rate_closedloop.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array/Heat_extraction_rate_closedloop.png similarity index 100% rename from web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/Heat_extraction_rate_closedloop.png rename to web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array/Heat_extraction_rate_closedloop.png diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/Inflow_and_outflow_temperature.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array/Inflow_and_outflow_temperature.png similarity index 100% rename from web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/Inflow_and_outflow_temperature.png rename to web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array/Inflow_and_outflow_temperature.png diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/Inflow_temperature_and_flow_rate.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array/Inflow_temperature_and_flow_rate.png similarity index 100% rename from web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/Inflow_temperature_and_flow_rate.png rename to web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array/Inflow_temperature_and_flow_rate.png diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/Soil_temperature.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array/Soil_temperature.png similarity index 100% rename from web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/Soil_temperature.png rename to web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array/Soil_temperature.png diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array.md b/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array/index.md similarity index 94% rename from web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array.md rename to web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array/index.md index e3236781da..b6e29c1f28 100644 --- a/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array.md +++ b/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array/index.md @@ -80,7 +80,7 @@ During the calculation of the TESPy solver, the flow density and the related spe To check their concrete value under specific temperature and pressure conditions, interested readers may refer to e.g. the 'PropsSI' function introduced in the webpage of CoolProp. For the fast execution of this benchmark, the total simulation time is shorten to 600 seconds. If the reader wishes to reproduce the same results, a full simulation of 6 months needs to be performed. -{{< img src="../3D_3BHEs_array_figures/BHE_network.png" width="200">}} +{{< img src="BHE_network.png" width="200">}} Figure 1a: One-way pipeline network model @@ -90,7 +90,7 @@ The setup for a closed-loop network model is illustrated in Figure 1b. Compared to the configuration in the one-way network, the refrigerant in the closed loop network is circulating through the entire system. In this case, the flow rate will be automatically adjusted by the water pump in each time step, as its pressure head is directly linked to the flow rate. Subsequently, the flow rate is determined by the pressure losses in the BHE array. -{{< img src="../3D_3BHEs_array_figures/BHE_network_closedloop.png" width="200">}} +{{< img src="BHE_network_closedloop.png" width="200">}} Figure 1b: Closed-loop pipeline network model @@ -114,24 +114,24 @@ Except for the thermal shifiting behavior among the BHEs, the averaged heat extr This is due to the fact that additional energy is required to compensate the hydraulic loss of the pipe. -{{< img src="../3D_3BHEs_array_figures/Soil_temperature.png" width="200">}} +{{< img src="Soil_temperature.png" width="200">}} Figure 2: Evolution of the soil temperature located at the 1 m distance away from each BHE -{{< img src="../3D_3BHEs_array_figures/Inflow_and_outflow_temperature.png" width="200">}} +{{< img src="Inflow_and_outflow_temperature.png" width="200">}} Figure 3: Evolution of the inflow and outflow refrigerant temperature of each BHE -{{< img src="../3D_3BHEs_array_figures/Heat_extraction_rate.png" width="200">}} +{{< img src="Heat_extraction_rate.png" width="200">}} Figure 4: Evolution of the heat extraction rate of each BHE -{{< img src="../3D_3BHEs_array_figures/Inflow_temperature_and_flow_rate.png" width="200">}} +{{< img src="Inflow_temperature_and_flow_rate.png" width="200">}} Figure 5: Evolution of the inflow refrigerant temperature and flow rate entering the BHE array -{{< img src="../3D_3BHEs_array_figures/Heat_extraction_rate_closedloop.png" width="200">}} +{{< img src="Heat_extraction_rate_closedloop.png" width="200">}} Figure 6: Evolution of the heat extraction rate of each BHE with close loop network model ## References diff --git a/web/content/docs/benchmarks/heat-transport-bhe/BHE_GW_advection_2years.zip b/web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection/BHE_GW_advection_2years.zip similarity index 100% rename from web/content/docs/benchmarks/heat-transport-bhe/BHE_GW_advection_2years.zip rename to web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection/BHE_GW_advection_2years.zip diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection.md b/web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection/index.md similarity index 94% rename from web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection.md rename to web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection/index.md index 27a633b9c4..faf1655c28 100644 --- a/web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection.md +++ b/web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection/index.md @@ -52,7 +52,7 @@ induced ground temperature. ## Model Setup The input files for the full simulation including the analytical solution for -the soil temperature can be found [here](../BHE_GW_advection_2years.zip). The +the soil temperature can be found [here](BHE_GW_advection_2years.zip). The geometry of the model is illustrated in Figure 1. The depth of the model domain is 15 m with an areal extent of 80 m x 80 m. The BHE is 1U-type and is @@ -76,7 +76,7 @@ The BHE parameters are only relevant for the numerical model and are adopted from the [3D Beier sandbox benchmark]({{< ref "3D_Beier_sandbox.md" >}}). -{{< img src="../3D_BHE_GW_advection_figures/mesh.png" width="150">}} +{{< img src="mesh.png" width="150">}} Figure 1: Geometry and mesh of the BHE model @@ -90,12 +90,12 @@ and analytical solution match very well as the maximum relative error of ground temperature is less than 0.2 \%. The largest difference is found near the BHE node towards which the analytical solution approaches infinity. -{{< img src="../3D_BHE_GW_advection_figures/temperature_soil_2years.png" +{{< img src="temperature_soil_2years.png" width="150">}} Figure 2: Ground temperature distribution after two years at $z=-7$ m. -{{< img src="../3D_BHE_GW_advection_figures/rel_err.png" width="150">}} +{{< img src="rel_err.png" width="150">}} Figure 3: Comparison of OGS-6 results and analytical solution. Note the singularity of the analytical solution at the BHE node. diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection_figures/mesh.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection/mesh.png similarity index 100% rename from web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection_figures/mesh.png rename to web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection/mesh.png diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection_figures/rel_err.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection/rel_err.png similarity index 100% rename from web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection_figures/rel_err.png rename to web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection/rel_err.png diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection_figures/temperature_soil_2years.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection/temperature_soil_2years.png similarity index 100% rename from web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection_figures/temperature_soil_2years.png rename to web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection/temperature_soil_2years.png diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox_figures/Inflow_temp.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox/Inflow_temp.png similarity index 100% rename from web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox_figures/Inflow_temp.png rename to web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox/Inflow_temp.png diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox_figures/comparison_with_experiment_data_and_OGS5.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox/comparison_with_experiment_data_and_OGS5.png similarity index 100% rename from web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox_figures/comparison_with_experiment_data_and_OGS5.png rename to web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox/comparison_with_experiment_data_and_OGS5.png diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox.md b/web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox/index.md similarity index 94% rename from web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox.md rename to web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox/index.md index 1700fb1081..57206dc67d 100644 --- a/web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox.md +++ b/web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox/index.md @@ -34,7 +34,7 @@ The numerical model was established using dual continuum method Diersch et al. ( | Grout thermal conductivity | $\lambda_{g}$ | 0.806 | $\mathrm{W m^{-1} K^{-1}}$ | | Grout heat capacity | $(\rho c)_{grout}$ | $3.8\times10^{6}$ | $\mathrm{Jm^{-3}K^{-1}}$ | -{{< img src="../3D_Beier_sandbox_figures/numerical_geometry_of_BHE.png" width="200">}} +{{< img src="numerical_geometry_of_BHE.png" width="200">}} Figure 1: Sandbox model @@ -44,7 +44,7 @@ In Beier's experiment, the inner diameter of aluminum pipe is 12.6 $\mathrm{cm}$ The detailed input file can be seen from the .prj file. The inflow temperature of the BHE, which was imposed as boundary condition of the BHE can be shown in Figure 2. Initial conditions of inflow and outflow temperature for the BHE were directly obtained from the measurements at t=0. For the initial soil temperature, the average value of all sensors placed in the sand and the borehole wall was set in the numerical model. -{{< img src="../3D_Beier_sandbox_figures/Inflow_temp.png" width="200">}} +{{< img src="Inflow_temp.png" width="200">}} Figure 2: Inflow temperature curve as the BHE boundary condition @@ -52,11 +52,11 @@ Figure 2: Inflow temperature curve as the BHE boundary condition The numerical outflow temperature of OGS-5 (Shao et al. (2016)) and OGS-6 was compared with the experimental results, which is presented in the Figure 3. And the soil temperature at different locations among experimental and numerical results were compared and shown in the Figure 4. The comparison figures demonstrate that the numerical results and experimental data can fit very well and the largest relative error is 0.17\% on the wall temperature and 0.014\% on the outflow temperature. The initial temperature of borehole wall in numerical model was set an average value as mentioned in the above, which has initial error of 0.07 K compared to the experimental data. Besides, normally, the error of measuring temperatures during experiment, difference on the real thermal physical parameters of the sand and the BHE are all at the same value range. Therefore, it can be concluded that the numerical model of 1U-type BHE is fully verified. -{{< img src="../3D_Beier_sandbox_figures/comparison_with_experiment_data_and_OGS5.png" width="200">}} +{{< img src="comparison_with_experiment_data_and_OGS5.png" width="200">}} Figure 3: Comparison with experiment and OGS-5 results regarding outflow temperature of the BHE -{{< img src="../3D_Beier_sandbox_figures/soil_temp_comparison.png" width="200">}} +{{< img src="soil_temp_comparison.png" width="200">}} Figure 4: Comparison of modelled and measured wall and soil temperatures diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox_figures/numerical_geometry_of_BHE.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox/numerical_geometry_of_BHE.png similarity index 100% rename from web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox_figures/numerical_geometry_of_BHE.png rename to web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox/numerical_geometry_of_BHE.png diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox_figures/soil_temp_comparison.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox/soil_temp_comparison.png similarity index 100% rename from web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox_figures/soil_temp_comparison.png rename to web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox/soil_temp_comparison.png diff --git a/web/content/docs/benchmarks/heat-transport-bhe/Analytical_coaxial_BHE.zip b/web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE/Analytical_coaxial_BHE.zip similarity index 100% rename from web/content/docs/benchmarks/heat-transport-bhe/Analytical_coaxial_BHE.zip rename to web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE/Analytical_coaxial_BHE.zip diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE_figures/coaxial_deep_BHE.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE/coaxial_deep_BHE.png similarity index 100% rename from web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE_figures/coaxial_deep_BHE.png rename to web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE/coaxial_deep_BHE.png diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE.md b/web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE/index.md similarity index 95% rename from web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE.md rename to web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE/index.md index 74f0890f9e..56ae730af1 100644 --- a/web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE.md +++ b/web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE/index.md @@ -17,7 +17,7 @@ project = "Parabolic/T/3D_deep_BHE/3D_deep_BHE_CXA.prj" In recent years, Borehole Heat Exchangers (BHE) are very widely utilized to extract geothermal energy for building heating. For coaxial type of BHEs, an inner pipe is installed inside of an outer pipe, allowing the downward and upward flow to be separated. In some projects, very long coaxial BHEs are installed down to a 2-km depth, in order to extract more energy from the deep subsurface (Kong et al., 2017). Based on the flow directions, there are two types of coaxial BHEs. When downward flow is located in the inner pipe, it is called Coaxial-Centred (CXC) type. On the countary, if the inflow is introduced in the annular space, it is called a CXA type. Detailed schematization of the CXA-type BHE system is shown in Figure 1. In this benchmark, the numerical model in OGS-6 has been tested for the 2 coaxial types of BHEs. The simulation results are compared with previous OGS-5 results and also the analytical solution proposed by [Beier et al. (2014)](../Analytical_coaxial_BHE.zip). -{{< img src="../3D_coaxial_deep_BHE_figures/coaxial_deep_BHE.png" width="200">}} +{{< img src="coaxial_deep_BHE.png" width="200">}} Figure 1: Coaxial BHE of CXA (Kong et al. (2017)) @@ -40,7 +40,7 @@ The implemented numerical model was established based on the dual continuum appr | Grout thermal conductivity | $\lambda_{g}$ | 0.73 | $\mathrm{W m^{-1} K^{-1}}$ | | Grout heat capacity | $(\rho c)_{g}$ | $3.8\times10^{6}$ | $\mathrm{Jm^{-3}K^{-1}}$ | -{{< img src="../3D_coaxial_deep_BHE_figures/numerical_geometry_model.png" width="80">}} +{{< img src="numerical_geometry_model.png" width="80">}} Figure 2: Geometry and mesh of the coaxial BHE model @@ -56,11 +56,11 @@ where $\rho^r c^r$ is heat capacity of circulating fluid and $Q^r$ is circulatin In Figure 3, the numerically simulated outflow temperature from OGS-6 was compared against the OGS-5 result, as well as the analytical solution by Beier et al. (2014). Also, the temperature distribution of circulating water inside of the BHE after 3000 seconds was presented in Figure 4. The comparison demonstrates that the numerical results and analytical solution can match very well and the biggest absolute error of outflow temperature is around 1.6 $^{\circ}$C at the starting up stage, while such error will decrease to around 0.5 $^{\circ}$C after 30 days' operation. The maximum relative error regarding temperature distribution of circulating water after operation for 3000 s is around 2 \%. The soil temperature verification can be seen in the Benchmark of 3D Beier sandbox. -{{< img src="../3D_coaxial_deep_BHE_figures/outflow_temperature_over_time_long-term.png" width="120">}} +{{< img src="outflow_temperature_over_time_long-term.png" width="120">}} Figure 3: Comparison with analytical solution and OGS-5 results -{{< img src="../3D_coaxial_deep_BHE_figures/temperature_distribution_3000s.png" width="200">}} +{{< img src="temperature_distribution_3000s.png" width="200">}} Figure 4: Distributed temperature of circulating water diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE_figures/numerical_geometry_model.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE/numerical_geometry_model.png similarity index 100% rename from web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE_figures/numerical_geometry_model.png rename to web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE/numerical_geometry_model.png diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE_figures/outflow_temperature_over_time_long-term.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE/outflow_temperature_over_time_long-term.png similarity index 100% rename from web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE_figures/outflow_temperature_over_time_long-term.png rename to web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE/outflow_temperature_over_time_long-term.png diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE_figures/temperature_distribution_3000s.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE/temperature_distribution_3000s.png similarity index 100% rename from web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE_figures/temperature_distribution_3000s.png rename to web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE/temperature_distribution_3000s.png diff --git a/web/content/docs/benchmarks/heat-transport-bhe/Analytical_wellbore_heat_transport.zip b/web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE/Analytical_wellbore_heat_transport.zip similarity index 100% rename from web/content/docs/benchmarks/heat-transport-bhe/Analytical_wellbore_heat_transport.zip rename to web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE/Analytical_wellbore_heat_transport.zip diff --git a/web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE_figures/T_out_comparison.png b/web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE/T_out_comparison.png similarity index 100% rename from web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE_figures/T_out_comparison.png rename to web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE/T_out_comparison.png diff --git a/web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE_figures/absolute_error_fluid_T_30d.png b/web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE/absolute_error_fluid_T_30d.png similarity index 100% rename from web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE_figures/absolute_error_fluid_T_30d.png rename to web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE/absolute_error_fluid_T_30d.png diff --git a/web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE.md b/web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE/index.md similarity index 91% rename from web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE.md rename to web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE/index.md index 8714d87ad7..31f9c7121b 100644 --- a/web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE.md +++ b/web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE/index.md @@ -15,13 +15,13 @@ project = "Parabolic/T/BHE_1P/BHE_1P.prj" ## Problem description -Ramey (Ramey et al. (1962)) proposed the analytical solution concerning the wellbore heat transmission, which can be used to quantify the fluid temperature change in the wellbore. In order to verify the single pipe flow model in the OGS, the numerical results was compared with the [Ramey's analytical solution](../Analytical_wellbore_heat_transport.zip). The detailed calculation of the Ramey's analytical solution is given below. +Ramey (Ramey et al. (1962)) proposed the analytical solution concerning the wellbore heat transmission, which can be used to quantify the fluid temperature change in the wellbore. In order to verify the single pipe flow model in the OGS, the numerical results was compared with the [Ramey's analytical solution](Analytical_wellbore_heat_transport.zip). The detailed calculation of the Ramey's analytical solution is given below. ## Model Setup In this benchmark, the length of the wellbore is 30 m as shown in Figure 1 and the cold water is injected into the inlet point of the wellbore with temperature of 20 $^{\circ}$C. The initial temperature of the fluid and grout in the wellbore is 20 $^{\circ}$C, and temperature of the surrounding rock is 55 $^{\circ}$C. The wellbore and pipe diameter are 0.28 m and 0.25826 m, respectively. And the flow rate is 0.0002 $m^3/s$. -{{< img src="../pipe_flow_EBHE_figures/pipe_flow_3d_model.png" width="80">}} +{{< img src="pipe_flow_3d_model.png" width="80">}} Figure 1: Single pipe flow model @@ -84,11 +84,11 @@ The outlet temperature change over time was compared against analytical solution In numerical model, the outlet temperature at beginning stage is affected by the initial temperature in the pipe inside the wellbore. The initial fluid temperature set in the benchmark means there is water with 20 $^{\circ}$C filled in the wellbore already before injecting water into the wellbore. But in the analytical solution, no initial temperature is set and the temperature keeps equilibrium state at every moment. The impact of initial temperature condition in numerical model is decreasing with increasement of the operational time as shown in Figure 2. -{{< img src="../pipe_flow_EBHE_figures/T_out_comparison.png" width="120">}} +{{< img src="T_out_comparison.png" width="120">}} Figure 2: Comparison with analytical solution results -{{< img src="../pipe_flow_EBHE_figures/absolute_error_fluid_T_30d.png" width="200">}} +{{< img src="absolute_error_fluid_T_30d.png" width="200">}} Figure 3: Distributed temperature of fluid and absolute error. diff --git a/web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE_figures/pipe_flow_3d_model.png b/web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE/pipe_flow_3d_model.png similarity index 100% rename from web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE_figures/pipe_flow_3d_model.png rename to web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE/pipe_flow_3d_model.png diff --git a/web/content/docs/benchmarks/heatconduction/bhe_array_analytical_solver.py b/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/bhe_array_analytical_solver.py similarity index 100% rename from web/content/docs/benchmarks/heatconduction/bhe_array_analytical_solver.py rename to web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/bhe_array_analytical_solver.py diff --git a/web/content/docs/benchmarks/heatconduction/bhe_array_benchmark.bib b/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/bhe_array_benchmark.bib similarity index 100% rename from web/content/docs/benchmarks/heatconduction/bhe_array_benchmark.bib rename to web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/bhe_array_benchmark.bib diff --git a/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark_figures/figure_1.png b/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/figure_1.png similarity index 100% rename from web/content/docs/benchmarks/heatconduction/BHE_array_benchmark_figures/figure_1.png rename to web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/figure_1.png diff --git a/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark_figures/figure_2.png b/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/figure_2.png similarity index 100% rename from web/content/docs/benchmarks/heatconduction/BHE_array_benchmark_figures/figure_2.png rename to web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/figure_2.png diff --git a/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark_figures/figure_3.png b/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/figure_3.png similarity index 100% rename from web/content/docs/benchmarks/heatconduction/BHE_array_benchmark_figures/figure_3.png rename to web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/figure_3.png diff --git a/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark_figures/figure_4.png b/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/figure_4.png similarity index 100% rename from web/content/docs/benchmarks/heatconduction/BHE_array_benchmark_figures/figure_4.png rename to web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/figure_4.png diff --git a/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark_figures/figure_5.png b/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/figure_5.png similarity index 100% rename from web/content/docs/benchmarks/heatconduction/BHE_array_benchmark_figures/figure_5.png rename to web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/figure_5.png diff --git a/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark.md b/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/index.md similarity index 96% rename from web/content/docs/benchmarks/heatconduction/BHE_array_benchmark.md rename to web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/index.md index d9fb7bb790..231516dfb9 100644 --- a/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark.md +++ b/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/index.md @@ -57,7 +57,7 @@ In this model, the quad element was adopted to compose the mesh. The initial tem | Heat extraction rate of the BHE | $q$ | $35$ | $W/m$ | | Diameter of the BHE | $D$ | $0.15$ | $m$ | -{{< img src="../BHE_array_benchmark_figures/figure_1.png" >}} +{{< img src="figure_1.png" >}} Figure 1: Model geometry, BHE location, and the observation profile @@ -85,21 +85,21 @@ where $r_b$ is the BHE radius. n denotes the number of surrounding nodes. n = 8 Figure 2 and 3 show the comparison of the temperature distribution along the observation profile (position see Figure 1) using analytical solution with the numerical results from OGS5 and OGS6 for every 4 months in the whole simulated time. It shows the numerical solution has a very good agreement with the analytical solution. -{{< img src="../BHE_array_benchmark_figures/figure_2.png" width="200">}} +{{< img src="figure_2.png" width="200">}} Figure 2: The temperature evolution of the BHEs field along the observation profile -{{< img src="../BHE_array_benchmark_figures/figure_3.png" width="200">}} +{{< img src="figure_3.png" width="200">}} Figure 3: The temperature evolution of the BHEs field along the observation profile In order to investigate the impact of mesh density on the accuracy of numerical result, the simulated temperature profile at the observation point A (53 m, 52.5 m) was plotted and compared against the analytical solution. Figure 3 shows the relative difference of the computed temperature between the analytical and numerical solution by using different mesh size (2.5 m, 1 m, 0.5 m, 0.25 m and 0.2 m). The results show that the difference becomes smaller when the mesh size is approaching 0.5 m, which is expected as the optimal mesh size mentioned in Diersch et al. (2011). From Figure 4, it can be found that the absolute error of temperature values at point A should be less than 2.5e-3 if the mesh size is kept denser than 0.5m. -{{< img src="../BHE_array_benchmark_figures/figure_4.png" width="200">}} +{{< img src="figure_4.png" width="200">}} Figure 4: The relative difference of computed temperature at point A between the analytical and numerical solution using different mesh size -{{< img src="../BHE_array_benchmark_figures/figure_5.png" width="200">}} +{{< img src="figure_5.png" width="200">}} Figure 5: The absolute difference of computed temperature along the diagonal profile between the analytical and numerical solution using different mesh size diff --git a/web/content/docs/benchmarks/heatconduction/heatconduction-dirichlet.md b/web/content/docs/benchmarks/heatconduction/heatconduction-dirichlet/index.md similarity index 98% rename from web/content/docs/benchmarks/heatconduction/heatconduction-dirichlet.md rename to web/content/docs/benchmarks/heatconduction/heatconduction-dirichlet/index.md index 5d1d8bf17f..3f50d4489b 100644 --- a/web/content/docs/benchmarks/heatconduction/heatconduction-dirichlet.md +++ b/web/content/docs/benchmarks/heatconduction/heatconduction-dirichlet/index.md @@ -70,4 +70,4 @@ The result, written in the `.vtu` file, can be visualized with Paraview, for exa Loading the `line_60_heat_pcs_0_ts_65_t_5078125.000000.vtu` file in Paraview and Plotting over line. Compared to the analytical solution 'temperature_analytical.vtu', the results are very good: -{{< img src="../validation-1.png" >}} +{{< img src="validation-1.png" >}} diff --git a/web/content/docs/benchmarks/heatconduction/validation-1.png b/web/content/docs/benchmarks/heatconduction/heatconduction-dirichlet/validation-1.png similarity index 100% rename from web/content/docs/benchmarks/heatconduction/validation-1.png rename to web/content/docs/benchmarks/heatconduction/heatconduction-dirichlet/validation-1.png diff --git a/web/content/docs/benchmarks/heatconduction/LineSourceTermFigures/comparison_plot_over_line_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_cylinder.png b/web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term/comparison_plot_over_line_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_cylinder.png similarity index 100% rename from web/content/docs/benchmarks/heatconduction/LineSourceTermFigures/comparison_plot_over_line_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_cylinder.png rename to web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term/comparison_plot_over_line_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_cylinder.png diff --git a/web/content/docs/benchmarks/heatconduction/LineSourceTermFigures/comparison_plot_over_line_rel_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_cylinder.png b/web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term/comparison_plot_over_line_rel_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_cylinder.png similarity index 100% rename from web/content/docs/benchmarks/heatconduction/LineSourceTermFigures/comparison_plot_over_line_rel_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_cylinder.png rename to web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term/comparison_plot_over_line_rel_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_cylinder.png diff --git a/web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term.md b/web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term/index.md similarity index 81% rename from web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term.md rename to web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term/index.md index 16ddfb9728..3a8958ce3d 100644 --- a/web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term.md +++ b/web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term/index.md @@ -43,7 +43,7 @@ is sketched. Furthermore, the mesh resolution is shown in the cylindrical domain within the first quadrant of the coordinate system. In the second quadrant the simulated temperature distribution is depicted. -{{< img src="../LineSourceTermFigures/temperature_distribution_line_source_term_in_cylinder.png" >}} +{{< img src="temperature_distribution_line_source_term_in_cylinder.png" >}} The source term is defined along the line in the center of the cylinder: $$ @@ -74,7 +74,7 @@ if (coordsX^2<0.0001 & coordsY^2<0.0001, temperature, -1/(4*asin(1))*ln(sqrt(coo The following plot shows the temperature along the white line in the figure above. -{{< img src="../LineSourceTermFigures/temperature_profile_line_source_term_in_cylinder.png" >}} +{{< img src="temperature_profile_line_source_term_in_cylinder.png" >}} - Comparison with analytical solution: @@ -82,12 +82,12 @@ The differences of analytical and computed solutions for two different domain discretizations are small outside of the center. In the finer mesh the error outside of the middle region is smaller than in the coarser mesh. {{< img -src="../LineSourceTermFigures/comparison_plot_over_line_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_cylinder.png" >}} +src="comparison_plot_over_line_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_cylinder.png" >}} Due to the numerical evaluation of the relative error of the computed solution the error grows in the vicinity of the boundary and in the center. {{< img -src="../LineSourceTermFigures/comparison_plot_over_line_rel_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_cylinder.png" >}} +src="comparison_plot_over_line_rel_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_cylinder.png" >}} #### Input files @@ -108,18 +108,18 @@ $r=1$ is solved. The cylindrical domain is defined as axisymmetric. #### Results and evaluation {{< img -src="../LineSourceTermFigures/simulated_temperature_distribution_line_source_term_in_axisymmetric_cylinder.png" >}} +src="simulated_temperature_distribution_line_source_term_in_axisymmetric_cylinder.png" >}} The above figure shows the computed temperature distribution. The following plot shows the temperature along the white line in the figure above. {{< img -src="../LineSourceTermFigures/temperature_profile_line_source_term_in_axisymmetric_cylinder.png" >}} +src="temperature_profile_line_source_term_in_axisymmetric_cylinder.png" >}} The error and relative error shows the same behaviour like in the simulation models above. Outside of the center, that has a singularity in the analytical solution, the errors decreases very fast. {{< img -src="../LineSourceTermFigures/plot_over_line_diff_and_rel_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_axisymmetric_cylinder.png" >}} +src="plot_over_line_diff_and_rel_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_axisymmetric_cylinder.png" >}} #### Input files diff --git a/web/content/docs/benchmarks/heatconduction/LineSourceTermFigures/plot_over_line_diff_and_rel_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_axisymmetric_cylinder.png b/web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term/plot_over_line_diff_and_rel_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_axisymmetric_cylinder.png similarity index 100% rename from web/content/docs/benchmarks/heatconduction/LineSourceTermFigures/plot_over_line_diff_and_rel_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_axisymmetric_cylinder.png rename to web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term/plot_over_line_diff_and_rel_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_axisymmetric_cylinder.png diff --git a/web/content/docs/benchmarks/heatconduction/LineSourceTermFigures/simulated_temperature_distribution_line_source_term_in_axisymmetric_cylinder.png b/web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term/simulated_temperature_distribution_line_source_term_in_axisymmetric_cylinder.png similarity index 100% rename from web/content/docs/benchmarks/heatconduction/LineSourceTermFigures/simulated_temperature_distribution_line_source_term_in_axisymmetric_cylinder.png rename to web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term/simulated_temperature_distribution_line_source_term_in_axisymmetric_cylinder.png diff --git a/web/content/docs/benchmarks/heatconduction/LineSourceTermFigures/temperature_distribution_line_source_term_in_cylinder.png b/web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term/temperature_distribution_line_source_term_in_cylinder.png similarity index 100% rename from web/content/docs/benchmarks/heatconduction/LineSourceTermFigures/temperature_distribution_line_source_term_in_cylinder.png rename to web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term/temperature_distribution_line_source_term_in_cylinder.png diff --git a/web/content/docs/benchmarks/heatconduction/LineSourceTermFigures/temperature_profile_line_source_term_in_axisymmetric_cylinder.png b/web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term/temperature_profile_line_source_term_in_axisymmetric_cylinder.png similarity index 100% rename from web/content/docs/benchmarks/heatconduction/LineSourceTermFigures/temperature_profile_line_source_term_in_axisymmetric_cylinder.png rename to web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term/temperature_profile_line_source_term_in_axisymmetric_cylinder.png diff --git a/web/content/docs/benchmarks/heatconduction/LineSourceTermFigures/temperature_profile_line_source_term_in_cylinder.png b/web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term/temperature_profile_line_source_term_in_cylinder.png similarity index 100% rename from web/content/docs/benchmarks/heatconduction/LineSourceTermFigures/temperature_profile_line_source_term_in_cylinder.png rename to web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term/temperature_profile_line_source_term_in_cylinder.png diff --git a/web/content/docs/benchmarks/heatconduction/heatconduction-neumann.md b/web/content/docs/benchmarks/heatconduction/heatconduction-neumann/index.md similarity index 79% rename from web/content/docs/benchmarks/heatconduction/heatconduction-neumann.md rename to web/content/docs/benchmarks/heatconduction/heatconduction-neumann/index.md index b2dd6917ef..ef60d8909f 100644 --- a/web/content/docs/benchmarks/heatconduction/heatconduction-neumann.md +++ b/web/content/docs/benchmarks/heatconduction/heatconduction-neumann/index.md @@ -76,8 +76,8 @@ tolerances. | | | |----------|--------------------| -| {{< img title="Time step 1, time 78125s." src="../picard_vs_newton_ts_1_t_78125.png" >}} | {{< img title="Time step 3, time 234375s." src="../picard_vs_newton_ts_3_t_234375.png" >}} | -| {{< img title="Time step 65, time 5078125s." src="../picard_vs_newton_ts_65_t_5078125.png" >}} | {{< img title="Time step 405, time 31640625s." src="../picard_vs_newton_ts_405_t_31640625.png" >}} | +| {{< img title="Time step 1, time 78125s." src="picard_vs_newton_ts_1_t_78125.png" >}} | {{< img title="Time step 3, time 234375s." src="picard_vs_newton_ts_3_t_234375.png" >}} | +| {{< img title="Time step 65, time 5078125s." src="picard_vs_newton_ts_65_t_5078125.png" >}} | {{< img title="Time step 405, time 31640625s." src="picard_vs_newton_ts_405_t_31640625.png" >}} | ### Mass-lumping and analytical solution @@ -86,5 +86,5 @@ on cost of accuracy as the error is significantly larger. | | | |----------|--------------------| -| {{< img title="Time step 1, time 78125s." src="../temperature_error_ts_1_t_78125.png" >}} | {{< img title="Time step 3, time 234375s." src="../temperature_error_ts_3_t_234375.png" >}} | -| {{< img title="Time step 65, time 5078125s." src="../temperature_error_ts_65_t_5078125.png" >}} | {{< img title="Time step 405, time 31640625s." src="../temperature_error_ts_405_t_31640625.png" >}} | +| {{< img title="Time step 1, time 78125s." src="temperature_error_ts_1_t_78125.png" >}} | {{< img title="Time step 3, time 234375s." src="temperature_error_ts_3_t_234375.png" >}} | +| {{< img title="Time step 65, time 5078125s." src="temperature_error_ts_65_t_5078125.png" >}} | {{< img title="Time step 405, time 31640625s." src="temperature_error_ts_405_t_31640625.png" >}} | diff --git a/web/content/docs/benchmarks/heatconduction/picard_vs_newton_ts_1_t_78125.png b/web/content/docs/benchmarks/heatconduction/heatconduction-neumann/picard_vs_newton_ts_1_t_78125.png similarity index 100% rename from web/content/docs/benchmarks/heatconduction/picard_vs_newton_ts_1_t_78125.png rename to web/content/docs/benchmarks/heatconduction/heatconduction-neumann/picard_vs_newton_ts_1_t_78125.png diff --git a/web/content/docs/benchmarks/heatconduction/picard_vs_newton_ts_3_t_234375.png b/web/content/docs/benchmarks/heatconduction/heatconduction-neumann/picard_vs_newton_ts_3_t_234375.png similarity index 100% rename from web/content/docs/benchmarks/heatconduction/picard_vs_newton_ts_3_t_234375.png rename to web/content/docs/benchmarks/heatconduction/heatconduction-neumann/picard_vs_newton_ts_3_t_234375.png diff --git a/web/content/docs/benchmarks/heatconduction/picard_vs_newton_ts_405_t_31640625.png b/web/content/docs/benchmarks/heatconduction/heatconduction-neumann/picard_vs_newton_ts_405_t_31640625.png similarity index 100% rename from web/content/docs/benchmarks/heatconduction/picard_vs_newton_ts_405_t_31640625.png rename to web/content/docs/benchmarks/heatconduction/heatconduction-neumann/picard_vs_newton_ts_405_t_31640625.png diff --git a/web/content/docs/benchmarks/heatconduction/picard_vs_newton_ts_65_t_5078125.png b/web/content/docs/benchmarks/heatconduction/heatconduction-neumann/picard_vs_newton_ts_65_t_5078125.png similarity index 100% rename from web/content/docs/benchmarks/heatconduction/picard_vs_newton_ts_65_t_5078125.png rename to web/content/docs/benchmarks/heatconduction/heatconduction-neumann/picard_vs_newton_ts_65_t_5078125.png diff --git a/web/content/docs/benchmarks/heatconduction/temperature_error_ts_1_t_78125.png b/web/content/docs/benchmarks/heatconduction/heatconduction-neumann/temperature_error_ts_1_t_78125.png similarity index 100% rename from web/content/docs/benchmarks/heatconduction/temperature_error_ts_1_t_78125.png rename to web/content/docs/benchmarks/heatconduction/heatconduction-neumann/temperature_error_ts_1_t_78125.png diff --git a/web/content/docs/benchmarks/heatconduction/temperature_error_ts_3_t_234375.png b/web/content/docs/benchmarks/heatconduction/heatconduction-neumann/temperature_error_ts_3_t_234375.png similarity index 100% rename from web/content/docs/benchmarks/heatconduction/temperature_error_ts_3_t_234375.png rename to web/content/docs/benchmarks/heatconduction/heatconduction-neumann/temperature_error_ts_3_t_234375.png diff --git a/web/content/docs/benchmarks/heatconduction/temperature_error_ts_405_t_31640625.png b/web/content/docs/benchmarks/heatconduction/heatconduction-neumann/temperature_error_ts_405_t_31640625.png similarity index 100% rename from web/content/docs/benchmarks/heatconduction/temperature_error_ts_405_t_31640625.png rename to web/content/docs/benchmarks/heatconduction/heatconduction-neumann/temperature_error_ts_405_t_31640625.png diff --git a/web/content/docs/benchmarks/heatconduction/temperature_error_ts_65_t_5078125.png b/web/content/docs/benchmarks/heatconduction/heatconduction-neumann/temperature_error_ts_65_t_5078125.png similarity index 100% rename from web/content/docs/benchmarks/heatconduction/temperature_error_ts_65_t_5078125.png rename to web/content/docs/benchmarks/heatconduction/heatconduction-neumann/temperature_error_ts_65_t_5078125.png diff --git a/web/content/docs/benchmarks/hydro-component/heterogeneous/comparison_2d.png b/web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5/comparison_2d.png similarity index 100% rename from web/content/docs/benchmarks/hydro-component/heterogeneous/comparison_2d.png rename to web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5/comparison_2d.png diff --git a/web/content/docs/benchmarks/hydro-component/heterogeneous/comparison_3d.png b/web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5/comparison_3d.png similarity index 100% rename from web/content/docs/benchmarks/hydro-component/heterogeneous/comparison_3d.png rename to web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5/comparison_3d.png diff --git a/web/content/docs/benchmarks/hydro-component/heterogeneous/concentration_2d.png b/web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5/concentration_2d.png similarity index 100% rename from web/content/docs/benchmarks/hydro-component/heterogeneous/concentration_2d.png rename to web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5/concentration_2d.png diff --git a/web/content/docs/benchmarks/hydro-component/heterogeneous/concentration_3d.png b/web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5/concentration_3d.png similarity index 100% rename from web/content/docs/benchmarks/hydro-component/heterogeneous/concentration_3d.png rename to web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5/concentration_3d.png diff --git a/web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5.md b/web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5/index.md similarity index 73% rename from web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5.md rename to web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5/index.md index 062f00e8b2..214f1a1472 100644 --- a/web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5.md +++ b/web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5/index.md @@ -25,20 +25,20 @@ The setups are steady-state for flow, with an extent of a $100$ m x $100$ m hori Porosity is $0.01$, specific storage is $0$, fluid density is $1000$ kg$\cdot$m$^3$, dynamic viscosity is $10^{-3}$ Pa$\cdot$s, molecular diffusion coefficient is $2\cdot 10^{-9}$ m$\cdot$s$^{-2}$, dispersivities are longitudinal $1$ m and transverse $0.1$ m. The heterogeneous parameter fields of intrinsic permeability are shown in the figures below; creation of the tensor field is documented [here](https://github.com/ufz/ogs-utils/tree/master/post/merge-scalar-data-arrays). -{{< img src="../heterogeneous/permeability_2d.png" title="Magnitude of isotropic permeability tensor for 2D setup.">}} -{{< img src="../heterogeneous/permeability_3d.png" title="Magnitude of isotropic permeability tensor for 3D setup.">}} +{{< img src="permeability_2d.png" title="Magnitude of isotropic permeability tensor for 2D setup.">}} +{{< img src="permeability_3d.png" title="Magnitude of isotropic permeability tensor for 3D setup.">}} ### Model results The comparison of velocity and hydraulic head are shown below. The numerical results of OGS6 fit very well to the OGS5 results with relative differences for velocity in the order of ca $10^{-2}$ and for hydraulic head in $10^{-4}$. -{{< img src="../heterogeneous/comparison_2d.png" title="Relative differences of 2D simulation results between OGS5 and OGS6. On the top left figure, white lines represent hydraulic head values of OGS5, blue lines of OGS6.">}} -{{< img src="../heterogeneous/comparison_3d.png" title="Relative differences of 3D simulation results between OGS5 and OGS6. On the top left figure, grey dots represent hydraulic head values of OGS6.">}} +{{< img src="comparison_2d.png" title="Relative differences of 2D simulation results between OGS5 and OGS6. On the top left figure, white lines represent hydraulic head values of OGS5, blue lines of OGS6.">}} +{{< img src="comparison_3d.png" title="Relative differences of 3D simulation results between OGS5 and OGS6. On the top left figure, grey dots represent hydraulic head values of OGS6.">}} The mass transport simulation results (figures below) show an expected heterogeneous mass front moving through the domain. -{{< img src="../heterogeneous/concentration_2d.png" title="Concentration distribution at simulation time $1e8$ s for the 2D setup.">}} -{{< img src="../heterogeneous/concentration_3d.png" title="Concentration distribution at simulation time $1e8$ s for the 3D setup.">}} +{{< img src="concentration_2d.png" title="Concentration distribution at simulation time $1e8$ s for the 2D setup.">}} +{{< img src="concentration_3d.png" title="Concentration distribution at simulation time $1e8$ s for the 3D setup.">}} [The project files for the 2D setup are here.]({{< data-url "Parabolic/ComponentTransport/heterogeneous/ogs5_H_2D/ogs5_H_2d.prj" >}}) [The project files for the 3D setup are here.]({{< data-url "Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/ogs5_H_3d.prj" >}}) diff --git a/web/content/docs/benchmarks/hydro-component/heterogeneous/permeability_2d.png b/web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5/permeability_2d.png similarity index 100% rename from web/content/docs/benchmarks/hydro-component/heterogeneous/permeability_2d.png rename to web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5/permeability_2d.png diff --git a/web/content/docs/benchmarks/hydro-component/heterogeneous/permeability_3d.png b/web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5/permeability_3d.png similarity index 100% rename from web/content/docs/benchmarks/hydro-component/heterogeneous/permeability_3d.png rename to web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5/permeability_3d.png diff --git a/web/content/docs/benchmarks/hydro-component/contracer/ConTracer1d_results.png b/web/content/docs/benchmarks/hydro-component/contracer/ConTracer/ConTracer1d_results.png similarity index 100% rename from web/content/docs/benchmarks/hydro-component/contracer/ConTracer1d_results.png rename to web/content/docs/benchmarks/hydro-component/contracer/ConTracer/ConTracer1d_results.png diff --git a/web/content/docs/benchmarks/hydro-component/contracer/ConTracer2d_results.png b/web/content/docs/benchmarks/hydro-component/contracer/ConTracer/ConTracer2d_results.png similarity index 100% rename from web/content/docs/benchmarks/hydro-component/contracer/ConTracer2d_results.png rename to web/content/docs/benchmarks/hydro-component/contracer/ConTracer/ConTracer2d_results.png diff --git a/web/content/docs/benchmarks/hydro-component/contracer/ConTracer_domain.png b/web/content/docs/benchmarks/hydro-component/contracer/ConTracer/ConTracer_domain.png similarity index 100% rename from web/content/docs/benchmarks/hydro-component/contracer/ConTracer_domain.png rename to web/content/docs/benchmarks/hydro-component/contracer/ConTracer/ConTracer_domain.png diff --git a/web/content/docs/benchmarks/hydro-component/contracer/ConTracer.md b/web/content/docs/benchmarks/hydro-component/contracer/ConTracer/index.md similarity index 96% rename from web/content/docs/benchmarks/hydro-component/contracer/ConTracer.md rename to web/content/docs/benchmarks/hydro-component/contracer/ConTracer/index.md index 20a3ff8433..8289117c86 100644 --- a/web/content/docs/benchmarks/hydro-component/contracer/ConTracer.md +++ b/web/content/docs/benchmarks/hydro-component/contracer/ConTracer/index.md @@ -24,7 +24,7 @@ Hydraulic water influx was 0.768 $\textrm{m}^3~\textrm{d}^{-1}$ at the left side The tracer (40.26 g of $\textrm{Br}^-$) was diluted in 12 L of waste water and added as a single impulse event at $t=0$. Note, that only 89\% of the tracer was recovered at the outlet. -![Top: Schematic representation of the experiment. Middle and bottom: Simulated domain and input parameters in 1D and 2D, respectively. Modified with permission from Boog *et al.* (2019).](../ConTracer_domain.png) +![Top: Schematic representation of the experiment. Middle and bottom: Simulated domain and input parameters in 1D and 2D, respectively. Modified with permission from Boog *et al.* (2019).](ConTracer_domain.png) ## Problem description (1D) @@ -93,9 +93,9 @@ Both models (1D and 2D) fit the experimental tracer breakthrough curves quite we The deviance at the peak and tail can be related to the fact that the simulations only consider conservative equilibrium transport (processes that may have occurred in the experimental system such as tracer sorption, non--equilibrium flow and evapotranspiration were not considered in the model). The differences between the OGS-6 and OGS-5 simulation were very low (RMSQE$=$1.37e-07). -![Measured (tracer_exp) and simulated tracer breakthrough curves at the outlet (1D scenario)](../ConTracer1d_results.PNG) +![Measured (tracer_exp) and simulated tracer breakthrough curves at the outlet (1D scenario)](ConTracer1d_results.png) -![Measured (tracer_exp} and simulated tracer breakthrough curves at the outlet (2D scenario)](../ConTracer2d_results.PNG) +![Measured (tracer_exp} and simulated tracer breakthrough curves at the outlet (2D scenario)](ConTracer2d_results.png) ## References diff --git a/web/content/docs/benchmarks/hydro-component/gif/elder.gif b/web/content/docs/benchmarks/hydro-component/elder/elder.gif similarity index 100% rename from web/content/docs/benchmarks/hydro-component/gif/elder.gif rename to web/content/docs/benchmarks/hydro-component/elder/elder.gif diff --git a/web/content/docs/benchmarks/hydro-component/elder.md b/web/content/docs/benchmarks/hydro-component/elder/index.md similarity index 93% rename from web/content/docs/benchmarks/hydro-component/elder.md rename to web/content/docs/benchmarks/hydro-component/elder/index.md index 4810b42733..e080265bb8 100644 --- a/web/content/docs/benchmarks/hydro-component/elder.md +++ b/web/content/docs/benchmarks/hydro-component/elder/index.md @@ -27,7 +27,7 @@ The Elder benchmark describes free convection of a dense fluid in mixable, singl A comparison of the numerical data is shown in the figure below. The numerical results of OGS-6 coincide with those of OGS-5. -{{< img src="../gif/elder.gif" title="Results for numerical (OGS-5 - green, OGS-6 - white) results together with concentration distribution in the domain and mesh resolution for different time steps.">}} +{{< img src="elder.gif" title="Results for numerical (OGS-5 - green, OGS-6 - white) results together with concentration distribution in the domain and mesh resolution for different time steps.">}} {{< data-link >}} diff --git a/web/content/docs/benchmarks/hydro-component/Goswami_Exp_Num_Comp.png b/web/content/docs/benchmarks/hydro-component/goswami/Goswami_Exp_Num_Comp.png similarity index 100% rename from web/content/docs/benchmarks/hydro-component/Goswami_Exp_Num_Comp.png rename to web/content/docs/benchmarks/hydro-component/goswami/Goswami_Exp_Num_Comp.png diff --git a/web/content/docs/benchmarks/hydro-component/Goswami_Transient_States.png b/web/content/docs/benchmarks/hydro-component/goswami/Goswami_Transient_States.png similarity index 100% rename from web/content/docs/benchmarks/hydro-component/Goswami_Transient_States.png rename to web/content/docs/benchmarks/hydro-component/goswami/Goswami_Transient_States.png diff --git a/web/content/docs/benchmarks/hydro-component/gif/goswami.gif b/web/content/docs/benchmarks/hydro-component/goswami/goswami.gif similarity index 100% rename from web/content/docs/benchmarks/hydro-component/gif/goswami.gif rename to web/content/docs/benchmarks/hydro-component/goswami/goswami.gif diff --git a/web/content/docs/benchmarks/hydro-component/goswami.md b/web/content/docs/benchmarks/hydro-component/goswami/index.md similarity index 73% rename from web/content/docs/benchmarks/hydro-component/goswami.md rename to web/content/docs/benchmarks/hydro-component/goswami/index.md index 1cedb0e0c1..f41a5a2853 100644 --- a/web/content/docs/benchmarks/hydro-component/goswami.md +++ b/web/content/docs/benchmarks/hydro-component/goswami/index.md @@ -27,15 +27,15 @@ The Goswami-Clement benchmark is based on experiment observations for intruding An example for the intruding salt front is shown below. The numerical results of OGS-6 coincide with those of OGS-5. -{{< img src="../gif/goswami.gif" title="Results for numerical experiment. The steady state SS2 from the original experimental work is well reproduced.">}} +{{< img src="goswami.gif" title="Results for numerical experiment. The steady state SS2 from the original experimental work is well reproduced.">}} {{< data-link >}} A comparison of numerical and laboratory data is shown in the figure below. The numerical results of ogs6 coincide with those of OGS5 and likewise with the laboratory observations. -{{< img src="../Goswami_Exp_Num_Comp.png" title="Results for numerical (colored diamonds) and laboratory data (colored straight lines) on the steady state location of the concentration front (see original research paper).">}} +{{< img src="Goswami_Exp_Num_Comp.png" title="Results for numerical (colored diamonds) and laboratory data (colored straight lines) on the steady state location of the concentration front (see original research paper).">}} -{{< img src="../Goswami_Transient_States.png" title="Results for numerical (colored diamonds) and laboratory data (colored straight lines) on the transient state locations of the concentration front (see original research paper).">}} +{{< img src="Goswami_Transient_States.png" title="Results for numerical (colored diamonds) and laboratory data (colored straight lines) on the transient state locations of the concentration front (see original research paper).">}} ## Literature diff --git a/web/content/docs/benchmarks/hydro-component/gif/DiffusionAndStorage.gif b/web/content/docs/benchmarks/hydro-component/hydro-component/DiffusionAndStorage.gif similarity index 100% rename from web/content/docs/benchmarks/hydro-component/gif/DiffusionAndStorage.gif rename to web/content/docs/benchmarks/hydro-component/hydro-component/DiffusionAndStorage.gif diff --git a/web/content/docs/benchmarks/hydro-component/gif/DiffusionAndStorageAndAdvection.gif b/web/content/docs/benchmarks/hydro-component/hydro-component/DiffusionAndStorageAndAdvection.gif similarity index 100% rename from web/content/docs/benchmarks/hydro-component/gif/DiffusionAndStorageAndAdvection.gif rename to web/content/docs/benchmarks/hydro-component/hydro-component/DiffusionAndStorageAndAdvection.gif diff --git a/web/content/docs/benchmarks/hydro-component/gif/DiffusionAndStorageAndAdvectionAndDecay.gif b/web/content/docs/benchmarks/hydro-component/hydro-component/DiffusionAndStorageAndAdvectionAndDecay.gif similarity index 100% rename from web/content/docs/benchmarks/hydro-component/gif/DiffusionAndStorageAndAdvectionAndDecay.gif rename to web/content/docs/benchmarks/hydro-component/hydro-component/DiffusionAndStorageAndAdvectionAndDecay.gif diff --git a/web/content/docs/benchmarks/hydro-component/gif/DiffusionAndStorageAndAdvectionAndDispersion.gif b/web/content/docs/benchmarks/hydro-component/hydro-component/DiffusionAndStorageAndAdvectionAndDispersion.gif similarity index 100% rename from web/content/docs/benchmarks/hydro-component/gif/DiffusionAndStorageAndAdvectionAndDispersion.gif rename to web/content/docs/benchmarks/hydro-component/hydro-component/DiffusionAndStorageAndAdvectionAndDispersion.gif diff --git a/web/content/docs/benchmarks/hydro-component/gif/DiffusionAndStorageAndAdvectionAndDispersionHalf.gif b/web/content/docs/benchmarks/hydro-component/hydro-component/DiffusionAndStorageAndAdvectionAndDispersionHalf.gif similarity index 100% rename from web/content/docs/benchmarks/hydro-component/gif/DiffusionAndStorageAndAdvectionAndDispersionHalf.gif rename to web/content/docs/benchmarks/hydro-component/hydro-component/DiffusionAndStorageAndAdvectionAndDispersionHalf.gif diff --git a/web/content/docs/benchmarks/hydro-component/gif/DiffusionAndStorageAndGravityAndDispersionHalf.gif b/web/content/docs/benchmarks/hydro-component/hydro-component/DiffusionAndStorageAndGravityAndDispersionHalf.gif similarity index 100% rename from web/content/docs/benchmarks/hydro-component/gif/DiffusionAndStorageAndGravityAndDispersionHalf.gif rename to web/content/docs/benchmarks/hydro-component/hydro-component/DiffusionAndStorageAndGravityAndDispersionHalf.gif diff --git a/web/content/docs/benchmarks/hydro-component/HC-NonBoussinesq.pdf b/web/content/docs/benchmarks/hydro-component/hydro-component/HC-NonBoussinesq.pdf similarity index 100% rename from web/content/docs/benchmarks/hydro-component/HC-NonBoussinesq.pdf rename to web/content/docs/benchmarks/hydro-component/hydro-component/HC-NonBoussinesq.pdf diff --git a/web/content/docs/benchmarks/hydro-component/HC-Process.pdf b/web/content/docs/benchmarks/hydro-component/hydro-component/HC-Process.pdf similarity index 100% rename from web/content/docs/benchmarks/hydro-component/HC-Process.pdf rename to web/content/docs/benchmarks/hydro-component/hydro-component/HC-Process.pdf diff --git a/web/content/docs/benchmarks/hydro-component/hydro-component.md b/web/content/docs/benchmarks/hydro-component/hydro-component/index.md similarity index 80% rename from web/content/docs/benchmarks/hydro-component/hydro-component.md rename to web/content/docs/benchmarks/hydro-component/hydro-component/index.md index e0bef7bfc0..e68b0bd2b4 100644 --- a/web/content/docs/benchmarks/hydro-component/hydro-component.md +++ b/web/content/docs/benchmarks/hydro-component/hydro-component/index.md @@ -17,7 +17,7 @@ title = "Saturated Mass Transport" This benchmark compiles a number of simple, synthetic setups to test different processes of saturated component transport of a solute. -The development of the equation system is given in [this PDF](../HC-Process.pdf). In the following, we present the different setups. +The development of the equation system is given in [this PDF](HC-Process.pdf). In the following, we present the different setups. ## Problem description @@ -34,7 +34,7 @@ Left side boundary conditions for these two setups are pressure $p=0$ and concen {{< data-link "The *Diffusion only* project file" "Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly.prj" >}} {{< data-link "The *Diffusion and Storage* project file" "Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionAndStorage.prj" >}} -{{< img src="../gif/DiffusionAndStorage.gif" title="*Diffusion and Storage*">}} +{{< img src="DiffusionAndStorage.gif" title="*Diffusion and Storage*">}} #### Diffusion, Storage, and Advection @@ -42,7 +42,7 @@ Left side boundary conditions for this setup are pressure $p=1$ and concentratio {{< data-link "The *Diffusion, Storage, and Advection* project file" "Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvection.prj" >}} -{{< img src="../gif/DiffusionAndStorageAndAdvection.gif" title="*Diffusion, Storage, and Advection*">}} +{{< img src="DiffusionAndStorageAndAdvection.gif" title="*Diffusion, Storage, and Advection*">}} #### Diffusion, Storage, Advection, and Dispersion @@ -51,8 +51,8 @@ Left side boundary conditions for these setups are pressure $p=1$ and concentrat {{< data-link "The *Diffusion, Storage, Advection, and Dispersion* project file" "Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersion.prj" >}} {{< data-link "The *Diffusion, Storage, Advection, and Dispersion Half* project file" "Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj" >}} -{{< img src="../gif/DiffusionAndStorageAndAdvectionAndDispersion.gif" title="*Diffusion, Storage, Advection, and Dispersion*">}} -{{< img src="../gif/DiffusionAndStorageAndAdvectionAndDispersionHalf.gif" title="*Diffusion, Storage, Advection, and Dispersion Half*">}} +{{< img src="DiffusionAndStorageAndAdvectionAndDispersion.gif" title="*Diffusion, Storage, Advection, and Dispersion*">}} +{{< img src="DiffusionAndStorageAndAdvectionAndDispersionHalf.gif" title="*Diffusion, Storage, Advection, and Dispersion Half*">}} #### Diffusion, Storage, Gravity, and Dispersion @@ -60,7 +60,7 @@ Boundary condition for this setup is pressure $p=0$ for the top left corner and {{< data-link "The *Diffusion, Storage, Gravity, and Dispersion* project file" "Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndGravityAndDispersionHalf.prj" >}} -{{< img src="../gif/DiffusionAndStorageAndGravityAndDispersionHalf.gif" title="*Diffusion, Storage, Gravity, and Dispersion Half*">}} +{{< img src="DiffusionAndStorageAndGravityAndDispersionHalf.gif" title="*Diffusion, Storage, Gravity, and Dispersion Half*">}} #### Diffusion, Storage, Advection, and Decay @@ -68,8 +68,8 @@ Left side boundary conditions for this setup are pressure $p=1$ and concentratio {{< data-link "The *Diffusion, Storage, Advection, and Decay* project file" "Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDecay.prj" >}} -{{< img src="../gif/DiffusionAndStorageAndAdvectionAndDecay.gif" title="*Diffusion, Storage, Advection, and Decay*">}} +{{< img src="DiffusionAndStorageAndAdvectionAndDecay.gif" title="*Diffusion, Storage, Advection, and Decay*">}} #### Changes With Inclusion of Non Boussinesq-Effects -The changes to the original setup are described in [this PDF](../HC-NonBoussinesq.pdf). +The changes to the original setup are described in [this PDF](HC-NonBoussinesq.pdf). diff --git a/web/content/docs/benchmarks/hydro-component/theis/BCs.png b/web/content/docs/benchmarks/hydro-component/theis/HC_Theis/BCs.png similarity index 100% rename from web/content/docs/benchmarks/hydro-component/theis/BCs.png rename to web/content/docs/benchmarks/hydro-component/theis/HC_Theis/BCs.png diff --git a/web/content/docs/benchmarks/hydro-component/theis/comparison.png b/web/content/docs/benchmarks/hydro-component/theis/HC_Theis/comparison.png similarity index 100% rename from web/content/docs/benchmarks/hydro-component/theis/comparison.png rename to web/content/docs/benchmarks/hydro-component/theis/HC_Theis/comparison.png diff --git a/web/content/docs/benchmarks/hydro-component/theis/HC_Theis.md b/web/content/docs/benchmarks/hydro-component/theis/HC_Theis/index.md similarity index 93% rename from web/content/docs/benchmarks/hydro-component/theis/HC_Theis.md rename to web/content/docs/benchmarks/hydro-component/theis/HC_Theis/index.md index d6b8247dea..5727730e06 100644 --- a/web/content/docs/benchmarks/hydro-component/theis/HC_Theis.md +++ b/web/content/docs/benchmarks/hydro-component/theis/HC_Theis/index.md @@ -30,7 +30,7 @@ Here, we verify pumping abstraction with Theis for the `ComponentTransport` proc The setup comprises a 1/8th slice of a full circle (see figure 1). -{{< img src="../BCs.png" title="Mesh and boundary conditions (BC); blue = outer Dirichlet pressure and concentration BC, red = inner Neumann abstraction BC.">}} +{{< img src="BCs.png" title="Mesh and boundary conditions (BC); blue = outer Dirichlet pressure and concentration BC, red = inner Neumann abstraction BC.">}} The outer boundary condition is set as Dirichlet with a hydrostatic pressure along the shell surface of the slice equivalent to a head of $h = 0 m$ (i.e. water level equals top of domain). For mass transport, a Dirichlet boundary conditions with concentration $c = 0$ is set at the outer shell. The inner boundary condition is equivalent to the eighth of a total abstraction rate of $Q_t = 15 m^3/d$ for a full cylinder. *NB: In the `ComponentTransport` process, the Neumann BC is given as mass flux and has to be calculated per area, such that the value for the project file is $Q = Q_t / 8 / A \cdot \rho_0 = 2.83542E-03 m^3/s/m^2 \cdot kg/m^3$ (units equal $\frac{kg}{s m^2}$) with fluid reference density $\rho_0 = 1000 kg/m^3$ and abstraction area $A = 7.65 m^2$.* @@ -44,7 +44,7 @@ Initial conditions are $c = 0$ and hydrostatic pressure conditions. The figure below compares the analytical Theis solution vs. the simulated values from OGS6. -{{< img src="../comparison.png" title="Comparison between numerical (crosses) and analytical (lines) values.">}} +{{< img src="comparison.png" title="Comparison between numerical (crosses) and analytical (lines) values.">}} The top figure shows drawdown (i.e. the difference in water level compared to an initial state) over time at distance $r = 30 m$: for a simulation time $t < 40000 s$, the differences between analytical and numerical solutions are marginal; at later simulation times, the drawdown shows lower values than predicted from the analytical solution, as it is influenced by the outer Dirichlet pressure boundary condition. diff --git a/web/content/docs/benchmarks/hydro-component/HC-VDBCTest.pdf b/web/content/docs/benchmarks/hydro-component/vdbc/HC-VDBCTest.pdf similarity index 100% rename from web/content/docs/benchmarks/hydro-component/HC-VDBCTest.pdf rename to web/content/docs/benchmarks/hydro-component/vdbc/HC-VDBCTest.pdf diff --git a/web/content/docs/benchmarks/hydro-component/VDBC_num_ana_comp.png b/web/content/docs/benchmarks/hydro-component/vdbc/VDBC_num_ana_comp.png similarity index 100% rename from web/content/docs/benchmarks/hydro-component/VDBC_num_ana_comp.png rename to web/content/docs/benchmarks/hydro-component/vdbc/VDBC_num_ana_comp.png diff --git a/web/content/docs/benchmarks/hydro-component/vdbc.md b/web/content/docs/benchmarks/hydro-component/vdbc/index.md similarity index 55% rename from web/content/docs/benchmarks/hydro-component/vdbc.md rename to web/content/docs/benchmarks/hydro-component/vdbc/index.md index 43732ec288..e4a4e23b26 100644 --- a/web/content/docs/benchmarks/hydro-component/vdbc.md +++ b/web/content/docs/benchmarks/hydro-component/vdbc/index.md @@ -16,10 +16,10 @@ title = "Variable Dependent Boundary Condition" ## Overview The component transport process is used for the benchmark setup. Here, a analytical solution of a simple setup is derived and compared to the numerical results. -This Benchmark is described in [this PDF](../HC-VDBCTest.pdf). +This Benchmark is described in [this PDF](HC-VDBCTest.pdf). For the setup and parameterization, see the chapter "Density dependent flow - The Goswami Problem" in Kolditz et al. (2012). ## Results -{{< img src="../VDBC_num_ana_comp.png" title="UPPER PART: Analytical solution on the right boundary in dependence of time $t$ of the problem indicated with red dashed line in comparison to numerical solution indicated by blue crosses; LOWER PART: development of relative error in dependence of time $t$. Grid spacing for simulations: 0.1; widest timestep 10. The relative error is below $5 \times 10^{-5}$ for all simulation times.">}} +{{< img src="VDBC_num_ana_comp.png" title="UPPER PART: Analytical solution on the right boundary in dependence of time $t$ of the problem indicated with red dashed line in comparison to numerical solution indicated by blue crosses; LOWER PART: development of relative error in dependence of time $t$. Grid spacing for simulations: 0.1; widest timestep 10. The relative error is below $5 \times 10^{-5}$ for all simulation times.">}} diff --git a/web/content/docs/benchmarks/python-bc/elder-benchmark/elder/index.md b/web/content/docs/benchmarks/python-bc/elder-benchmark/elder/index.md index 3c62257479..4b9f6319bb 100644 --- a/web/content/docs/benchmarks/python-bc/elder-benchmark/elder/index.md +++ b/web/content/docs/benchmarks/python-bc/elder-benchmark/elder/index.md @@ -23,5 +23,5 @@ The aim of this test is: ## Details -This test is a copy of [this test case]({{< ref "../../Hydro-Component/elder" >}}). +This test is a copy of [this test case]({{< ref "docs/benchmarks/hydro-component/elder" >}}). Please check the original test case for any details. diff --git a/web/content/docs/benchmarks/reactive-transport/ThermalDiffusion/DiffusionThermalGradient.pdf b/web/content/docs/benchmarks/reactive-transport/ThermalDiffusion/ThermalDiffusion/DiffusionThermalGradient.pdf similarity index 100% rename from web/content/docs/benchmarks/reactive-transport/ThermalDiffusion/DiffusionThermalGradient.pdf rename to web/content/docs/benchmarks/reactive-transport/ThermalDiffusion/ThermalDiffusion/DiffusionThermalGradient.pdf diff --git a/web/content/docs/benchmarks/reactive-transport/ThermalDiffusion/ThermalDiffusion.md b/web/content/docs/benchmarks/reactive-transport/ThermalDiffusion/ThermalDiffusion/index.md similarity index 97% rename from web/content/docs/benchmarks/reactive-transport/ThermalDiffusion/ThermalDiffusion.md rename to web/content/docs/benchmarks/reactive-transport/ThermalDiffusion/ThermalDiffusion/index.md index 3e3c5b832c..4725bb7771 100644 --- a/web/content/docs/benchmarks/reactive-transport/ThermalDiffusion/ThermalDiffusion.md +++ b/web/content/docs/benchmarks/reactive-transport/ThermalDiffusion/ThermalDiffusion/index.md @@ -30,4 +30,4 @@ Both models `TemperatureField.prj` and `TemperatureField_transport.prj` run inde ## Model setup and results -See [this PDF](../DiffusionThermalGradient.pdf). +See [this PDF](DiffusionThermalGradient.pdf). diff --git a/web/content/docs/benchmarks/reactive-transport/calcite-Figures/ResultComparison.png b/web/content/docs/benchmarks/reactive-transport/calcite/ResultComparison.png similarity index 100% rename from web/content/docs/benchmarks/reactive-transport/calcite-Figures/ResultComparison.png rename to web/content/docs/benchmarks/reactive-transport/calcite/ResultComparison.png diff --git a/web/content/docs/benchmarks/reactive-transport/calcite-Figures/ResultComparisonPH.png b/web/content/docs/benchmarks/reactive-transport/calcite/ResultComparisonPH.png similarity index 100% rename from web/content/docs/benchmarks/reactive-transport/calcite-Figures/ResultComparisonPH.png rename to web/content/docs/benchmarks/reactive-transport/calcite/ResultComparisonPH.png diff --git a/web/content/docs/benchmarks/reactive-transport/calcite-Figures/Scheme.png b/web/content/docs/benchmarks/reactive-transport/calcite/Scheme.png similarity index 100% rename from web/content/docs/benchmarks/reactive-transport/calcite-Figures/Scheme.png rename to web/content/docs/benchmarks/reactive-transport/calcite/Scheme.png diff --git a/web/content/docs/benchmarks/reactive-transport/calcite.md b/web/content/docs/benchmarks/reactive-transport/calcite/index.md similarity index 92% rename from web/content/docs/benchmarks/reactive-transport/calcite.md rename to web/content/docs/benchmarks/reactive-transport/calcite/index.md index 27d1cf9526..dd89e866bf 100644 --- a/web/content/docs/benchmarks/reactive-transport/calcite.md +++ b/web/content/docs/benchmarks/reactive-transport/calcite/index.md @@ -56,7 +56,7 @@ where $\alpha_L$ (m) and $\alpha_T$ (m) are the longitudinal and transversal dis A one-dimensional (1D) model domain of 0.5 m discretized into 100 uniform elements has been selected for the spatial discretization of the system. Dirichlet (constant concentration) and Neumannn (no flux) boundary condition are defined for the upstream inflow and the downstream, respectively. A longitudinal dispersivity of 0.0067 m and a time step size of 100 s have been taken into account in the simulation. See Figure below: -{{< img src="../calcite-Figures/Scheme.png" title="Schematic representation of the model setup and parameters.">}} +{{< img src="Scheme.png" title="Schematic representation of the model setup and parameters.">}} Thermodynamic data for hydrolysis, aqueous speciation, and dissolution/precipitation reactions between Mg, Ca, Cl, and carbonate were selected from version 12/07 of the PSI/NAGRA chemical thermodynamic database (Thoenen *et al.* 2014). Although several other minerals containing Mg and Ca were available in the PSI/NAGRA database (*i.e.* magnesite), only two solids were allowed to precipitate or dissolve in the studied system (calcite and dolomite (CaMg(CO$_3$)$_2$)). @@ -66,9 +66,9 @@ A comparison of the results obtained with OGS-6#IPhreeqc and OGS-5#IPhreeqc at t At the simulated time, it can be clearly seen that the MgCl$_2$ solution front has penetrated ~0.3m of the column resulting in the dissolution of calcite and dolomite precipitation. Total aqueous concentration and solid profiles obtained of OGS-6 are in good agreement with those of OGS-5. The absolute error in terms of component concentrations is $2.15\times10^{-5}$ (Cl), $1.13\times10^{-5}$ (Mg), and $4.57\times10^{-6}$ (Ca). Additionally, pH profiles calculated with both codes are in good agreement. -{{< img src="../calcite-Figures/ResultComparison.png" title="Total aqueous concentration and solid profiles obtained with OGS-6#IPhreeqc (empty triangle symbol) and OGS-5#IPhreeqc (empty circle symbol) at 350 min. (C(4) = total carbonate)">}} +{{< img src="ResultComparison.png" title="Total aqueous concentration and solid profiles obtained with OGS-6#IPhreeqc (empty triangle symbol) and OGS-5#IPhreeqc (empty circle symbol) at 350 min. (C(4) = total carbonate)">}} -{{< img src="../calcite-Figures/ResultComparisonPH.png" title="pH value profiles obtained with OGS-6#IPhreeqc (empty triangle symbol) and OGS-5#IPhreeqc (empty circle symbol) at 350 min.">}} +{{< img src="ResultComparisonPH.png" title="pH value profiles obtained with OGS-6#IPhreeqc (empty triangle symbol) and OGS-5#IPhreeqc (empty circle symbol) at 350 min.">}} {{< data-link >}} diff --git a/web/content/docs/benchmarks/reactive-transport/exchange/fig1.png b/web/content/docs/benchmarks/reactive-transport/exchange/exchange/fig1.png similarity index 100% rename from web/content/docs/benchmarks/reactive-transport/exchange/fig1.png rename to web/content/docs/benchmarks/reactive-transport/exchange/exchange/fig1.png diff --git a/web/content/docs/benchmarks/reactive-transport/exchange/fig2.png b/web/content/docs/benchmarks/reactive-transport/exchange/exchange/fig2.png similarity index 100% rename from web/content/docs/benchmarks/reactive-transport/exchange/fig2.png rename to web/content/docs/benchmarks/reactive-transport/exchange/exchange/fig2.png diff --git a/web/content/docs/benchmarks/reactive-transport/exchange/exchange.md b/web/content/docs/benchmarks/reactive-transport/exchange/exchange/index.md similarity index 81% rename from web/content/docs/benchmarks/reactive-transport/exchange/exchange.md rename to web/content/docs/benchmarks/reactive-transport/exchange/exchange/index.md index bc53d0b20c..6fc30cfaa9 100644 --- a/web/content/docs/benchmarks/reactive-transport/exchange/exchange.md +++ b/web/content/docs/benchmarks/reactive-transport/exchange/exchange/index.md @@ -18,7 +18,7 @@ title = "Transport and Cation Exchange" This benchmark simulates the chemical composition of the effluent from a column containing a cation exchanger (Example 11 in the PHREEQC 3 documentation). The following setup is used for the simulation: -{{< img src="../fig1.png" title="Model setup for the simulation of the column with a cation exchanger in OGS6.">}} +{{< img src="fig1.png" title="Model setup for the simulation of the column with a cation exchanger in OGS6.">}} Full details of the model setup and parameters are given in the PHREEQC3 example (consulted MAY-2021): @@ -26,7 +26,7 @@ https://water.usgs.gov/water-resources/software/PHREEQC/documentation/phreeqc3-h The benchmark uses the `ComponentTransport` process in OGS-6 coupled with the IPhreeqc software (Parkhurst and Appelo,2013). The results show good agreement between codes. More details about the implementation of the `ComponentTransport` process in OGS-6 can be found in [HC-Process.pdf](/docs/benchmarks/hydro-component/HC-Process.pdf). -{{< img src="../fig2.png" title="Comparison between PHREEQC and OGS6 of simulated concentrations of solutes at time = 18,000 s reacting with an exchanger.">}} +{{< img src="fig2.png" title="Comparison between PHREEQC and OGS6 of simulated concentrations of solutes at time = 18,000 s reacting with an exchanger.">}} {{< data-link >}} diff --git a/web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2_domain.png b/web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2/KineticReactant2_domain.png similarity index 100% rename from web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2_domain.png rename to web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2/KineticReactant2_domain.png diff --git a/web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2.md b/web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2/index.md similarity index 98% rename from web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2.md rename to web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2/index.md index beb4913d26..414428f91a 100644 --- a/web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2.md +++ b/web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2/index.md @@ -37,7 +37,7 @@ Respective material properties, initial and boundary conditions are listed in th The 2d--scenario only differs in the domain geometry and assignment of the boundary conditions. The horizontal domain is 0.5 m in x and 0.5 m in y direction, and, discretized into 10374 quadratic elemtents with an edge size of 0.0025 m. -![Domains for the 1d/2d simulation models](../KineticReactant2_domain.png) +![Domains for the 1d/2d simulation models](KineticReactant2_domain.png) ----------------------------------------- diff --git a/web/content/docs/benchmarks/reactive-transport/radionuclide/Fig1.png b/web/content/docs/benchmarks/reactive-transport/radionuclide/radionuclide/Fig1.png similarity index 100% rename from web/content/docs/benchmarks/reactive-transport/radionuclide/Fig1.png rename to web/content/docs/benchmarks/reactive-transport/radionuclide/radionuclide/Fig1.png diff --git a/web/content/docs/benchmarks/reactive-transport/radionuclide/domain.png b/web/content/docs/benchmarks/reactive-transport/radionuclide/radionuclide/domain.png similarity index 100% rename from web/content/docs/benchmarks/reactive-transport/radionuclide/domain.png rename to web/content/docs/benchmarks/reactive-transport/radionuclide/radionuclide/domain.png diff --git a/web/content/docs/benchmarks/reactive-transport/radionuclide/radionuclide.md b/web/content/docs/benchmarks/reactive-transport/radionuclide/radionuclide/index.md similarity index 92% rename from web/content/docs/benchmarks/reactive-transport/radionuclide/radionuclide.md rename to web/content/docs/benchmarks/reactive-transport/radionuclide/radionuclide/index.md index 92475255f5..6801dfc261 100644 --- a/web/content/docs/benchmarks/reactive-transport/radionuclide/radionuclide.md +++ b/web/content/docs/benchmarks/reactive-transport/radionuclide/radionuclide/index.md @@ -19,7 +19,7 @@ This benchmark is focused on the simulation of the migration of $U(VI)$ in a por The benchmark uses the `ComponentTransport` process in OGS-6 (see [HC-Process.pdf](/docs/benchmarks/hydro-component/HC-Process.pdf)) coupled with the IPhreeqc interface (Parkhurst and Appelo,2013) for the chemical speciation calculations. The porewater initial composition and injected for the first 10 000 s is shown in Table 1. The porewater solution is equilibrated with Calcite. -{{< img src="../domain.png" title="Spatial and temporal discretization of the 1D model. Solution concentrations with/without U(VI) are applied at the inflow boundary. Initial concentration of U(VI) in the domain is 0.">}} +{{< img src="domain.png" title="Spatial and temporal discretization of the 1D model. Solution concentrations with/without U(VI) are applied at the inflow boundary. Initial concentration of U(VI) in the domain is 0.">}} ----------------------------------------- @@ -60,7 +60,7 @@ Table 2: **Surface parameters and characterization used in the simulations.** Four different combinations can be simulated taking the albite and orthoclase phases of the Feldspars group and the goethite and hematite phases for the Fe(III)-oxids/-hydroxids group. Mineral combinations from 1 to 4 (see Fig. 2) are as follows: 1) albite-goethite, 2) albite-hematite, 3) orthoclase-goethite and 4) orthoclase-hematite. From the concentration profiles in Fig. 2, it is clear that the combination 2 approximates better the profile obtained with the ESTRAL database. We choose this combination for the next part of our simulations. Furthermore, this combination is written in the `RadionuclideSorption.prj` file of this benchmark. -{{< img src="../Fig1.png" title="Comparison of concentration profiles at final simulation time (115 000 s) for various representative minerals of the Feldspar and Fe(III)-oxids/-hydroxids groups. The mineral combinations profiles are obtained using the PSI/Nagra database version 12/07 and the dashed profile is obtained with the ESTRAL database.">}} +{{< img src="Fig1.png" title="Comparison of concentration profiles at final simulation time (115 000 s) for various representative minerals of the Feldspar and Fe(III)-oxids/-hydroxids groups. The mineral combinations profiles are obtained using the PSI/Nagra database version 12/07 and the dashed profile is obtained with the ESTRAL database.">}} The temporal evolution of the concentration profiles of the chosen mineral combination (albite-hematite) compared to the ESTRAL database is shown in Fig. 3. In addition, a simulation of the reactive transport treating $U(VI)$ as a non-sorbing radionuclide is presented. Recall that the contaminated solution with $U(VI)$ is injected only for the first 10 000 s of simulation. On the one hand, we note the difference between the profile with the augmented PSI/Nagra database and with the ESTRAL database. This is expected, since different reactions and significant differences in *log K* values are considered for each simulation. However, we note that the trend is similar enough to capture the relevant sorption process happening at the surface. diff --git a/web/content/docs/benchmarks/reactive-transport/wetland/Wetland_cwm1.png b/web/content/docs/benchmarks/reactive-transport/wetland/Wetland/Wetland_cwm1.png similarity index 100% rename from web/content/docs/benchmarks/reactive-transport/wetland/Wetland_cwm1.png rename to web/content/docs/benchmarks/reactive-transport/wetland/Wetland/Wetland_cwm1.png diff --git a/web/content/docs/benchmarks/reactive-transport/wetland/Wetland_domain.png b/web/content/docs/benchmarks/reactive-transport/wetland/Wetland/Wetland_domain.png similarity index 100% rename from web/content/docs/benchmarks/reactive-transport/wetland/Wetland_domain.png rename to web/content/docs/benchmarks/reactive-transport/wetland/Wetland/Wetland_domain.png diff --git a/web/content/docs/benchmarks/reactive-transport/wetland/Wetland.md b/web/content/docs/benchmarks/reactive-transport/wetland/Wetland/index.md similarity index 98% rename from web/content/docs/benchmarks/reactive-transport/wetland/Wetland.md rename to web/content/docs/benchmarks/reactive-transport/wetland/Wetland/index.md index 79dfa3d715..6ea67f1ac8 100644 --- a/web/content/docs/benchmarks/reactive-transport/wetland/Wetland.md +++ b/web/content/docs/benchmarks/reactive-transport/wetland/Wetland/index.md @@ -34,7 +34,7 @@ The domain is saturated at start--up with an initial hydrostatic pressure of ($p For the water mass influx a constant Neumann boundary condition (BC) is set at the left side ($g_{N,\text{in}}^p$). For the water efflux, a constant pressure is defined as boundary ($g_{D,\text{out}}^p$). -![Schematic representation of the experimental system and 1D model domain used in the simulation. The influent and effluent zone in the 1D model are represented by solid lines.](../Wetland_domain.png) +![Schematic representation of the experimental system and 1D model domain used in the simulation. The influent and effluent zone in the 1D model are represented by solid lines.](Wetland_domain.png) The microbiological processes are modeled by a complex network of kinetic reactions based on the Constructed Wetland Model No. 1 (CWM1) described in Langergraber (2009). The network includes dissolved oxygen ($So$) and nine different soluble and particulated components ("pollutants") that some of them can be metabolized by six bacterial groups resulting in 17 kinetic reactions (Figure 2). @@ -42,7 +42,7 @@ A "clean" system is assumed at start-up in the basin, therefore, initial concent For the wastewater components ("pollutants" and oxygen) entering the system, time-dependent Dirichlet BC are defined at the influx point. Respective material properties, initial and boundary conditions are listed in Table 1--2. -![Network of microbiological reactions described by CWM1. $S_I$ = inert soluble organic matter (COD), $X_I$ = inert particulated COD, $X_S$ = Slowly biodegradable particulate COD, $S_F$ = Fermentable, readily biodegradable soluble COD, $S_A$ = Fermentation products as acetate, $S_{NH}$ = Ammonium and ammonia nitrogen, $S_{NO}$ = Nitrate and nitrite nitrogen, $S_O$ = Dissolved oxygen, $S_{SO}$ = Sulphate sulfur, $S_{H2S}$ = Sulphide sulfur; different type of bacterias are identified as $X_H$, $X_A$, $X_{FB}$, $X_{AMB}$, $X_{ASRB}$ and $X_{SOB}$](../Wetland_cwm1.png){width=60%} +![Network of microbiological reactions described by CWM1. $S_I$ = inert soluble organic matter (COD), $X_I$ = inert particulated COD, $X_S$ = Slowly biodegradable particulate COD, $S_F$ = Fermentable, readily biodegradable soluble COD, $S_A$ = Fermentation products as acetate, $S_{NH}$ = Ammonium and ammonia nitrogen, $S_{NO}$ = Nitrate and nitrite nitrogen, $S_O$ = Dissolved oxygen, $S_{SO}$ = Sulphate sulfur, $S_{H2S}$ = Sulphide sulfur; different type of bacterias are identified as $X_H$, $X_A$, $X_{FB}$, $X_{AMB}$, $X_{ASRB}$ and $X_{SOB}$](Wetland_cwm1.png){width=60%} ----------------------------------------- diff --git a/web/content/docs/benchmarks/richards-flow/RichardsComponentTransport_Equations.pdf b/web/content/docs/benchmarks/richards-flow/richards-component-transport/RichardsComponentTransport_Equations.pdf similarity index 100% rename from web/content/docs/benchmarks/richards-flow/RichardsComponentTransport_Equations.pdf rename to web/content/docs/benchmarks/richards-flow/richards-component-transport/RichardsComponentTransport_Equations.pdf diff --git a/web/content/docs/benchmarks/richards-flow/RichardsComponentTransport_Padilla.png b/web/content/docs/benchmarks/richards-flow/richards-component-transport/RichardsComponentTransport_Padilla.png similarity index 100% rename from web/content/docs/benchmarks/richards-flow/RichardsComponentTransport_Padilla.png rename to web/content/docs/benchmarks/richards-flow/richards-component-transport/RichardsComponentTransport_Padilla.png diff --git a/web/content/docs/benchmarks/richards-flow/richards-component-transport.md b/web/content/docs/benchmarks/richards-flow/richards-component-transport/index.md similarity index 89% rename from web/content/docs/benchmarks/richards-flow/richards-component-transport.md rename to web/content/docs/benchmarks/richards-flow/richards-component-transport/index.md index a29168f9ee..42d5aaa65c 100644 --- a/web/content/docs/benchmarks/richards-flow/richards-component-transport.md +++ b/web/content/docs/benchmarks/richards-flow/richards-component-transport/index.md @@ -17,7 +17,7 @@ title = "Unsaturated Mass Transport" The Richards equation is often used to describe water movement in the unsaturated zone, while the mass transport equation describes solute movement in the liquid phase. Here, we use a monolithic approach to simulate mass transport in an unsaturated medium. -The development of the equation system is given in [this PDF](../RichardsComponentTransport_Equations.pdf). In the following, we present a numerical benchmark that uses experimental data as reference. +The development of the equation system is given in [this PDF](RichardsComponentTransport_Equations.pdf). In the following, we present a numerical benchmark that uses experimental data as reference. ## Problem description @@ -38,7 +38,7 @@ Initial conditions are $c = 0$ and hydrostatic pressure conditions with steady s The figure below shows breakthrough curves vs experimental result at the bottom of the simulation domain, together with averaged saturation values at the two observation points with distance of 0.075 cm from both ends of the column (as stated in Padilla et al., 1999) over pore volume. -{{< img src="../RichardsComponentTransport_Padilla.png" title="Comparison between numerical (lines) and experimental (squares) results for cases 'NaCl1' and 'NaCl6' from Padilla et al. (1999).">}} +{{< img src="RichardsComponentTransport_Padilla.png" title="Comparison between numerical (lines) and experimental (squares) results for cases 'NaCl1' and 'NaCl6' from Padilla et al. (1999).">}} It can be seen, that with decreasing saturation, breakthrough curves exhibit stronger dispersion through the decreased angle of the breakthrough curve. Both simulation results follow the experimental observations closely; deviations, especially in the unsaturated case, can be attributed to known tailing effects from secondary porosity. diff --git a/web/content/docs/benchmarks/richards-flow/richards-flow.md b/web/content/docs/benchmarks/richards-flow/richards-flow/index.md similarity index 87% rename from web/content/docs/benchmarks/richards-flow/richards-flow.md rename to web/content/docs/benchmarks/richards-flow/richards-flow/index.md index 513f5a1a89..12fabbcae3 100644 --- a/web/content/docs/benchmarks/richards-flow/richards-flow.md +++ b/web/content/docs/benchmarks/richards-flow/richards-flow/index.md @@ -19,4 +19,4 @@ The Richards equation is often used to mathematically describe water movement in ## Problem setting -See [this PDF](../richards-2.pdf) for the problem setting. +See [this PDF](richards-2.pdf) for the problem setting. diff --git a/web/content/docs/benchmarks/richards-flow/richards-2.pdf b/web/content/docs/benchmarks/richards-flow/richards-flow/richards-2.pdf similarity index 100% rename from web/content/docs/benchmarks/richards-flow/richards-2.pdf rename to web/content/docs/benchmarks/richards-flow/richards-flow/richards-2.pdf diff --git a/web/content/docs/benchmarks/richards-mechanics/BishopsEffectiveStress.png b/web/content/docs/benchmarks/richards-mechanics/bishops-effective-stress/BishopsEffectiveStress.png similarity index 100% rename from web/content/docs/benchmarks/richards-mechanics/BishopsEffectiveStress.png rename to web/content/docs/benchmarks/richards-mechanics/bishops-effective-stress/BishopsEffectiveStress.png diff --git a/web/content/docs/benchmarks/richards-mechanics/bishops-effective-stress.md b/web/content/docs/benchmarks/richards-mechanics/bishops-effective-stress/index.md similarity index 95% rename from web/content/docs/benchmarks/richards-mechanics/bishops-effective-stress.md rename to web/content/docs/benchmarks/richards-mechanics/bishops-effective-stress/index.md index b35e15f13a..6099c1c30e 100644 --- a/web/content/docs/benchmarks/richards-mechanics/bishops-effective-stress.md +++ b/web/content/docs/benchmarks/richards-mechanics/bishops-effective-stress/index.md @@ -30,4 +30,4 @@ displacement. In the test the medium is desaturated and then saturated again, which causes shrinkage and expansion of the domain. Power law with exponents 1, 1/5, and 5 and saturation cut-off at maximum liquid saturation of 0.95 are compared. -{{< img src="../BishopsEffectiveStress.png" >}} +{{< img src="BishopsEffectiveStress.png" >}} diff --git a/web/content/docs/benchmarks/richards-mechanics/liakopoulos.md b/web/content/docs/benchmarks/richards-mechanics/liakopoulos/index.md similarity index 90% rename from web/content/docs/benchmarks/richards-mechanics/liakopoulos.md rename to web/content/docs/benchmarks/richards-mechanics/liakopoulos/index.md index a2430fcd99..fff34a3750 100644 --- a/web/content/docs/benchmarks/richards-mechanics/liakopoulos.md +++ b/web/content/docs/benchmarks/richards-mechanics/liakopoulos/index.md @@ -17,9 +17,9 @@ This benchmark simulates the Liakopoulos experiment {{< data-link >}} * Saturation profile: -{{< img src="../liak_S.png" >}} +{{< img src="liak_S.png" >}} * Vertical displacement profile: -{{< img src="../liak_uy.png" >}} +{{< img src="liak_uy.png" >}} ## References diff --git a/web/content/docs/benchmarks/richards-mechanics/liak_S.png b/web/content/docs/benchmarks/richards-mechanics/liakopoulos/liak_S.png similarity index 100% rename from web/content/docs/benchmarks/richards-mechanics/liak_S.png rename to web/content/docs/benchmarks/richards-mechanics/liakopoulos/liak_S.png diff --git a/web/content/docs/benchmarks/richards-mechanics/liak_uy.png b/web/content/docs/benchmarks/richards-mechanics/liakopoulos/liak_uy.png similarity index 100% rename from web/content/docs/benchmarks/richards-mechanics/liak_uy.png rename to web/content/docs/benchmarks/richards-mechanics/liakopoulos/liak_uy.png diff --git a/web/content/docs/benchmarks/small-deformations/ModifiedCamClay_report.pdf b/web/content/docs/benchmarks/small-deformations/ModifiedCamClay/ModifiedCamClay_report.pdf similarity index 100% rename from web/content/docs/benchmarks/small-deformations/ModifiedCamClay_report.pdf rename to web/content/docs/benchmarks/small-deformations/ModifiedCamClay/ModifiedCamClay_report.pdf diff --git a/web/content/docs/benchmarks/small-deformations/ModifiedCamClay.md b/web/content/docs/benchmarks/small-deformations/ModifiedCamClay/index.md similarity index 90% rename from web/content/docs/benchmarks/small-deformations/ModifiedCamClay.md rename to web/content/docs/benchmarks/small-deformations/ModifiedCamClay/index.md index 765d0c6b03..785a25a291 100644 --- a/web/content/docs/benchmarks/small-deformations/ModifiedCamClay.md +++ b/web/content/docs/benchmarks/small-deformations/ModifiedCamClay/index.md @@ -23,4 +23,4 @@ Three tests are presented: We perform plane strain and axisymmetric mechanical tests using the modified Cam clay model revealing both the features and the limitations of this material model. -See [this PDF](../ModifiedCamClay_report.pdf) for the detailed description. +See [this PDF](ModifiedCamClay_report.pdf) for the detailed description. diff --git a/web/content/docs/benchmarks/small-deformations/arehs-salt-T_elements.png b/web/content/docs/benchmarks/small-deformations/arehs_salt_dome_creep_hete_T_ref/arehs-salt-T_elements.png similarity index 100% rename from web/content/docs/benchmarks/small-deformations/arehs-salt-T_elements.png rename to web/content/docs/benchmarks/small-deformations/arehs_salt_dome_creep_hete_T_ref/arehs-salt-T_elements.png diff --git a/web/content/docs/benchmarks/small-deformations/arehs_saltdome_creep_S.png b/web/content/docs/benchmarks/small-deformations/arehs_salt_dome_creep_hete_T_ref/arehs_saltdome_creep_S.png similarity index 100% rename from web/content/docs/benchmarks/small-deformations/arehs_saltdome_creep_S.png rename to web/content/docs/benchmarks/small-deformations/arehs_salt_dome_creep_hete_T_ref/arehs_saltdome_creep_S.png diff --git a/web/content/docs/benchmarks/small-deformations/arehs_saltdome_creep_u.png b/web/content/docs/benchmarks/small-deformations/arehs_salt_dome_creep_hete_T_ref/arehs_saltdome_creep_u.png similarity index 100% rename from web/content/docs/benchmarks/small-deformations/arehs_saltdome_creep_u.png rename to web/content/docs/benchmarks/small-deformations/arehs_salt_dome_creep_hete_T_ref/arehs_saltdome_creep_u.png diff --git a/web/content/docs/benchmarks/small-deformations/arehs_salt_dome_creep_hete_T_ref.md b/web/content/docs/benchmarks/small-deformations/arehs_salt_dome_creep_hete_T_ref/index.md similarity index 87% rename from web/content/docs/benchmarks/small-deformations/arehs_salt_dome_creep_hete_T_ref.md rename to web/content/docs/benchmarks/small-deformations/arehs_salt_dome_creep_hete_T_ref/index.md index 5d9605d6c4..46cc0ff14f 100644 --- a/web/content/docs/benchmarks/small-deformations/arehs_salt_dome_creep_hete_T_ref.md +++ b/web/content/docs/benchmarks/small-deformations/arehs_salt_dome_creep_hete_T_ref/index.md @@ -33,7 +33,7 @@ The other material parameters are listed in the following table: The reference temperature is shown in the following figure:

-drawing +drawing

The initial stresses were obtained by conducting a simulation of the pure elastic deformation in the same domain under the gravitational force. @@ -43,10 +43,10 @@ As a benchmark, only one thousand years' creep with six time steps is considere The following two figures shown the results of stress magnitude and displacement magnitude at the last time step:

-drawing +drawing

-drawing +drawing

## References diff --git a/web/content/docs/benchmarks/small-deformations/LIE_SD_m_result_uy.png b/web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture/LIE_SD_m_result_uy.png similarity index 100% rename from web/content/docs/benchmarks/small-deformations/LIE_SD_m_result_uy.png rename to web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture/LIE_SD_m_result_uy.png diff --git a/web/content/docs/benchmarks/small-deformations/LIE_fracture_incompressibility.pdf b/web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture/LIE_fracture_incompressibility.pdf similarity index 100% rename from web/content/docs/benchmarks/small-deformations/LIE_fracture_incompressibility.pdf rename to web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture/LIE_fracture_incompressibility.pdf diff --git a/web/content/docs/benchmarks/small-deformations/LIE_small_deformation.pdf b/web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture/LIE_small_deformation.pdf similarity index 100% rename from web/content/docs/benchmarks/small-deformations/LIE_small_deformation.pdf rename to web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture/LIE_small_deformation.pdf diff --git a/web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture.md b/web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture/index.md similarity index 75% rename from web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture.md rename to web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture/index.md index c0b34a153f..d209b40ddb 100644 --- a/web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture.md +++ b/web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture/index.md @@ -17,21 +17,21 @@ title = "Linear; Single fracture" We solve a linear elastic small deformation problem with a pre-existing fracture using the lower-dimensional interface element (LIE) approach. -See [this PDF](../LIE_small_deformation.pdf) for detailed problem description. +See [this PDF](LIE_small_deformation.pdf) for detailed problem description. The one-sided incompressibility constraint for fracture models is described in -[this PDF](../LIE_fracture_incompressibility.pdf). +[this PDF](LIE_fracture_incompressibility.pdf). ## Results and evaluation Result showing sliding of the upper part of the domain along the fracture: -{{< img src="../LIE_SD_m_result_uy.png" >}} +{{< img src="LIE_SD_m_result_uy.png" >}} Same benchmark setup with plane strain conditions in 3D: -{{< img src="../single_joint_3D.png" >}} +{{< img src="single_joint_3D.png" >}} Comparison with 2D setup yields identical results (up to numerical differences in order of 1e-15); Resulting displacement on the left axis, and error on the right: -{{< img src="../single_joint_3D_2D_results.png" >}} +{{< img src="single_joint_3D_2D_results.png" >}} diff --git a/web/content/docs/benchmarks/small-deformations/single_joint_3D.png b/web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture/single_joint_3D.png similarity index 100% rename from web/content/docs/benchmarks/small-deformations/single_joint_3D.png rename to web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture/single_joint_3D.png diff --git a/web/content/docs/benchmarks/small-deformations/single_joint_3D_2D_results.png b/web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture/single_joint_3D_2D_results.png similarity index 100% rename from web/content/docs/benchmarks/small-deformations/single_joint_3D_2D_results.png rename to web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture/single_joint_3D_2D_results.png diff --git a/web/content/docs/benchmarks/small-deformations/Circular_hole.pdf b/web/content/docs/benchmarks/small-deformations/mechanics-linear-disc-with-hole/Circular_hole.pdf similarity index 100% rename from web/content/docs/benchmarks/small-deformations/Circular_hole.pdf rename to web/content/docs/benchmarks/small-deformations/mechanics-linear-disc-with-hole/Circular_hole.pdf diff --git a/web/content/docs/benchmarks/small-deformations/disc_with_hole_pcs_0_ts_4_t_1.000000.png b/web/content/docs/benchmarks/small-deformations/mechanics-linear-disc-with-hole/disc_with_hole_pcs_0_ts_4_t_1.000000.png similarity index 100% rename from web/content/docs/benchmarks/small-deformations/disc_with_hole_pcs_0_ts_4_t_1.000000.png rename to web/content/docs/benchmarks/small-deformations/mechanics-linear-disc-with-hole/disc_with_hole_pcs_0_ts_4_t_1.000000.png diff --git a/web/content/docs/benchmarks/small-deformations/mechanics-linear-disc-with-hole.md b/web/content/docs/benchmarks/small-deformations/mechanics-linear-disc-with-hole/index.md similarity index 75% rename from web/content/docs/benchmarks/small-deformations/mechanics-linear-disc-with-hole.md rename to web/content/docs/benchmarks/small-deformations/mechanics-linear-disc-with-hole/index.md index 70ca56aab1..8235477b64 100644 --- a/web/content/docs/benchmarks/small-deformations/mechanics-linear-disc-with-hole.md +++ b/web/content/docs/benchmarks/small-deformations/mechanics-linear-disc-with-hole/index.md @@ -17,10 +17,10 @@ weight = 111 We solve a linear elastic small deformation problem on a quarter of a plate with hole put under tension on the top boundary. -See [this PDF](../Circular_hole.pdf) for detailed problem description. +See [this PDF](Circular_hole.pdf) for detailed problem description. ## Results and evaluation -![Result showing the displacement field.](../disc_with_hole_pcs_0_ts_4_t_1.000000.png) +![Result showing the displacement field.](disc_with_hole_pcs_0_ts_4_t_1.000000.png) diff --git a/web/content/docs/benchmarks/small-deformations/element_deactivation_2D.png b/web/content/docs/benchmarks/small-deformations/mechanics-linear-element_deactivation/element_deactivation_2D.png similarity index 100% rename from web/content/docs/benchmarks/small-deformations/element_deactivation_2D.png rename to web/content/docs/benchmarks/small-deformations/mechanics-linear-element_deactivation/element_deactivation_2D.png diff --git a/web/content/docs/benchmarks/small-deformations/element_deactivation_2D_3D_mesh.png b/web/content/docs/benchmarks/small-deformations/mechanics-linear-element_deactivation/element_deactivation_2D_3D_mesh.png similarity index 100% rename from web/content/docs/benchmarks/small-deformations/element_deactivation_2D_3D_mesh.png rename to web/content/docs/benchmarks/small-deformations/mechanics-linear-element_deactivation/element_deactivation_2D_3D_mesh.png diff --git a/web/content/docs/benchmarks/small-deformations/element_deactivation_3D.png b/web/content/docs/benchmarks/small-deformations/mechanics-linear-element_deactivation/element_deactivation_3D.png similarity index 100% rename from web/content/docs/benchmarks/small-deformations/element_deactivation_3D.png rename to web/content/docs/benchmarks/small-deformations/mechanics-linear-element_deactivation/element_deactivation_3D.png diff --git a/web/content/docs/benchmarks/small-deformations/mechanics-linear-element_deactivation.md b/web/content/docs/benchmarks/small-deformations/mechanics-linear-element_deactivation/index.md similarity index 91% rename from web/content/docs/benchmarks/small-deformations/mechanics-linear-element_deactivation.md rename to web/content/docs/benchmarks/small-deformations/mechanics-linear-element_deactivation/index.md index 09234961cc..6d17da499d 100644 --- a/web/content/docs/benchmarks/small-deformations/mechanics-linear-element_deactivation.md +++ b/web/content/docs/benchmarks/small-deformations/mechanics-linear-element_deactivation/index.md @@ -42,10 +42,10 @@ The input data set of the element deactivation approach is specified inside the ## Mesh -![2D and 3D meshes](../element_deactivation_2D_3D_mesh.png) +![2D and 3D meshes](element_deactivation_2D_3D_mesh.png) ## Results and evaluation -![2D results](../element_deactivation_2D.png) +![2D results](element_deactivation_2D.png) -![3D results:](../element_deactivation_3D.png) +![3D results:](element_deactivation_3D.png) diff --git a/web/content/docs/benchmarks/small-deformations/mechanics-linear-nonequilibrium-states.md b/web/content/docs/benchmarks/small-deformations/mechanics-linear-nonequilibrium-states/index.md similarity index 82% rename from web/content/docs/benchmarks/small-deformations/mechanics-linear-nonequilibrium-states.md rename to web/content/docs/benchmarks/small-deformations/mechanics-linear-nonequilibrium-states/index.md index b0f596aad3..5ebc949af4 100644 --- a/web/content/docs/benchmarks/small-deformations/mechanics-linear-nonequilibrium-states.md +++ b/web/content/docs/benchmarks/small-deformations/mechanics-linear-nonequilibrium-states/index.md @@ -16,7 +16,7 @@ weight = 111 ## Overview For detailed description see [technical note -PDF](../non-equilibrium_initial_states.pdf); here only excerpts from the +PDF](non-equilibrium_initial_states.pdf); here only excerpts from the document are shown. In certain conditions we want to drive changes in the process only by a change @@ -24,4 +24,4 @@ in the external driving forces and suppress the initial equilibration. Three test cases are showing a full simulation from equilibrium initial state, a restart with equilibrium, and calculation from non-equilibrium initial state. -![Non-equilibrium initial states](../non-equilibrium_initial_states.png) +![Non-equilibrium initial states](non-equilibrium_initial_states.png) diff --git a/web/content/docs/benchmarks/small-deformations/non-equilibrium_initial_states.pdf b/web/content/docs/benchmarks/small-deformations/mechanics-linear-nonequilibrium-states/non-equilibrium_initial_states.pdf similarity index 100% rename from web/content/docs/benchmarks/small-deformations/non-equilibrium_initial_states.pdf rename to web/content/docs/benchmarks/small-deformations/mechanics-linear-nonequilibrium-states/non-equilibrium_initial_states.pdf diff --git a/web/content/docs/benchmarks/small-deformations/non-equilibrium_initial_states.png b/web/content/docs/benchmarks/small-deformations/mechanics-linear-nonequilibrium-states/non-equilibrium_initial_states.png similarity index 100% rename from web/content/docs/benchmarks/small-deformations/non-equilibrium_initial_states.png rename to web/content/docs/benchmarks/small-deformations/mechanics-linear-nonequilibrium-states/non-equilibrium_initial_states.png diff --git a/web/content/docs/benchmarks/small-deformations/mechanics-lubby2-shear-traction.md b/web/content/docs/benchmarks/small-deformations/mechanics-lubby2-shear-traction/index.md similarity index 82% rename from web/content/docs/benchmarks/small-deformations/mechanics-lubby2-shear-traction.md rename to web/content/docs/benchmarks/small-deformations/mechanics-lubby2-shear-traction/index.md index b83440b7e9..b17dbb2eb2 100644 --- a/web/content/docs/benchmarks/small-deformations/mechanics-lubby2-shear-traction.md +++ b/web/content/docs/benchmarks/small-deformations/mechanics-lubby2-shear-traction/index.md @@ -17,14 +17,14 @@ weight = 112 We solve a non-linear small deformation problem on a cube with shear traction on the top boundary face. The 3D problem is setup identical to the corresponding 2D problem. -See [this PDF](../lubby2.pdf) for detailed problem description. +See [this PDF](lubby2.pdf) for detailed problem description. ## Results and evaluation Result showing the displacement field and distortion relative to the initial configuration: -{{< img src="../lubby2.png" >}} +{{< img src="lubby2.png" >}} Displacement of the top surface in the direction of the shear traction over time showing the elastic and viscous deformations (creep): -{{< img src="../lubby2_creep_over_time.png" >}} +{{< img src="lubby2_creep_over_time.png" >}} diff --git a/web/content/docs/benchmarks/small-deformations/lubby2.pdf b/web/content/docs/benchmarks/small-deformations/mechanics-lubby2-shear-traction/lubby2.pdf similarity index 100% rename from web/content/docs/benchmarks/small-deformations/lubby2.pdf rename to web/content/docs/benchmarks/small-deformations/mechanics-lubby2-shear-traction/lubby2.pdf diff --git a/web/content/docs/benchmarks/small-deformations/lubby2.png b/web/content/docs/benchmarks/small-deformations/mechanics-lubby2-shear-traction/lubby2.png similarity index 100% rename from web/content/docs/benchmarks/small-deformations/lubby2.png rename to web/content/docs/benchmarks/small-deformations/mechanics-lubby2-shear-traction/lubby2.png diff --git a/web/content/docs/benchmarks/small-deformations/lubby2_creep_over_time.png b/web/content/docs/benchmarks/small-deformations/mechanics-lubby2-shear-traction/lubby2_creep_over_time.png similarity index 100% rename from web/content/docs/benchmarks/small-deformations/lubby2_creep_over_time.png rename to web/content/docs/benchmarks/small-deformations/mechanics-lubby2-shear-traction/lubby2_creep_over_time.png diff --git a/web/content/docs/benchmarks/small-deformations/dp_test.png b/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-ehlers-specialcase-drucker-prager/dp_test.png similarity index 100% rename from web/content/docs/benchmarks/small-deformations/dp_test.png rename to web/content/docs/benchmarks/small-deformations/mechanics-plasticity-ehlers-specialcase-drucker-prager/dp_test.png diff --git a/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-ehlers-specialcase-drucker-prager.md b/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-ehlers-specialcase-drucker-prager/index.md similarity index 92% rename from web/content/docs/benchmarks/small-deformations/mechanics-plasticity-ehlers-specialcase-drucker-prager.md rename to web/content/docs/benchmarks/small-deformations/mechanics-plasticity-ehlers-specialcase-drucker-prager/index.md index 46f4fcdb68..c4337fdb90 100644 --- a/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-ehlers-specialcase-drucker-prager.md +++ b/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-ehlers-specialcase-drucker-prager/index.md @@ -21,8 +21,8 @@ The Ehlers material model can be reduced to the well-known criteria, such as the Triaxial compression test: -{{< img src="../ss_load.png" >}} +{{< img src="ss_load.png" >}} Variations of the stress states and the plastic volumetric strain with a monotonic loading process: -{{< img src="../dp_test.png" >}} +{{< img src="dp_test.png" >}} diff --git a/web/content/docs/benchmarks/small-deformations/ss_load.png b/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-ehlers-specialcase-drucker-prager/ss_load.png similarity index 100% rename from web/content/docs/benchmarks/small-deformations/ss_load.png rename to web/content/docs/benchmarks/small-deformations/mechanics-plasticity-ehlers-specialcase-drucker-prager/ss_load.png diff --git a/web/content/docs/benchmarks/small-deformations/Plasticity.pdf b/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-single-surface/Plasticity.pdf similarity index 100% rename from web/content/docs/benchmarks/small-deformations/Plasticity.pdf rename to web/content/docs/benchmarks/small-deformations/mechanics-plasticity-single-surface/Plasticity.pdf diff --git a/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-single-surface.md b/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-single-surface/index.md similarity index 80% rename from web/content/docs/benchmarks/small-deformations/mechanics-plasticity-single-surface.md rename to web/content/docs/benchmarks/small-deformations/mechanics-plasticity-single-surface/index.md index 76f806fb4d..83ecd9a511 100644 --- a/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-single-surface.md +++ b/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-single-surface/index.md @@ -18,14 +18,14 @@ title = "Ehlers; Single-surface yield function" We use a seven-parametric yield function for geomaterials to describe the plastic response. The traixial compression test is setup. -See [this PDF](../Plasticity.pdf) for detailed problem description. +See [this PDF](Plasticity.pdf) for detailed problem description. ## Results and evaluation Triaxial compression test: -{{< img src="../ss_load.png" >}} +{{< img src="ss_load.png" >}} Variations of the stress states and the plastic volumetric strain with a monotonic loading process: -{{< img src="../plasticity_ss.png" >}} +{{< img src="plasticity_ss.png" >}} diff --git a/web/content/docs/benchmarks/small-deformations/plasticity_ss.png b/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-single-surface/plasticity_ss.png similarity index 100% rename from web/content/docs/benchmarks/small-deformations/plasticity_ss.png rename to web/content/docs/benchmarks/small-deformations/mechanics-plasticity-single-surface/plasticity_ss.png diff --git a/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-single-surface/ss_load.png b/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-single-surface/ss_load.png new file mode 120000 index 0000000000..848945c294 --- /dev/null +++ b/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-single-surface/ss_load.png @@ -0,0 +1 @@ +../mechanics-plasticity-ehlers-specialcase-drucker-prager/ss_load.png \ No newline at end of file diff --git a/web/content/docs/benchmarks/small-deformations/mechanics-slope-stability.md b/web/content/docs/benchmarks/small-deformations/mechanics-slope-stability/index.md similarity index 83% rename from web/content/docs/benchmarks/small-deformations/mechanics-slope-stability.md rename to web/content/docs/benchmarks/small-deformations/mechanics-slope-stability/index.md index 852357f671..6313c98c97 100644 --- a/web/content/docs/benchmarks/small-deformations/mechanics-slope-stability.md +++ b/web/content/docs/benchmarks/small-deformations/mechanics-slope-stability/index.md @@ -17,4 +17,4 @@ title = "Strength reduction for slope stability" ## Problem description We perform a strength reduction to determine the factor of safety of a slope. -See [this PDF](../slope_stability.pdf) for detailed problem description. +See [this PDF](slope_stability.pdf) for detailed problem description. diff --git a/web/content/docs/benchmarks/small-deformations/slope_stability.pdf b/web/content/docs/benchmarks/small-deformations/mechanics-slope-stability/slope_stability.pdf similarity index 100% rename from web/content/docs/benchmarks/small-deformations/slope_stability.pdf rename to web/content/docs/benchmarks/small-deformations/mechanics-slope-stability/slope_stability.pdf diff --git a/web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC.md b/web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC/index.md similarity index 74% rename from web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC.md rename to web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC/index.md index 8e67734af1..3ba065bb24 100644 --- a/web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC.md +++ b/web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC/index.md @@ -13,24 +13,24 @@ weight = 117 ## Problem description Five different benchmarks are reported in which pressure boundary conditions are tested: an axisymmetric elastic cylinder, a plain strain elastic cylinder, an axisymmetric elastic sphere, a tri-dimensional elastic sphere and an axisymmetric elasto-plastic sphere. -See [this PDF](../pressure_bc.pdf) for detailed problem description. +See [this PDF](pressure_bc.pdf) for detailed problem description. ## Results and evaluation Plain strain elastic cylinder comparison between numerical and analytical results: -{{< img src="../pipe_plane_strain.png" >}} +{{< img src="pipe_plane_strain.png" >}} Axisymmetric elastic cylinder comparison between numerical and analytical results. -{{< img src="../pipe_axisymmetric.png" >}} +{{< img src="pipe_axisymmetric.png" >}} Axisymmetric elastic sphere comparison between numerical and analytical results: -{{< img src="../sphere_axisymmetric.png" >}} +{{< img src="sphere_axisymmetric.png" >}} Tri-dimensional elastic sphere comparison between numerical and analytical results: -{{< img src="../sphere_3d.png" >}} +{{< img src="sphere_3d.png" >}} Axisymmetric plastic sphere comparison between numerical and analytical results: -{{< img src="../sphere_axisymmetric_pl.png" >}} +{{< img src="sphere_axisymmetric_pl.png" >}} Axisymmetric plastic sphere residuals of stress: -{{< img src="../sphere_axisymmetric_pl_residual_stress.png" >}} +{{< img src="sphere_axisymmetric_pl_residual_stress.png" >}} diff --git a/web/content/docs/benchmarks/small-deformations/pressure_bc/pipe_axisymmetric.png b/web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC/pipe_axisymmetric.png similarity index 100% rename from web/content/docs/benchmarks/small-deformations/pressure_bc/pipe_axisymmetric.png rename to web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC/pipe_axisymmetric.png diff --git a/web/content/docs/benchmarks/small-deformations/pressure_bc/pipe_plane_strain.png b/web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC/pipe_plane_strain.png similarity index 100% rename from web/content/docs/benchmarks/small-deformations/pressure_bc/pipe_plane_strain.png rename to web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC/pipe_plane_strain.png diff --git a/web/content/docs/benchmarks/small-deformations/pressure_bc/pressure_bc.pdf b/web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC/pressure_bc.pdf similarity index 100% rename from web/content/docs/benchmarks/small-deformations/pressure_bc/pressure_bc.pdf rename to web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC/pressure_bc.pdf diff --git a/web/content/docs/benchmarks/small-deformations/pressure_bc/sphere_3d.png b/web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC/sphere_3d.png similarity index 100% rename from web/content/docs/benchmarks/small-deformations/pressure_bc/sphere_3d.png rename to web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC/sphere_3d.png diff --git a/web/content/docs/benchmarks/small-deformations/pressure_bc/sphere_axisymmetric.png b/web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC/sphere_axisymmetric.png similarity index 100% rename from web/content/docs/benchmarks/small-deformations/pressure_bc/sphere_axisymmetric.png rename to web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC/sphere_axisymmetric.png diff --git a/web/content/docs/benchmarks/small-deformations/pressure_bc/sphere_axisymmetric_pl.png b/web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC/sphere_axisymmetric_pl.png similarity index 100% rename from web/content/docs/benchmarks/small-deformations/pressure_bc/sphere_axisymmetric_pl.png rename to web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC/sphere_axisymmetric_pl.png diff --git a/web/content/docs/benchmarks/small-deformations/pressure_bc/sphere_axisymmetric_pl_residual_stress.png b/web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC/sphere_axisymmetric_pl_residual_stress.png similarity index 100% rename from web/content/docs/benchmarks/small-deformations/pressure_bc/sphere_axisymmetric_pl_residual_stress.png rename to web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC/sphere_axisymmetric_pl_residual_stress.png diff --git a/web/content/docs/benchmarks/stokes-flow/Fig1_SchematicDiagram.png b/web/content/docs/benchmarks/stokes-flow/parallel-plate-flow/Fig1_SchematicDiagram.png similarity index 100% rename from web/content/docs/benchmarks/stokes-flow/Fig1_SchematicDiagram.png rename to web/content/docs/benchmarks/stokes-flow/parallel-plate-flow/Fig1_SchematicDiagram.png diff --git a/web/content/docs/benchmarks/stokes-flow/Fig2_SimulationResults.png b/web/content/docs/benchmarks/stokes-flow/parallel-plate-flow/Fig2_SimulationResults.png similarity index 100% rename from web/content/docs/benchmarks/stokes-flow/Fig2_SimulationResults.png rename to web/content/docs/benchmarks/stokes-flow/parallel-plate-flow/Fig2_SimulationResults.png diff --git a/web/content/docs/benchmarks/stokes-flow/parallel-plate-flow.md b/web/content/docs/benchmarks/stokes-flow/parallel-plate-flow/index.md similarity index 86% rename from web/content/docs/benchmarks/stokes-flow/parallel-plate-flow.md rename to web/content/docs/benchmarks/stokes-flow/parallel-plate-flow/index.md index eb5f011022..75e3e30ee8 100644 --- a/web/content/docs/benchmarks/stokes-flow/parallel-plate-flow.md +++ b/web/content/docs/benchmarks/stokes-flow/parallel-plate-flow/index.md @@ -17,7 +17,7 @@ title = "Fluid flow through an open parallel-plate channel" This benchmark deals with fluid flow through an open parallel-plate channel. The figure below gives a pictorial view of the considered scenario. -{{< img src="../Fig1_SchematicDiagram.png" title="Schematic diagram of the parallel-plate flow channel in two-dimensional space.">}} +{{< img src="Fig1_SchematicDiagram.png" title="Schematic diagram of the parallel-plate flow channel in two-dimensional space.">}} The model parameters used in the simulation are summarized in the table below. @@ -47,7 +47,7 @@ $$ v \left(y\right) = \frac{1}{2\mu} \frac{P_{\mathrm{in}} - P_{\mathrm{out}}}{l} y \left( b - y\right). \end{equation}$$ -{{< img src="../Fig2_SimulationResults.png" title="Simulation results: (a) Hydrualic pressure profile through the parallel-plate flow channel; (b) Transverse velocity component profile over the cross-section of the plane flow channel.">}} +{{< img src="Fig2_SimulationResults.png" title="Simulation results: (a) Hydrualic pressure profile through the parallel-plate flow channel; (b) Transverse velocity component profile over the cross-section of the plane flow channel.">}} ## References diff --git a/web/content/docs/benchmarks/thermal-two-phase-flow/heat-pipe-problem.pdf b/web/content/docs/benchmarks/thermal-two-phase-flow/heat-pipe/heat-pipe-problem.pdf similarity index 100% rename from web/content/docs/benchmarks/thermal-two-phase-flow/heat-pipe-problem.pdf rename to web/content/docs/benchmarks/thermal-two-phase-flow/heat-pipe/heat-pipe-problem.pdf diff --git a/web/content/docs/benchmarks/thermal-two-phase-flow/heat-pipe.md b/web/content/docs/benchmarks/thermal-two-phase-flow/heat-pipe/index.md similarity index 85% rename from web/content/docs/benchmarks/thermal-two-phase-flow/heat-pipe.md rename to web/content/docs/benchmarks/thermal-two-phase-flow/heat-pipe/index.md index dd26136be4..047d220a48 100644 --- a/web/content/docs/benchmarks/thermal-two-phase-flow/heat-pipe.md +++ b/web/content/docs/benchmarks/thermal-two-phase-flow/heat-pipe/index.md @@ -19,4 +19,4 @@ This benchmark is dedicated to simulating the non-isothermal two-phase flow in p ## Problem setting -See [this PDF](../heat-pipe-problem.pdf) for the detailed problem setting. +See [this PDF](heat-pipe-problem.pdf) for the detailed problem setting. diff --git a/web/content/docs/benchmarks/thermo-hydro-mechanics/images/errordispl_vs_t.png b/web/content/docs/benchmarks/thermo-hydro-mechanics/consolidation_pointheatsource/errordispl_vs_t.png similarity index 100% rename from web/content/docs/benchmarks/thermo-hydro-mechanics/images/errordispl_vs_t.png rename to web/content/docs/benchmarks/thermo-hydro-mechanics/consolidation_pointheatsource/errordispl_vs_t.png diff --git a/web/content/docs/benchmarks/thermo-hydro-mechanics/images/errorpT_vs_t.png b/web/content/docs/benchmarks/thermo-hydro-mechanics/consolidation_pointheatsource/errorpT_vs_t.png similarity index 100% rename from web/content/docs/benchmarks/thermo-hydro-mechanics/images/errorpT_vs_t.png rename to web/content/docs/benchmarks/thermo-hydro-mechanics/consolidation_pointheatsource/errorpT_vs_t.png diff --git a/web/content/docs/benchmarks/thermo-hydro-mechanics/consolidation_pointheatsource.md b/web/content/docs/benchmarks/thermo-hydro-mechanics/consolidation_pointheatsource/index.md similarity index 96% rename from web/content/docs/benchmarks/thermo-hydro-mechanics/consolidation_pointheatsource.md rename to web/content/docs/benchmarks/thermo-hydro-mechanics/consolidation_pointheatsource/index.md index 146a3f0eb8..b47a437077 100644 --- a/web/content/docs/benchmarks/thermo-hydro-mechanics/consolidation_pointheatsource.md +++ b/web/content/docs/benchmarks/thermo-hydro-mechanics/consolidation_pointheatsource/index.md @@ -92,19 +92,19 @@ For the stress components the corrected expressions can be found in the work of The analytical expressions (12-16) together with the numerical model can now be evaluated at different points as a function of time or for a given time as a function of their spatial coordinates. The results below were taken from the benchmark published in Chaudhry et al. (2019) and might slightly differ from the benchmark in the OGS6 repo. -{{< img src="../images/resp_vs_t_square.png" >}} +{{< img src="resp_vs_t_square.png" >}} In the pictures above, the analytical and numerical results for temperature ($T$), pressure ($p$), displacement ($u_i$) and stress ($\sigma_{ij}$) are plotted as function of time ($t$) at point $P=(1.3,0.682,0.0)$ and along the radial coordinate ($r$ ) at time $t=5\cdot 10^5$ (below). -{{< img src="../images/resp_vs_x_square.png" >}} +{{< img src="resp_vs_x_square.png" >}} (Figures were taken from Chaudhry et al. (2019).) The absolute errors between OGS6 and the analytical solution for temperature, pressure, and displacement are depicted below. For all three response variables, one observes that the error reaches its maximum around the same time when also the slope of the response variable is maximal. -{{< img src="../images/errorpT_vs_t.png" >}} +{{< img src="errorpT_vs_t.png" >}} -{{< img src="../images/errordispl_vs_t.png" >}} +{{< img src="errordispl_vs_t.png" >}} ## References diff --git a/web/content/docs/benchmarks/thermo-hydro-mechanics/images/resp_vs_t_square.png b/web/content/docs/benchmarks/thermo-hydro-mechanics/consolidation_pointheatsource/resp_vs_t_square.png similarity index 100% rename from web/content/docs/benchmarks/thermo-hydro-mechanics/images/resp_vs_t_square.png rename to web/content/docs/benchmarks/thermo-hydro-mechanics/consolidation_pointheatsource/resp_vs_t_square.png diff --git a/web/content/docs/benchmarks/thermo-hydro-mechanics/images/resp_vs_x_square.png b/web/content/docs/benchmarks/thermo-hydro-mechanics/consolidation_pointheatsource/resp_vs_x_square.png similarity index 100% rename from web/content/docs/benchmarks/thermo-hydro-mechanics/images/resp_vs_x_square.png rename to web/content/docs/benchmarks/thermo-hydro-mechanics/consolidation_pointheatsource/resp_vs_x_square.png diff --git a/web/content/docs/benchmarks/thermo-mechanical-phase-field/thermo-mechanical-phase-field.md b/web/content/docs/benchmarks/thermo-mechanical-phase-field/thermo-mechanical-phase-field/index.md similarity index 94% rename from web/content/docs/benchmarks/thermo-mechanical-phase-field/thermo-mechanical-phase-field.md rename to web/content/docs/benchmarks/thermo-mechanical-phase-field/thermo-mechanical-phase-field/index.md index b681068a5a..cf9e35c57f 100644 --- a/web/content/docs/benchmarks/thermo-mechanical-phase-field/thermo-mechanical-phase-field.md +++ b/web/content/docs/benchmarks/thermo-mechanical-phase-field/thermo-mechanical-phase-field/index.md @@ -24,9 +24,9 @@ The thermal expansion test was implemented by imposing a temperature increase to Results show Phase-Field evolution in the thermo-mechanical case can follow the mechanical case, and both solutions correspond to the analytical solution: -{{< img src="../uncon_com_bc.png" >}} -{{< img src="../therm_exp_bc.png" >}} -{{< img src="../t_pf.png" >}} +{{< img src="uncon_com_bc.png" >}} +{{< img src="therm_exp_bc.png" >}} +{{< img src="t_pf.png" >}} The analytical solution is: $$d = \dfrac{G\textrm{c}}{G\textrm{c}+4\epsilon \psi_\textrm{e}^+}$$ where due to negative (elastic) volume strains only the deviatoric energy drives the phase field. diff --git a/web/content/docs/benchmarks/thermo-mechanical-phase-field/t_pf.png b/web/content/docs/benchmarks/thermo-mechanical-phase-field/thermo-mechanical-phase-field/t_pf.png similarity index 100% rename from web/content/docs/benchmarks/thermo-mechanical-phase-field/t_pf.png rename to web/content/docs/benchmarks/thermo-mechanical-phase-field/thermo-mechanical-phase-field/t_pf.png diff --git a/web/content/docs/benchmarks/thermo-mechanical-phase-field/therm_exp_bc.png b/web/content/docs/benchmarks/thermo-mechanical-phase-field/thermo-mechanical-phase-field/therm_exp_bc.png similarity index 100% rename from web/content/docs/benchmarks/thermo-mechanical-phase-field/therm_exp_bc.png rename to web/content/docs/benchmarks/thermo-mechanical-phase-field/thermo-mechanical-phase-field/therm_exp_bc.png diff --git a/web/content/docs/benchmarks/thermo-mechanical-phase-field/uncon_com_bc.png b/web/content/docs/benchmarks/thermo-mechanical-phase-field/thermo-mechanical-phase-field/uncon_com_bc.png similarity index 100% rename from web/content/docs/benchmarks/thermo-mechanical-phase-field/uncon_com_bc.png rename to web/content/docs/benchmarks/thermo-mechanical-phase-field/thermo-mechanical-phase-field/uncon_com_bc.png diff --git a/web/content/docs/benchmarks/thermo-mechanics/thermomechanics.md b/web/content/docs/benchmarks/thermo-mechanics/thermomechanics/index.md similarity index 93% rename from web/content/docs/benchmarks/thermo-mechanics/thermomechanics.md rename to web/content/docs/benchmarks/thermo-mechanics/thermomechanics/index.md index f40ab2db05..08f1ac3673 100644 --- a/web/content/docs/benchmarks/thermo-mechanics/thermomechanics.md +++ b/web/content/docs/benchmarks/thermo-mechanics/thermomechanics/index.md @@ -25,8 +25,8 @@ al. \cite Kolditz2012 for detailed problem description. Result showing temperature and stresses development with time in the centre node of the model: -{{< img src="../temperature.png" >}} -{{< img src="../stress.png" >}} +{{< img src="temperature.png" >}} +{{< img src="stress.png" >}} The analytical solution of stresses after heating is: $$\begin{equation} diff --git a/web/content/docs/benchmarks/thermo-mechanics/stress.png b/web/content/docs/benchmarks/thermo-mechanics/thermomechanics/stress.png similarity index 100% rename from web/content/docs/benchmarks/thermo-mechanics/stress.png rename to web/content/docs/benchmarks/thermo-mechanics/thermomechanics/stress.png diff --git a/web/content/docs/benchmarks/thermo-mechanics/temperature.png b/web/content/docs/benchmarks/thermo-mechanics/thermomechanics/temperature.png similarity index 100% rename from web/content/docs/benchmarks/thermo-mechanics/temperature.png rename to web/content/docs/benchmarks/thermo-mechanics/thermomechanics/temperature.png diff --git a/web/content/docs/benchmarks/thermo-richards-mechanics/CTF1_results_S.jpg b/web/content/docs/benchmarks/thermo-richards-mechanics/CTF1/CTF1_results_S.jpg similarity index 100% rename from web/content/docs/benchmarks/thermo-richards-mechanics/CTF1_results_S.jpg rename to web/content/docs/benchmarks/thermo-richards-mechanics/CTF1/CTF1_results_S.jpg diff --git a/web/content/docs/benchmarks/thermo-richards-mechanics/CTF1_results_T.jpg b/web/content/docs/benchmarks/thermo-richards-mechanics/CTF1/CTF1_results_T.jpg similarity index 100% rename from web/content/docs/benchmarks/thermo-richards-mechanics/CTF1_results_T.jpg rename to web/content/docs/benchmarks/thermo-richards-mechanics/CTF1/CTF1_results_T.jpg diff --git a/web/content/docs/benchmarks/thermo-richards-mechanics/CTF1.md b/web/content/docs/benchmarks/thermo-richards-mechanics/CTF1/index.md similarity index 91% rename from web/content/docs/benchmarks/thermo-richards-mechanics/CTF1.md rename to web/content/docs/benchmarks/thermo-richards-mechanics/CTF1/index.md index cd85497d15..921e43af4d 100644 --- a/web/content/docs/benchmarks/thermo-richards-mechanics/CTF1.md +++ b/web/content/docs/benchmarks/thermo-richards-mechanics/CTF1/index.md @@ -26,8 +26,8 @@ specific heat capacity of solid phase has already taken account of The following figures compare the results of this test against the results presented in [[2]](#2): -drawing -drawing +drawing +drawing ## References [1] diff --git a/web/content/docs/benchmarks/thermo-richards-mechanics/decovalex_2023_c.png b/web/content/docs/benchmarks/thermo-richards-mechanics/DECOVALEX2023-TaskC/decovalex_2023_c.png similarity index 100% rename from web/content/docs/benchmarks/thermo-richards-mechanics/decovalex_2023_c.png rename to web/content/docs/benchmarks/thermo-richards-mechanics/DECOVALEX2023-TaskC/decovalex_2023_c.png diff --git a/web/content/docs/benchmarks/thermo-richards-mechanics/decovalex_2023_c_S_t.png b/web/content/docs/benchmarks/thermo-richards-mechanics/DECOVALEX2023-TaskC/decovalex_2023_c_S_t.png similarity index 100% rename from web/content/docs/benchmarks/thermo-richards-mechanics/decovalex_2023_c_S_t.png rename to web/content/docs/benchmarks/thermo-richards-mechanics/DECOVALEX2023-TaskC/decovalex_2023_c_S_t.png diff --git a/web/content/docs/benchmarks/thermo-richards-mechanics/decovalex_2023_c_T_t.png b/web/content/docs/benchmarks/thermo-richards-mechanics/DECOVALEX2023-TaskC/decovalex_2023_c_T_t.png similarity index 100% rename from web/content/docs/benchmarks/thermo-richards-mechanics/decovalex_2023_c_T_t.png rename to web/content/docs/benchmarks/thermo-richards-mechanics/DECOVALEX2023-TaskC/decovalex_2023_c_T_t.png diff --git a/web/content/docs/benchmarks/thermo-richards-mechanics/DECOVALEX2023-TaskC.md b/web/content/docs/benchmarks/thermo-richards-mechanics/DECOVALEX2023-TaskC/index.md similarity index 91% rename from web/content/docs/benchmarks/thermo-richards-mechanics/DECOVALEX2023-TaskC.md rename to web/content/docs/benchmarks/thermo-richards-mechanics/DECOVALEX2023-TaskC/index.md index bd9a001078..251df7ef2a 100644 --- a/web/content/docs/benchmarks/thermo-richards-mechanics/DECOVALEX2023-TaskC.md +++ b/web/content/docs/benchmarks/thermo-richards-mechanics/DECOVALEX2023-TaskC/index.md @@ -35,13 +35,13 @@ The test is used to mainly verify the implementation of water vapour diffusion m Task C. The following figure shows the distribution of temperature in the domain, water saturation in the vicinity of the heater, and displacement magnitude in the domain after nearly 3 years' heating: -{{< img src="../decovalex_2023_c.png" >}} +{{< img src="decovalex_2023_c.png" >}} The following two figures show the temporal variations of temperature and water saturation, respectively, at a node near the heater: -drawing -drawing +drawing +drawing As shown the water saturation variation curve, the de-saturation - re-saturation process is well captured by the numerical simulation. diff --git a/web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-liakopoulos.md b/web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-liakopoulos/index.md similarity index 95% rename from web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-liakopoulos.md rename to web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-liakopoulos/index.md index 01d306ce99..acc84aa4f5 100644 --- a/web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-liakopoulos.md +++ b/web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-liakopoulos/index.md @@ -19,4 +19,4 @@ One benchmark -- Liakopoulos experiment is presented here. The benchmark is appl ## Results and evaluation -See [this PDF](../main.pdf). +See [this PDF](main.pdf). diff --git a/web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-liakopoulos/main.pdf b/web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-liakopoulos/main.pdf new file mode 120000 index 0000000000..6ce042b9c7 --- /dev/null +++ b/web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-liakopoulos/main.pdf @@ -0,0 +1 @@ +../two-phase-flow-pp-mcwhorter/main.pdf \ No newline at end of file diff --git a/web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-mcwhorter.md b/web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-mcwhorter/index.md similarity index 96% rename from web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-mcwhorter.md rename to web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-mcwhorter/index.md index 8805ac9059..116699f3fd 100644 --- a/web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-mcwhorter.md +++ b/web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-mcwhorter/index.md @@ -19,4 +19,4 @@ One benchmark -- McWhorter problem is presented here which is dedicated to simul ## Results and evaluation -See [this PDF](../main.pdf). +See [this PDF](main.pdf). diff --git a/web/content/docs/benchmarks/two-phase-flow-pp-form/main.pdf b/web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-mcwhorter/main.pdf similarity index 100% rename from web/content/docs/benchmarks/two-phase-flow-pp-form/main.pdf rename to web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-mcwhorter/main.pdf diff --git a/web/content/docs/benchmarks/two-phase-flow/MoMaS.pdf b/web/content/docs/benchmarks/two-phase-flow/momas/MoMaS.pdf similarity index 100% rename from web/content/docs/benchmarks/two-phase-flow/MoMaS.pdf rename to web/content/docs/benchmarks/two-phase-flow/momas/MoMaS.pdf diff --git a/web/content/docs/benchmarks/two-phase-flow/momas.md b/web/content/docs/benchmarks/two-phase-flow/momas/index.md similarity index 94% rename from web/content/docs/benchmarks/two-phase-flow/momas.md rename to web/content/docs/benchmarks/two-phase-flow/momas/index.md index 41f7364860..f69f429d95 100644 --- a/web/content/docs/benchmarks/two-phase-flow/momas.md +++ b/web/content/docs/benchmarks/two-phase-flow/momas/index.md @@ -19,4 +19,4 @@ This benchmark is dedicated to simulate the two-phase two-component flow in poro ## Results and evaluation -See [this PDF](../MoMaS.pdf). +See [this PDF](MoMaS.pdf). -- GitLab From 137f48d3097d1750f6488f536d4b41686235031f Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Tue, 29 Mar 2022 13:26:18 +0200 Subject: [PATCH 13/17] [web] Converted to page bundle: devguide. --- .../{compiler-cache.md => compiler-cache/index.md} | 0 .../index.md} | 0 .../index.md} | 0 .../index.md} | 0 .../{offline-build.md => offline-build/index.md} | 0 .../docs/devguide/advanced/{wsl.md => wsl/index.md} | 0 .../{code-format.md => code-format/index.md} | 0 .../{ => code-reviews}/checkout-branch.png | Bin .../{code-reviews.md => code-reviews/index.md} | 2 +- .../GL_CI_screenshot.png | Bin .../index.md} | 2 +- .../{ => development-ides}/clion.png | Bin .../{ => development-ides}/codeblocks.png | Bin .../{ => development-ides}/eclipse.png | Bin .../{ => development-ides}/gdb.png | Bin .../index.md} | 10 +++++----- .../{ => development-ides}/netbeans.png | Bin .../{ => gitlab}/gitlab-login.png | Bin .../{gitlab.md => gitlab/index.md} | 2 +- .../{introduction.md => introduction/index.md} | 0 .../{setup-fork.md => setup-fork/index.md} | 0 .../{web-docs.md => web-docs/index.md} | 0 .../environments/{docker.md => docker/index.md} | 0 .../index.md} | 0 .../{singularity.md => singularity/index.md} | 0 .../{working-on-eve.md => working-on-eve/index.md} | 0 .../index.md} | 0 .../getting-started/{build.md => build/index.md} | 0 .../{ => get-the-source-code}/git-url.png | Bin .../index.md} | 4 ++-- .../{ => get-the-source-code}/zip-download.png | Bin .../{introduction.md => introduction/index.md} | 0 .../{ => prerequisites}/git-installer-win.png | Bin .../{prerequisites.md => prerequisites/index.md} | 2 +- .../index.md} | 0 .../docs/devguide/packages/{cpm.md => cpm/index.md} | 0 .../packages/{mfront.md => mfront/index.md} | 0 .../packages/{python-env.md => python-env/index.md} | 0 .../index.md} | 0 .../testing/{ => gitlab-ci}/GitLab-Pipeline.png | Bin .../testing/{gitlab-ci.md => gitlab-ci/index.md} | 2 +- .../testing/{test-data.md => test-data/index.md} | 0 .../{unit-testing.md => unit-testing/index.md} | 0 .../index.md} | 0 .../troubleshooting/{build.md => build/index.md} | 0 .../troubleshooting/{cmake.md => cmake/index.md} | 0 .../troubleshooting/{conan.md => conan/index.md} | 0 .../{get-support.md => get-support/index.md} | 0 .../troubleshooting/{git.md => git/index.md} | 0 .../troubleshooting/{run.md => run/index.md} | 0 50 files changed, 12 insertions(+), 12 deletions(-) rename web/content/docs/devguide/advanced/{compiler-cache.md => compiler-cache/index.md} (100%) rename web/content/docs/devguide/advanced/{configuration-options.md => configuration-options/index.md} (100%) rename web/content/docs/devguide/advanced/{gitlab-migration.md => gitlab-migration/index.md} (100%) rename web/content/docs/devguide/advanced/{log-and-debug-output.md => log-and-debug-output/index.md} (100%) rename web/content/docs/devguide/advanced/{offline-build.md => offline-build/index.md} (100%) rename web/content/docs/devguide/advanced/{wsl.md => wsl/index.md} (100%) rename web/content/docs/devguide/development-workflows/{code-format.md => code-format/index.md} (100%) rename web/content/docs/devguide/development-workflows/{ => code-reviews}/checkout-branch.png (100%) rename web/content/docs/devguide/development-workflows/{code-reviews.md => code-reviews/index.md} (98%) rename web/content/docs/devguide/development-workflows/{ => continuous-integration}/GL_CI_screenshot.png (100%) rename web/content/docs/devguide/development-workflows/{continuous-integration.md => continuous-integration/index.md} (96%) rename web/content/docs/devguide/development-workflows/{ => development-ides}/clion.png (100%) rename web/content/docs/devguide/development-workflows/{ => development-ides}/codeblocks.png (100%) rename web/content/docs/devguide/development-workflows/{ => development-ides}/eclipse.png (100%) rename web/content/docs/devguide/development-workflows/{ => development-ides}/gdb.png (100%) rename web/content/docs/devguide/development-workflows/{development-ides.md => development-ides/index.md} (95%) rename web/content/docs/devguide/development-workflows/{ => development-ides}/netbeans.png (100%) rename web/content/docs/devguide/development-workflows/{ => gitlab}/gitlab-login.png (100%) rename web/content/docs/devguide/development-workflows/{gitlab.md => gitlab/index.md} (96%) rename web/content/docs/devguide/development-workflows/{introduction.md => introduction/index.md} (100%) rename web/content/docs/devguide/development-workflows/{setup-fork.md => setup-fork/index.md} (100%) rename web/content/docs/devguide/development-workflows/{web-docs.md => web-docs/index.md} (100%) rename web/content/docs/devguide/environments/{docker.md => docker/index.md} (100%) rename web/content/docs/devguide/environments/{redistributable-builds.md => redistributable-builds/index.md} (100%) rename web/content/docs/devguide/environments/{singularity.md => singularity/index.md} (100%) rename web/content/docs/devguide/environments/{working-on-eve.md => working-on-eve/index.md} (100%) rename web/content/docs/devguide/getting-started/{build-configuration.md => build-configuration/index.md} (100%) rename web/content/docs/devguide/getting-started/{build.md => build/index.md} (100%) rename web/content/docs/devguide/getting-started/{ => get-the-source-code}/git-url.png (100%) rename web/content/docs/devguide/getting-started/{get-the-source-code.md => get-the-source-code/index.md} (95%) rename web/content/docs/devguide/getting-started/{ => get-the-source-code}/zip-download.png (100%) rename web/content/docs/devguide/getting-started/{introduction.md => introduction/index.md} (100%) rename web/content/docs/devguide/getting-started/{ => prerequisites}/git-installer-win.png (100%) rename web/content/docs/devguide/getting-started/{prerequisites.md => prerequisites/index.md} (99%) rename web/content/docs/devguide/packages/{conan-package-manager.md => conan-package-manager/index.md} (100%) rename web/content/docs/devguide/packages/{cpm.md => cpm/index.md} (100%) rename web/content/docs/devguide/packages/{mfront.md => mfront/index.md} (100%) rename web/content/docs/devguide/packages/{python-env.md => python-env/index.md} (100%) rename web/content/docs/devguide/procedures/{publish-a-release.md => publish-a-release/index.md} (100%) rename web/content/docs/devguide/testing/{ => gitlab-ci}/GitLab-Pipeline.png (100%) rename web/content/docs/devguide/testing/{gitlab-ci.md => gitlab-ci/index.md} (97%) rename web/content/docs/devguide/testing/{test-data.md => test-data/index.md} (100%) rename web/content/docs/devguide/testing/{unit-testing.md => unit-testing/index.md} (100%) rename web/content/docs/devguide/testing/{workflow-testing.md => workflow-testing/index.md} (100%) rename web/content/docs/devguide/troubleshooting/{build.md => build/index.md} (100%) rename web/content/docs/devguide/troubleshooting/{cmake.md => cmake/index.md} (100%) rename web/content/docs/devguide/troubleshooting/{conan.md => conan/index.md} (100%) rename web/content/docs/devguide/troubleshooting/{get-support.md => get-support/index.md} (100%) rename web/content/docs/devguide/troubleshooting/{git.md => git/index.md} (100%) rename web/content/docs/devguide/troubleshooting/{run.md => run/index.md} (100%) diff --git a/web/content/docs/devguide/advanced/compiler-cache.md b/web/content/docs/devguide/advanced/compiler-cache/index.md similarity index 100% rename from web/content/docs/devguide/advanced/compiler-cache.md rename to web/content/docs/devguide/advanced/compiler-cache/index.md diff --git a/web/content/docs/devguide/advanced/configuration-options.md b/web/content/docs/devguide/advanced/configuration-options/index.md similarity index 100% rename from web/content/docs/devguide/advanced/configuration-options.md rename to web/content/docs/devguide/advanced/configuration-options/index.md diff --git a/web/content/docs/devguide/advanced/gitlab-migration.md b/web/content/docs/devguide/advanced/gitlab-migration/index.md similarity index 100% rename from web/content/docs/devguide/advanced/gitlab-migration.md rename to web/content/docs/devguide/advanced/gitlab-migration/index.md diff --git a/web/content/docs/devguide/advanced/log-and-debug-output.md b/web/content/docs/devguide/advanced/log-and-debug-output/index.md similarity index 100% rename from web/content/docs/devguide/advanced/log-and-debug-output.md rename to web/content/docs/devguide/advanced/log-and-debug-output/index.md diff --git a/web/content/docs/devguide/advanced/offline-build.md b/web/content/docs/devguide/advanced/offline-build/index.md similarity index 100% rename from web/content/docs/devguide/advanced/offline-build.md rename to web/content/docs/devguide/advanced/offline-build/index.md diff --git a/web/content/docs/devguide/advanced/wsl.md b/web/content/docs/devguide/advanced/wsl/index.md similarity index 100% rename from web/content/docs/devguide/advanced/wsl.md rename to web/content/docs/devguide/advanced/wsl/index.md diff --git a/web/content/docs/devguide/development-workflows/code-format.md b/web/content/docs/devguide/development-workflows/code-format/index.md similarity index 100% rename from web/content/docs/devguide/development-workflows/code-format.md rename to web/content/docs/devguide/development-workflows/code-format/index.md diff --git a/web/content/docs/devguide/development-workflows/checkout-branch.png b/web/content/docs/devguide/development-workflows/code-reviews/checkout-branch.png similarity index 100% rename from web/content/docs/devguide/development-workflows/checkout-branch.png rename to web/content/docs/devguide/development-workflows/code-reviews/checkout-branch.png diff --git a/web/content/docs/devguide/development-workflows/code-reviews.md b/web/content/docs/devguide/development-workflows/code-reviews/index.md similarity index 98% rename from web/content/docs/devguide/development-workflows/code-reviews.md rename to web/content/docs/devguide/development-workflows/code-reviews/index.md index dea98fc06c..27006d88b9 100644 --- a/web/content/docs/devguide/development-workflows/code-reviews.md +++ b/web/content/docs/devguide/development-workflows/code-reviews/index.md @@ -35,4 +35,4 @@ If you do not want a reviewer to have a look, e.g. because you are currently wor On the merge request page in the first box which contains information on the MR author and branch name there is button labelled `Check out branch` which will show you instructions on how to locally checkout this MR: -![](../checkout-branch.png) +![](checkout-branch.png) diff --git a/web/content/docs/devguide/development-workflows/GL_CI_screenshot.png b/web/content/docs/devguide/development-workflows/continuous-integration/GL_CI_screenshot.png similarity index 100% rename from web/content/docs/devguide/development-workflows/GL_CI_screenshot.png rename to web/content/docs/devguide/development-workflows/continuous-integration/GL_CI_screenshot.png diff --git a/web/content/docs/devguide/development-workflows/continuous-integration.md b/web/content/docs/devguide/development-workflows/continuous-integration/index.md similarity index 96% rename from web/content/docs/devguide/development-workflows/continuous-integration.md rename to web/content/docs/devguide/development-workflows/continuous-integration/index.md index c632c6b7af..1c0535c972 100644 --- a/web/content/docs/devguide/development-workflows/continuous-integration.md +++ b/web/content/docs/devguide/development-workflows/continuous-integration/index.md @@ -24,7 +24,7 @@ After the system is done with all these tasks the developer can view build repor ## CI on OGS All of this automatically kicks in when you open a [Merge Request](../code-reviews) on GitLab. You will notice a pipeline block at the merge request page: -![GitLab CI screenshot](../GL_CI_screenshot.png) +![GitLab CI screenshot](GL_CI_screenshot.png) Click on the pipeline link or the individual pipeline stage icons (circles) to find out the reason for a failed check. If you add more commits to this merge request all checks are run again. diff --git a/web/content/docs/devguide/development-workflows/clion.png b/web/content/docs/devguide/development-workflows/development-ides/clion.png similarity index 100% rename from web/content/docs/devguide/development-workflows/clion.png rename to web/content/docs/devguide/development-workflows/development-ides/clion.png diff --git a/web/content/docs/devguide/development-workflows/codeblocks.png b/web/content/docs/devguide/development-workflows/development-ides/codeblocks.png similarity index 100% rename from web/content/docs/devguide/development-workflows/codeblocks.png rename to web/content/docs/devguide/development-workflows/development-ides/codeblocks.png diff --git a/web/content/docs/devguide/development-workflows/eclipse.png b/web/content/docs/devguide/development-workflows/development-ides/eclipse.png similarity index 100% rename from web/content/docs/devguide/development-workflows/eclipse.png rename to web/content/docs/devguide/development-workflows/development-ides/eclipse.png diff --git a/web/content/docs/devguide/development-workflows/gdb.png b/web/content/docs/devguide/development-workflows/development-ides/gdb.png similarity index 100% rename from web/content/docs/devguide/development-workflows/gdb.png rename to web/content/docs/devguide/development-workflows/development-ides/gdb.png diff --git a/web/content/docs/devguide/development-workflows/development-ides.md b/web/content/docs/devguide/development-workflows/development-ides/index.md similarity index 95% rename from web/content/docs/devguide/development-workflows/development-ides.md rename to web/content/docs/devguide/development-workflows/development-ides/index.md index 96717b8abe..6dabf85650 100644 --- a/web/content/docs/devguide/development-workflows/development-ides.md +++ b/web/content/docs/devguide/development-workflows/development-ides/index.md @@ -42,7 +42,7 @@ __________ -![GDB screenshot](../gdb.png) +![GDB screenshot](gdb.png) ### Create project files @@ -71,7 +71,7 @@ __________ Choose "Eclipse IDE for C/C++ Developers" -![Eclipse screenshot](../eclipse.png) +![Eclipse screenshot](eclipse.png) ### Import Code @@ -105,7 +105,7 @@ or The latter includes already plugins for Fortran, in case you want to cross-compile. -![Code::Blocks screenshot](../codeblocks.png) +![Code::Blocks screenshot](codeblocks.png) ### Import Code @@ -136,7 +136,7 @@ __________ -![NetBeans screenshot](../netbeans.png) +![NetBeans screenshot](netbeans.png) ### Import project files @@ -163,7 +163,7 @@ __________ Download: -![Clion screenshot](../clion.png) +![Clion screenshot](clion.png) ### Import project diff --git a/web/content/docs/devguide/development-workflows/netbeans.png b/web/content/docs/devguide/development-workflows/development-ides/netbeans.png similarity index 100% rename from web/content/docs/devguide/development-workflows/netbeans.png rename to web/content/docs/devguide/development-workflows/development-ides/netbeans.png diff --git a/web/content/docs/devguide/development-workflows/gitlab-login.png b/web/content/docs/devguide/development-workflows/gitlab/gitlab-login.png similarity index 100% rename from web/content/docs/devguide/development-workflows/gitlab-login.png rename to web/content/docs/devguide/development-workflows/gitlab/gitlab-login.png diff --git a/web/content/docs/devguide/development-workflows/gitlab.md b/web/content/docs/devguide/development-workflows/gitlab/index.md similarity index 96% rename from web/content/docs/devguide/development-workflows/gitlab.md rename to web/content/docs/devguide/development-workflows/gitlab/index.md index a30a8ff528..cb02160474 100644 --- a/web/content/docs/devguide/development-workflows/gitlab.md +++ b/web/content/docs/devguide/development-workflows/gitlab/index.md @@ -16,7 +16,7 @@ weight = 1012 ## Setup an account - Creating a GitLab account can be done by simply using your existing GitHub account: click the GitHub logo (octocat) on the [Gitlab sign-in page](https://gitlab.opengeosys.org/users/sign_in) - ![GitLab login page](../gitlab-login.png) + ![GitLab login page](gitlab-login.png) - You will be redirected to GitHub (please login there) and asked for authorization. - Your new user account will be blocked at first, please let us know we will unblock it diff --git a/web/content/docs/devguide/development-workflows/introduction.md b/web/content/docs/devguide/development-workflows/introduction/index.md similarity index 100% rename from web/content/docs/devguide/development-workflows/introduction.md rename to web/content/docs/devguide/development-workflows/introduction/index.md diff --git a/web/content/docs/devguide/development-workflows/setup-fork.md b/web/content/docs/devguide/development-workflows/setup-fork/index.md similarity index 100% rename from web/content/docs/devguide/development-workflows/setup-fork.md rename to web/content/docs/devguide/development-workflows/setup-fork/index.md diff --git a/web/content/docs/devguide/development-workflows/web-docs.md b/web/content/docs/devguide/development-workflows/web-docs/index.md similarity index 100% rename from web/content/docs/devguide/development-workflows/web-docs.md rename to web/content/docs/devguide/development-workflows/web-docs/index.md diff --git a/web/content/docs/devguide/environments/docker.md b/web/content/docs/devguide/environments/docker/index.md similarity index 100% rename from web/content/docs/devguide/environments/docker.md rename to web/content/docs/devguide/environments/docker/index.md diff --git a/web/content/docs/devguide/environments/redistributable-builds.md b/web/content/docs/devguide/environments/redistributable-builds/index.md similarity index 100% rename from web/content/docs/devguide/environments/redistributable-builds.md rename to web/content/docs/devguide/environments/redistributable-builds/index.md diff --git a/web/content/docs/devguide/environments/singularity.md b/web/content/docs/devguide/environments/singularity/index.md similarity index 100% rename from web/content/docs/devguide/environments/singularity.md rename to web/content/docs/devguide/environments/singularity/index.md diff --git a/web/content/docs/devguide/environments/working-on-eve.md b/web/content/docs/devguide/environments/working-on-eve/index.md similarity index 100% rename from web/content/docs/devguide/environments/working-on-eve.md rename to web/content/docs/devguide/environments/working-on-eve/index.md diff --git a/web/content/docs/devguide/getting-started/build-configuration.md b/web/content/docs/devguide/getting-started/build-configuration/index.md similarity index 100% rename from web/content/docs/devguide/getting-started/build-configuration.md rename to web/content/docs/devguide/getting-started/build-configuration/index.md diff --git a/web/content/docs/devguide/getting-started/build.md b/web/content/docs/devguide/getting-started/build/index.md similarity index 100% rename from web/content/docs/devguide/getting-started/build.md rename to web/content/docs/devguide/getting-started/build/index.md diff --git a/web/content/docs/devguide/getting-started/git-url.png b/web/content/docs/devguide/getting-started/get-the-source-code/git-url.png similarity index 100% rename from web/content/docs/devguide/getting-started/git-url.png rename to web/content/docs/devguide/getting-started/get-the-source-code/git-url.png diff --git a/web/content/docs/devguide/getting-started/get-the-source-code.md b/web/content/docs/devguide/getting-started/get-the-source-code/index.md similarity index 95% rename from web/content/docs/devguide/getting-started/get-the-source-code.md rename to web/content/docs/devguide/getting-started/get-the-source-code/index.md index 2dd0444215..d8ee53ddc9 100644 --- a/web/content/docs/devguide/getting-started/get-the-source-code.md +++ b/web/content/docs/devguide/getting-started/get-the-source-code/index.md @@ -19,7 +19,7 @@ weight = 1003 To get the latest source code simply download it from [repository website](https://gitlab.opengeosys.org/ogs/ogs) and extract the archive: -![](../zip-download.png) +![](zip-download.png) You can also download and extract with the command line: @@ -32,7 +32,7 @@ tar xf ogs-master.tar.gz First you need to get the clone url: -![](../git-url.png) +![](git-url.png) Then clone the repository with `git`: diff --git a/web/content/docs/devguide/getting-started/zip-download.png b/web/content/docs/devguide/getting-started/get-the-source-code/zip-download.png similarity index 100% rename from web/content/docs/devguide/getting-started/zip-download.png rename to web/content/docs/devguide/getting-started/get-the-source-code/zip-download.png diff --git a/web/content/docs/devguide/getting-started/introduction.md b/web/content/docs/devguide/getting-started/introduction/index.md similarity index 100% rename from web/content/docs/devguide/getting-started/introduction.md rename to web/content/docs/devguide/getting-started/introduction/index.md diff --git a/web/content/docs/devguide/getting-started/git-installer-win.png b/web/content/docs/devguide/getting-started/prerequisites/git-installer-win.png similarity index 100% rename from web/content/docs/devguide/getting-started/git-installer-win.png rename to web/content/docs/devguide/getting-started/prerequisites/git-installer-win.png diff --git a/web/content/docs/devguide/getting-started/prerequisites.md b/web/content/docs/devguide/getting-started/prerequisites/index.md similarity index 99% rename from web/content/docs/devguide/getting-started/prerequisites.md rename to web/content/docs/devguide/getting-started/prerequisites/index.md index 933ec95b2b..0fb5fd2c96 100644 --- a/web/content/docs/devguide/getting-started/prerequisites.md +++ b/web/content/docs/devguide/getting-started/prerequisites/index.md @@ -119,7 +119,7 @@ Git is a powerful and distributed version control system. OGS source code is hos **Download** and install git from the [git homepage](http://git-scm.com/download/win). Use the default installer options but also enable `Enable symbolic links` under the *Configuring extra options* page. -![Enable symbolic links option](../git-installer-win.png) +![Enable symbolic links option](git-installer-win.png) This install a new command line called *Git Bash* which should be used for all git operations. diff --git a/web/content/docs/devguide/packages/conan-package-manager.md b/web/content/docs/devguide/packages/conan-package-manager/index.md similarity index 100% rename from web/content/docs/devguide/packages/conan-package-manager.md rename to web/content/docs/devguide/packages/conan-package-manager/index.md diff --git a/web/content/docs/devguide/packages/cpm.md b/web/content/docs/devguide/packages/cpm/index.md similarity index 100% rename from web/content/docs/devguide/packages/cpm.md rename to web/content/docs/devguide/packages/cpm/index.md diff --git a/web/content/docs/devguide/packages/mfront.md b/web/content/docs/devguide/packages/mfront/index.md similarity index 100% rename from web/content/docs/devguide/packages/mfront.md rename to web/content/docs/devguide/packages/mfront/index.md diff --git a/web/content/docs/devguide/packages/python-env.md b/web/content/docs/devguide/packages/python-env/index.md similarity index 100% rename from web/content/docs/devguide/packages/python-env.md rename to web/content/docs/devguide/packages/python-env/index.md diff --git a/web/content/docs/devguide/procedures/publish-a-release.md b/web/content/docs/devguide/procedures/publish-a-release/index.md similarity index 100% rename from web/content/docs/devguide/procedures/publish-a-release.md rename to web/content/docs/devguide/procedures/publish-a-release/index.md diff --git a/web/content/docs/devguide/testing/GitLab-Pipeline.png b/web/content/docs/devguide/testing/gitlab-ci/GitLab-Pipeline.png similarity index 100% rename from web/content/docs/devguide/testing/GitLab-Pipeline.png rename to web/content/docs/devguide/testing/gitlab-ci/GitLab-Pipeline.png diff --git a/web/content/docs/devguide/testing/gitlab-ci.md b/web/content/docs/devguide/testing/gitlab-ci/index.md similarity index 97% rename from web/content/docs/devguide/testing/gitlab-ci.md rename to web/content/docs/devguide/testing/gitlab-ci/index.md index 0effa5fee8..92836b49fb 100644 --- a/web/content/docs/devguide/testing/gitlab-ci.md +++ b/web/content/docs/devguide/testing/gitlab-ci/index.md @@ -20,7 +20,7 @@ The tasks of the CI system are configured in [scripts inside the OGS source code A CI run consists of a [pipeline](https://docs.gitlab.com/ee/ci/pipelines/) which contains [stages](https://docs.gitlab.com/ee/ci/yaml/#stages) which in turn contain jobs. A job runs a set of instructions (e.g. checking out the source code, building the code, testing the code) on a [runner](https://docs.gitlab.com/runner/). Each pipeline run is visualized as follows: -![GitLab pipeline visualization](../GitLab-Pipeline.png) +![GitLab pipeline visualization](GitLab-Pipeline.png) Jobs are belong to a stage and each job will get a status (success, warnings, failure). Some jobs are optional (see the gear icon) and can be manually triggered by pressing the play button. diff --git a/web/content/docs/devguide/testing/test-data.md b/web/content/docs/devguide/testing/test-data/index.md similarity index 100% rename from web/content/docs/devguide/testing/test-data.md rename to web/content/docs/devguide/testing/test-data/index.md diff --git a/web/content/docs/devguide/testing/unit-testing.md b/web/content/docs/devguide/testing/unit-testing/index.md similarity index 100% rename from web/content/docs/devguide/testing/unit-testing.md rename to web/content/docs/devguide/testing/unit-testing/index.md diff --git a/web/content/docs/devguide/testing/workflow-testing.md b/web/content/docs/devguide/testing/workflow-testing/index.md similarity index 100% rename from web/content/docs/devguide/testing/workflow-testing.md rename to web/content/docs/devguide/testing/workflow-testing/index.md diff --git a/web/content/docs/devguide/troubleshooting/build.md b/web/content/docs/devguide/troubleshooting/build/index.md similarity index 100% rename from web/content/docs/devguide/troubleshooting/build.md rename to web/content/docs/devguide/troubleshooting/build/index.md diff --git a/web/content/docs/devguide/troubleshooting/cmake.md b/web/content/docs/devguide/troubleshooting/cmake/index.md similarity index 100% rename from web/content/docs/devguide/troubleshooting/cmake.md rename to web/content/docs/devguide/troubleshooting/cmake/index.md diff --git a/web/content/docs/devguide/troubleshooting/conan.md b/web/content/docs/devguide/troubleshooting/conan/index.md similarity index 100% rename from web/content/docs/devguide/troubleshooting/conan.md rename to web/content/docs/devguide/troubleshooting/conan/index.md diff --git a/web/content/docs/devguide/troubleshooting/get-support.md b/web/content/docs/devguide/troubleshooting/get-support/index.md similarity index 100% rename from web/content/docs/devguide/troubleshooting/get-support.md rename to web/content/docs/devguide/troubleshooting/get-support/index.md diff --git a/web/content/docs/devguide/troubleshooting/git.md b/web/content/docs/devguide/troubleshooting/git/index.md similarity index 100% rename from web/content/docs/devguide/troubleshooting/git.md rename to web/content/docs/devguide/troubleshooting/git/index.md diff --git a/web/content/docs/devguide/troubleshooting/run.md b/web/content/docs/devguide/troubleshooting/run/index.md similarity index 100% rename from web/content/docs/devguide/troubleshooting/run.md rename to web/content/docs/devguide/troubleshooting/run/index.md -- GitLab From 4e9ae30327f91ad0a759fdf819aeb4e8c7d8c358 Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Tue, 29 Mar 2022 13:27:38 +0200 Subject: [PATCH 14/17] [web] Converted to page bundle: tools. --- web/content/docs/tools/fileio/GMSH2OGS/index.md | 2 +- web/content/docs/tools/fileio/GocadTSurfaceReader/index.md | 4 ++-- web/content/docs/tools/fileio/Mesh2Shape/index.md | 6 +++--- web/content/docs/tools/fileio/TecPlotTools/index.md | 4 ++-- .../getting-started/{overview.md => overview/index.md} | 0 web/content/docs/tools/meshing/vtu2grid/index.md | 6 +++--- .../tools/preprocessing/createIntermediateRasters/index.md | 6 +++--- web/layouts/_default/baseof.html | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) rename web/content/docs/tools/getting-started/{overview.md => overview/index.md} (100%) diff --git a/web/content/docs/tools/fileio/GMSH2OGS/index.md b/web/content/docs/tools/fileio/GMSH2OGS/index.md index 041d00a7f8..14634acfe8 100644 --- a/web/content/docs/tools/fileio/GMSH2OGS/index.md +++ b/web/content/docs/tools/fileio/GMSH2OGS/index.md @@ -62,6 +62,6 @@ GMSH2OGS -i A2-gmsh.msh -o A2.vtu - Finally specifying both flags (`-e` and `-b`) produces a single VTU file without the line elements and additional eight boundary (subdomain) files. -![GMSG2OGS-e-b](./extract_boundary.png#two-third "GMSH2OGS meshes for -e and -b +![GMSG2OGS-e-b](extract_boundary.png#two-third "GMSH2OGS meshes for -e and -b command line flags.") diff --git a/web/content/docs/tools/fileio/GocadTSurfaceReader/index.md b/web/content/docs/tools/fileio/GocadTSurfaceReader/index.md index 1dc08189c6..c0131fb8b8 100644 --- a/web/content/docs/tools/fileio/GocadTSurfaceReader/index.md +++ b/web/content/docs/tools/fileio/GocadTSurfaceReader/index.md @@ -63,8 +63,8 @@ GocadTSurfaceReader -i d:\GoCAD_data\Top-Lower_Sandy.ts -o d:\GoCAD_data **Input:** -![GoCAD-Header](./Surface-GoCad.png#two-third "GoCAD-Header of file containing triangulated surface.") +![GoCAD-Header](Surface-GoCad.png#two-third "GoCAD-Header of file containing triangulated surface.") **Output:** -![Converted surface](./Surface-ParaView.png "Converted surface visualised in ParaView with scalar data added to nodes.") +![Converted surface](Surface-ParaView.png "Converted surface visualised in ParaView with scalar data added to nodes.") diff --git a/web/content/docs/tools/fileio/Mesh2Shape/index.md b/web/content/docs/tools/fileio/Mesh2Shape/index.md index 5b19a1b333..cb34838b89 100644 --- a/web/content/docs/tools/fileio/Mesh2Shape/index.md +++ b/web/content/docs/tools/fileio/Mesh2Shape/index.md @@ -31,7 +31,7 @@ Where: **Input data:** -![Input](./Mesh2Shape-input.png "2D surface mesh with scalar data assigned to cells, here displayed via the OGS Data Explorer. In this particular case, the simulation result of groundwater flow simulation (originally assigned to mesh nodes) has been converted onto cells via VTK's PointToCell-Filter.") +![Input](Mesh2Shape-input.png "2D surface mesh with scalar data assigned to cells, here displayed via the OGS Data Explorer. In this particular case, the simulation result of groundwater flow simulation (originally assigned to mesh nodes) has been converted onto cells via VTK's PointToCell-Filter.") **Command:** @@ -39,9 +39,9 @@ Where: Mesh2Shape -i Mueglitz2D_Point2Cell.vtu -o Mueglitz2D_Point2Cell.shp ``` -![Exported shapefile](./Mesh2Shape-output1.png "Exported shapefile displayed in a geographic information system (here, QGIS).") +![Exported shapefile](Mesh2Shape-output1.png "Exported shapefile displayed in a geographic information system (here, QGIS).") -![OGS simulation result](./Mesh2Shape-output2.png "The result of an OGS-simulation showing the groundwater head of the Müglitz-catchment imported into QGIS and combined with other data from an existing GIS-project of this region.") +![OGS simulation result](Mesh2Shape-output2.png "The result of an OGS-simulation showing the groundwater head of the Müglitz-catchment imported into QGIS and combined with other data from an existing GIS-project of this region.") ## Application diff --git a/web/content/docs/tools/fileio/TecPlotTools/index.md b/web/content/docs/tools/fileio/TecPlotTools/index.md index 21fff3bc0b..66b16c7fa3 100644 --- a/web/content/docs/tools/fileio/TecPlotTools/index.md +++ b/web/content/docs/tools/fileio/TecPlotTools/index.md @@ -45,8 +45,8 @@ TecPlotTools -i Lake.plt -o Lake.vtu -c **Input:** -![TecPlot-Header](./PoyangLake-TecPlot.png "TecPlot-Header of file containing raster data") +![TecPlot-Header](PoyangLake-TecPlot.png "TecPlot-Header of file containing raster data") **Output:** -![Converted file](./PoyangLake-ParaView.png "Converted file visualised in ParaView with all scalar data available.") +![Converted file](PoyangLake-ParaView.png "Converted file visualised in ParaView with all scalar data available.") diff --git a/web/content/docs/tools/getting-started/overview.md b/web/content/docs/tools/getting-started/overview/index.md similarity index 100% rename from web/content/docs/tools/getting-started/overview.md rename to web/content/docs/tools/getting-started/overview/index.md diff --git a/web/content/docs/tools/meshing/vtu2grid/index.md b/web/content/docs/tools/meshing/vtu2grid/index.md index f2f7048244..fb8e063b4d 100644 --- a/web/content/docs/tools/meshing/vtu2grid/index.md +++ b/web/content/docs/tools/meshing/vtu2grid/index.md @@ -57,7 +57,7 @@ Vtu2Grid -i input.vtu -o output.vtu -x 200 Vtu2Grid -i input.vtu -o output.vtu -x 100 ``` -![Rasterised grid](./vtu2grid-100.png#two-third "Rasterised grid consisting of 74,048 equilateral hexahedral elements with an edge length of 100m. The result is still undersampled but layers become already visible.") +![Rasterised grid](vtu2grid-100.png#two-third "Rasterised grid consisting of 74,048 equilateral hexahedral elements with an edge length of 100m. The result is still undersampled but layers become already visible.") **Command:** @@ -65,7 +65,7 @@ Vtu2Grid -i input.vtu -o output.vtu -x 100 Vtu2Grid -i input.vtu -o output.vtu -x 50 ``` -![Rasterised grid](./vtu2grid-50.png#two-third "Rasterised grid consisting of 591,757 equilateral hexahedral elements with an edge length of 50m. There's still undersampling in regions containing thin layers but the overall structure is reasonably well represented.") +![Rasterised grid](vtu2grid-50.png#two-third "Rasterised grid consisting of 591,757 equilateral hexahedral elements with an edge length of 50m. There's still undersampling in regions containing thin layers but the overall structure is reasonably well represented.") **Command:** @@ -73,7 +73,7 @@ Vtu2Grid -i input.vtu -o output.vtu -x 50 Vtu2Grid -i input.vtu -o output.vtu -x 50 -y 50 -z 10 ``` -![Rasterised grid](./vtu2grid-50x50x10.png#two-third "Rasterised grid consisting of 2,959,656 cuboid hexahedral elements with an edge length of 50m x 50m x 10m. The structure of the original mesh is very well represented while the number of elements has increased by an order of magnitude.") +![Rasterised grid](vtu2grid-50x50x10.png#two-third "Rasterised grid consisting of 2,959,656 cuboid hexahedral elements with an edge length of 50m x 50m x 10m. The structure of the original mesh is very well represented while the number of elements has increased by an order of magnitude.") ## Application diff --git a/web/content/docs/tools/preprocessing/createIntermediateRasters/index.md b/web/content/docs/tools/preprocessing/createIntermediateRasters/index.md index bac36853dc..fa7eb79a73 100644 --- a/web/content/docs/tools/preprocessing/createIntermediateRasters/index.md +++ b/web/content/docs/tools/preprocessing/createIntermediateRasters/index.md @@ -39,7 +39,7 @@ The parameter ```n``` determines how many layers are created between the two inp **Input data:** -![Two input rasters](./createIntermediateRasters-input.png "Two input rasters as well as their 3D surface representation. Darker pixels represent values at a lower elevation while brighter pixels represent higher elevaton. In the 3D visualisation, the left-most raster is represented by the green surface and the right-most raster by the yellow surface.") +![Two input rasters](createIntermediateRasters-input.png "Two input rasters as well as their 3D surface representation. Darker pixels represent values at a lower elevation while brighter pixels represent higher elevaton. In the 3D visualisation, the left-most raster is represented by the green surface and the right-most raster by the yellow surface.") **Command:** @@ -47,7 +47,7 @@ The parameter ```n``` determines how many layers are created between the two inp createIntermediateRasters --file1 raster1.asc --file2 raster2.asc -o output.asc -n 1 ``` -![A new raster is created in the exact center between the two input rasters](./createIntermediateRasters-output1.png#two-third "A new raster is created in the exact center between the two input rasters. In the 3D representation, the new layer is shown in red.") +![A new raster is created in the exact center between the two input rasters](createIntermediateRasters-output1.png#two-third "A new raster is created in the exact center between the two input rasters. In the 3D representation, the new layer is shown in red.") **Command:** @@ -55,7 +55,7 @@ createIntermediateRasters --file1 raster1.asc --file2 raster2.asc -o output.asc createIntermediateRasters --file1 raster1.asc --file2 raster2.asc -o output.asc -n 2 ``` -![](./createIntermediateRasters-output2.png "For ```n>1``` multiple rasters are created at equidistant distances between the two input rasters. For ```n=2```, two new rasters are generated, represented here in red and blue.") +![](createIntermediateRasters-output2.png "For ```n>1``` multiple rasters are created at equidistant distances between the two input rasters. For ```n=2```, two new rasters are generated, represented here in red and blue.") ## Application diff --git a/web/layouts/_default/baseof.html b/web/layouts/_default/baseof.html index 142f219d2b..456e4ee5b9 100644 --- a/web/layouts/_default/baseof.html +++ b/web/layouts/_default/baseof.html @@ -53,7 +53,7 @@ src="https://upload.wikimedia.org/wikipedia/commons/3/38/Jupyter_logo.svg" alt=""> {{ end }} - {{ .Name }} + {{ .Name | markdownify }} {{ end }} -- GitLab From 394861c3c967338d08b8845bd9f4a9c8b84a81a1 Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Tue, 29 Mar 2022 15:11:46 +0200 Subject: [PATCH 15/17] [web] Converted to page bundle: userguide. --- .../{cli-arguments.md => cli-arguments/index.md} | 0 .../basics/{container.md => container/index.md} | 0 .../basics/{conventions.md => conventions/index.md} | 0 .../basics/{envinf1.md => envinf1/index.md} | 0 .../{introduction.md => introduction/index.md} | 0 .../index.md} | 0 .../{project-file.md => project-file/index.md} | 0 .../index.md} | 0 .../{ => Heat_Transport_BHE}/coaxial.png | Bin .../index.md} | 4 ++-- .../{ => Heat_Transport_BHE}/u_type.png | Bin .../BHE_PipeNetwork_feature_workflow.png | Bin .../BHE_network.png | Bin .../index.md} | 4 ++-- .../index.md} | 6 +++--- .../{general.md => general/index.md} | 0 .../{get-support.md => get-support/index.md} | 0 17 files changed, 7 insertions(+), 7 deletions(-) rename web/content/docs/userguide/basics/{cli-arguments.md => cli-arguments/index.md} (100%) rename web/content/docs/userguide/basics/{container.md => container/index.md} (100%) rename web/content/docs/userguide/basics/{conventions.md => conventions/index.md} (100%) rename web/content/docs/userguide/basics/{envinf1.md => envinf1/index.md} (100%) rename web/content/docs/userguide/basics/{introduction.md => introduction/index.md} (100%) rename web/content/docs/userguide/basics/{jupyter-notebooks.md => jupyter-notebooks/index.md} (100%) rename web/content/docs/userguide/basics/{project-file.md => project-file/index.md} (100%) rename web/content/docs/userguide/post-processing/{paraview-on-eve.md => paraview-on-eve/index.md} (100%) rename web/content/docs/userguide/process-dependent-configuration/{ => Heat_Transport_BHE}/coaxial.png (100%) rename web/content/docs/userguide/process-dependent-configuration/{Heat_Transport_BHE.md => Heat_Transport_BHE/index.md} (99%) rename web/content/docs/userguide/process-dependent-configuration/{ => Heat_Transport_BHE}/u_type.png (100%) rename web/content/docs/userguide/process-dependent-configuration/{ => Heat_Transport_BHE_PipelineNetwork}/BHE_PipeNetwork_feature_workflow.png (100%) rename web/content/docs/userguide/process-dependent-configuration/{ => Heat_Transport_BHE_PipelineNetwork}/BHE_network.png (100%) rename web/content/docs/userguide/process-dependent-configuration/{Heat_Transport_BHE_PipelineNetwork.md => Heat_Transport_BHE_PipelineNetwork/index.md} (99%) rename web/content/docs/userguide/process-dependent-configuration/{Multiphase_Flow_Overview.md => Multiphase_Flow_Overview/index.md} (89%) rename web/content/docs/userguide/troubleshooting/{general.md => general/index.md} (100%) rename web/content/docs/userguide/troubleshooting/{get-support.md => get-support/index.md} (100%) diff --git a/web/content/docs/userguide/basics/cli-arguments.md b/web/content/docs/userguide/basics/cli-arguments/index.md similarity index 100% rename from web/content/docs/userguide/basics/cli-arguments.md rename to web/content/docs/userguide/basics/cli-arguments/index.md diff --git a/web/content/docs/userguide/basics/container.md b/web/content/docs/userguide/basics/container/index.md similarity index 100% rename from web/content/docs/userguide/basics/container.md rename to web/content/docs/userguide/basics/container/index.md diff --git a/web/content/docs/userguide/basics/conventions.md b/web/content/docs/userguide/basics/conventions/index.md similarity index 100% rename from web/content/docs/userguide/basics/conventions.md rename to web/content/docs/userguide/basics/conventions/index.md diff --git a/web/content/docs/userguide/basics/envinf1.md b/web/content/docs/userguide/basics/envinf1/index.md similarity index 100% rename from web/content/docs/userguide/basics/envinf1.md rename to web/content/docs/userguide/basics/envinf1/index.md diff --git a/web/content/docs/userguide/basics/introduction.md b/web/content/docs/userguide/basics/introduction/index.md similarity index 100% rename from web/content/docs/userguide/basics/introduction.md rename to web/content/docs/userguide/basics/introduction/index.md diff --git a/web/content/docs/userguide/basics/jupyter-notebooks.md b/web/content/docs/userguide/basics/jupyter-notebooks/index.md similarity index 100% rename from web/content/docs/userguide/basics/jupyter-notebooks.md rename to web/content/docs/userguide/basics/jupyter-notebooks/index.md diff --git a/web/content/docs/userguide/basics/project-file.md b/web/content/docs/userguide/basics/project-file/index.md similarity index 100% rename from web/content/docs/userguide/basics/project-file.md rename to web/content/docs/userguide/basics/project-file/index.md diff --git a/web/content/docs/userguide/post-processing/paraview-on-eve.md b/web/content/docs/userguide/post-processing/paraview-on-eve/index.md similarity index 100% rename from web/content/docs/userguide/post-processing/paraview-on-eve.md rename to web/content/docs/userguide/post-processing/paraview-on-eve/index.md diff --git a/web/content/docs/userguide/process-dependent-configuration/coaxial.png b/web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE/coaxial.png similarity index 100% rename from web/content/docs/userguide/process-dependent-configuration/coaxial.png rename to web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE/coaxial.png diff --git a/web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE.md b/web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE/index.md similarity index 99% rename from web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE.md rename to web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE/index.md index 3458d36142..21eb5da3c0 100644 --- a/web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE.md +++ b/web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE/index.md @@ -78,9 +78,9 @@ Especially in CXA and CXC type, the direction of the borehole itself could be de The cross-sections of these 4 types of BHEs are illustrated in the following figures. -{{< img src="../u_type.png" width="50">}} +{{< img src="u_type.png" width="50">}} -{{< img src="../coaxial.png" width="50">}} +{{< img src="coaxial.png" width="50">}} ### < pipes > diff --git a/web/content/docs/userguide/process-dependent-configuration/u_type.png b/web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE/u_type.png similarity index 100% rename from web/content/docs/userguide/process-dependent-configuration/u_type.png rename to web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE/u_type.png diff --git a/web/content/docs/userguide/process-dependent-configuration/BHE_PipeNetwork_feature_workflow.png b/web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE_PipelineNetwork/BHE_PipeNetwork_feature_workflow.png similarity index 100% rename from web/content/docs/userguide/process-dependent-configuration/BHE_PipeNetwork_feature_workflow.png rename to web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE_PipelineNetwork/BHE_PipeNetwork_feature_workflow.png diff --git a/web/content/docs/userguide/process-dependent-configuration/BHE_network.png b/web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE_PipelineNetwork/BHE_network.png similarity index 100% rename from web/content/docs/userguide/process-dependent-configuration/BHE_network.png rename to web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE_PipelineNetwork/BHE_network.png diff --git a/web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE_PipelineNetwork.md b/web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE_PipelineNetwork/index.md similarity index 99% rename from web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE_PipelineNetwork.md rename to web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE_PipelineNetwork/index.md index 9e8422af0b..bc1b633ed3 100644 --- a/web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE_PipelineNetwork.md +++ b/web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE_PipelineNetwork/index.md @@ -35,7 +35,7 @@ Thermal Engineering Systems in Python (software paper: }} +{{< img src="BHE_network.png" width="200">}} Figure 1: Pipeline network model in TESPy @@ -175,7 +175,7 @@ btes.save('tespy_nw') The work flow of the PipeNetwork feature is illustrated in Figure 2. To explicitly simulate both the BHE and the pipe network, OGS is coupled with the TESPy through a Python interface. Within every time step and each iteration, the outflow temperature `Tout` from each BHE is computed by OGS and transferred to TESPy via the interface. Then TESPy will use these `Tout` temperature and the current hydraulic state as the boundary condition imposed on the pipeline network to calculate the current inflow temperature `Tin` of each BHE and the currently flow rate, which satisfies the overall thermal load of the building. After the calculation, all data will be transferred back to OGS and update the inlet temperature and flow rate of each BHE for the next iteration. The convergence is set to be satisfied when the difference from the last two iteration results is smaller than a preset tolerance value. Additionally, OGS will transfer the currently time step 't' to TESPy within each iteration, which makes TESPy able to adjust its time dependent network boundary conditions according to the user's configuration. -{{< img src="../BHE_PipeNetwork_feature_workflow.png" width="100">}} +{{< img src="BHE_PipeNetwork_feature_workflow.png" width="100">}} Figure 2: Work flow of the model with BHEs coupled with a pipe network diff --git a/web/content/docs/userguide/process-dependent-configuration/Multiphase_Flow_Overview.md b/web/content/docs/userguide/process-dependent-configuration/Multiphase_Flow_Overview/index.md similarity index 89% rename from web/content/docs/userguide/process-dependent-configuration/Multiphase_Flow_Overview.md rename to web/content/docs/userguide/process-dependent-configuration/Multiphase_Flow_Overview/index.md index d049b57d17..72be7d270f 100644 --- a/web/content/docs/userguide/process-dependent-configuration/Multiphase_Flow_Overview.md +++ b/web/content/docs/userguide/process-dependent-configuration/Multiphase_Flow_Overview/index.md @@ -27,8 +27,8 @@ Nomenclature: $P_g$: gas pressure; $P_c$: capillary pressure; $T$: temperature; Some remarks: -1\. The `TwoPhaseFlowWithPP` process assumes that the two fluid phases are immiscible. Thus, it is most suitable for simulating two-phase flow under capillary effects (e.g. replacement of one phase by another due to gravity). Note that the wetting and non-wetting phases are not limited to water and gas, see the [McWhorter benchmark]({{< ref "../../benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-mcwhorter.md" >}}) for example. +1\. The `TwoPhaseFlowWithPP` process assumes that the two fluid phases are immiscible. Thus, it is most suitable for simulating two-phase flow under capillary effects (e.g. replacement of one phase by another due to gravity). Note that the wetting and non-wetting phases are not limited to water and gas, see the [McWhorter benchmark]({{< ref "docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-mcwhorter" >}}) for example. -2\. The `TwoPhaseFlowWithPrho` process assumes that the main component of the gas phase can be dissolved in the liquid phase. Water evaporation is neglected here. The appearance/disappearance of the gas phase is controlled by the solubility (given by the Henry's Law) of the gaseous component, e.g. H2. It is therefore most suitable for nuclear waste repository (see the [MoMaS benchmark]({{< ref "../../benchmarks/two-phase-flow/momas.md" >}})) or CO2 storage problems. +2\. The `TwoPhaseFlowWithPrho` process assumes that the main component of the gas phase can be dissolved in the liquid phase. Water evaporation is neglected here. The appearance/disappearance of the gas phase is controlled by the solubility (given by the Henry's Law) of the gaseous component, e.g. H2. It is therefore most suitable for nuclear waste repository (see the [MoMaS benchmark]({{< ref "docs/benchmarks/two-phase-flow/momas" >}})) or CO2 storage problems. -3\. The `ThermalTwoPhaseFlowWithPP` process simulates the temperature-dependent two-phase flow and moisture transport. Water evaporation and recondensation can be modeled thanks to that the gas phase is compositional. This process is most favorably used for shallow geothermal applications (e.g. borehole thermal energy storage), especially in unsaturated soils (see the [heat pipe benchmark]({{< ref "../../benchmarks/thermal-two-phase-flow/heat-pipe.md" >}})). \ No newline at end of file +3\. The `ThermalTwoPhaseFlowWithPP` process simulates the temperature-dependent two-phase flow and moisture transport. Water evaporation and recondensation can be modeled thanks to that the gas phase is compositional. This process is most favorably used for shallow geothermal applications (e.g. borehole thermal energy storage), especially in unsaturated soils (see the [heat pipe benchmark]({{< ref "docs/benchmarks/thermal-two-phase-flow/heat-pipe" >}})). diff --git a/web/content/docs/userguide/troubleshooting/general.md b/web/content/docs/userguide/troubleshooting/general/index.md similarity index 100% rename from web/content/docs/userguide/troubleshooting/general.md rename to web/content/docs/userguide/troubleshooting/general/index.md diff --git a/web/content/docs/userguide/troubleshooting/get-support.md b/web/content/docs/userguide/troubleshooting/get-support/index.md similarity index 100% rename from web/content/docs/userguide/troubleshooting/get-support.md rename to web/content/docs/userguide/troubleshooting/get-support/index.md -- GitLab From 12ca554110c3ca97f31258cf852c4b769502591b Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Tue, 29 Mar 2022 15:48:03 +0200 Subject: [PATCH 16/17] [web] Use page bundle resource in img shortcode. --- .../3D_coaxial_deep_BHE/index.md | 2 +- .../BHE_array_benchmark/index.md | 2 +- .../lie-hm-linear-single-fracture/index.md | 2 - .../KineticReactant2.gif | Bin .../KineticReactant2/index.md | 2 +- .../radionuclide/{ => radionuclide}/Fig2.gif | Bin .../radionuclide/radionuclide/index.md | 4 +- .../wetland/{ => Wetland}/Wetland_1d.gif | Bin .../wetland/Wetland/index.md | 2 +- web/layouts/shortcodes/img.html | 36 +++++++++++------- 10 files changed, 29 insertions(+), 21 deletions(-) rename web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/{ => KineticReactant2}/KineticReactant2.gif (100%) rename web/content/docs/benchmarks/reactive-transport/radionuclide/{ => radionuclide}/Fig2.gif (100%) rename web/content/docs/benchmarks/reactive-transport/wetland/{ => Wetland}/Wetland_1d.gif (100%) diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE/index.md b/web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE/index.md index 56ae730af1..901ff2246f 100644 --- a/web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE/index.md +++ b/web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE/index.md @@ -15,7 +15,7 @@ project = "Parabolic/T/3D_deep_BHE/3D_deep_BHE_CXA.prj" ## Problem description -In recent years, Borehole Heat Exchangers (BHE) are very widely utilized to extract geothermal energy for building heating. For coaxial type of BHEs, an inner pipe is installed inside of an outer pipe, allowing the downward and upward flow to be separated. In some projects, very long coaxial BHEs are installed down to a 2-km depth, in order to extract more energy from the deep subsurface (Kong et al., 2017). Based on the flow directions, there are two types of coaxial BHEs. When downward flow is located in the inner pipe, it is called Coaxial-Centred (CXC) type. On the countary, if the inflow is introduced in the annular space, it is called a CXA type. Detailed schematization of the CXA-type BHE system is shown in Figure 1. In this benchmark, the numerical model in OGS-6 has been tested for the 2 coaxial types of BHEs. The simulation results are compared with previous OGS-5 results and also the analytical solution proposed by [Beier et al. (2014)](../Analytical_coaxial_BHE.zip). +In recent years, Borehole Heat Exchangers (BHE) are very widely utilized to extract geothermal energy for building heating. For coaxial type of BHEs, an inner pipe is installed inside of an outer pipe, allowing the downward and upward flow to be separated. In some projects, very long coaxial BHEs are installed down to a 2-km depth, in order to extract more energy from the deep subsurface (Kong et al., 2017). Based on the flow directions, there are two types of coaxial BHEs. When downward flow is located in the inner pipe, it is called Coaxial-Centred (CXC) type. On the countary, if the inflow is introduced in the annular space, it is called a CXA type. Detailed schematization of the CXA-type BHE system is shown in Figure 1. In this benchmark, the numerical model in OGS-6 has been tested for the 2 coaxial types of BHEs. The simulation results are compared with previous OGS-5 results and also the analytical solution proposed by [Beier et al. (2014)](Analytical_coaxial_BHE.zip). {{< img src="coaxial_deep_BHE.png" width="200">}} diff --git a/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/index.md b/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/index.md index 231516dfb9..3d90c5cfd7 100644 --- a/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/index.md +++ b/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/index.md @@ -40,7 +40,7 @@ where ${\mathop q\nolimits_k }$ is a sequence of heat extraction pulses at t =1, = \sum\limits_{l = 1}^m {\sum\limits_{k = l}^n {\frac{{\mathop q\nolimits_{k,l} }}{{4\pi L\lambda }}} } \left( {E_1\left[ {\frac{{{{\left( {i - \mathop x\nolimits_k } \right)}^2} + {{\left( {j - \mathop y\nolimits_k } \right)}^2}}}{{4\alpha \left( {\mathop t\nolimits_m - \mathop t\nolimits_{l - 1} } \right)}}} \right] - E_1\left[ {\frac{{{{\left( {i - \mathop x\nolimits_k } \right)}^2} + {{\left( {j - \mathop y\nolimits_k } \right)}^2}}}{{4\alpha \left( {\mathop t\nolimits_m - \mathop t\nolimits_l } \right)}}} \right]} \right). \end{split}\end{equation} -where ${\mathop q\nolimits_{k,l} }$ is the heat extraction of the k-*th* BHE at time step *l*. The equation (3) will be used to calculate the analytical solution of the overall temperature change in this model for validating the numerical results. It is written in python code and can be found [here](../bhe_array_analytical_solver.py). +where ${\mathop q\nolimits_{k,l} }$ is the heat extraction of the k-*th* BHE at time step *l*. The equation (3) will be used to calculate the analytical solution of the overall temperature change in this model for validating the numerical results. It is written in python code and can be found [here](bhe_array_analytical_solver.py). ## Numerical model setup diff --git a/web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture/index.md b/web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture/index.md index dee7413f17..e5e63050e0 100644 --- a/web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture/index.md +++ b/web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture/index.md @@ -38,5 +38,3 @@ shown in the following figure. Comparison with 2D setup yields identical results (up to numerical differences in order of 1e-15): TODO: Image missing! - - diff --git a/web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2.gif b/web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2/KineticReactant2.gif similarity index 100% rename from web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2.gif rename to web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2/KineticReactant2.gif diff --git a/web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2/index.md b/web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2/index.md index 414428f91a..4c91a63b4e 100644 --- a/web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2/index.md +++ b/web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2/index.md @@ -83,4 +83,4 @@ Over time, opposed concentration fronts for educts and Product d evolve. Both, OGS-6 and OGS-5 simulations yield the same results in the 1d as well as 2d scenario. For instance, the difference between the OGS-6 and the OGS-5 computation for the concentration of Product d expressed as root mean squared error is 1.76e-7 mol kg$^{-1}$ water (over all time steps and mesh nodes, 1d scenario); the corresponding median absolute error is 1.0e-7 mol kg$^{-1}$ water. This verifies the implementation of OGS-6--IPhreeqc. -{{< img src="../KineticReactant2.gif" title="Simulated component concentrations over domain length for different time steps (1d scenario) .">}} +{{< img src="KineticReactant2.gif" title="Simulated component concentrations over domain length for different time steps (1d scenario) .">}} diff --git a/web/content/docs/benchmarks/reactive-transport/radionuclide/Fig2.gif b/web/content/docs/benchmarks/reactive-transport/radionuclide/radionuclide/Fig2.gif similarity index 100% rename from web/content/docs/benchmarks/reactive-transport/radionuclide/Fig2.gif rename to web/content/docs/benchmarks/reactive-transport/radionuclide/radionuclide/Fig2.gif diff --git a/web/content/docs/benchmarks/reactive-transport/radionuclide/radionuclide/index.md b/web/content/docs/benchmarks/reactive-transport/radionuclide/radionuclide/index.md index 6801dfc261..1ecbd88974 100644 --- a/web/content/docs/benchmarks/reactive-transport/radionuclide/radionuclide/index.md +++ b/web/content/docs/benchmarks/reactive-transport/radionuclide/radionuclide/index.md @@ -66,7 +66,7 @@ The temporal evolution of the concentration profiles of the chosen mineral combi On the other hand, the enormous difference between sorbing and non-sorbing reactive transport is evident from the resulting concentration profiles. Therefore, we highlight the importance of considering the impact of sorption in the transport of radionuclides, as this is paramount for the safety assessment in the design of nuclear waste repositories. Finally, the CPU time of the simulation taking into account surface complexation is roughly double of the simulation with only aqueous speciation. This posses the necessity of choosing a good compromise between accuracy (large number of reactions and chemical parameters) and performance. -{{< img src="../Fig2.gif" title="Time evolution of mineral combination 2 (albite/hematite) in comparison to the results obtained with the ESTRAL database. The green dotted line shows the temporal evolution of U(IV) as a non-sorbing radionuclide.">}} +{{< img src="Fig2.gif" title="Time evolution of mineral combination 2 (albite/hematite) in comparison to the results obtained with the ESTRAL database. The green dotted line shows the temporal evolution of U(IV) as a non-sorbing radionuclide.">}} {{< data-link >}} @@ -76,4 +76,4 @@ Parkhurst, D.L., Appelo, C.A.J., 2013. Description of Input and Examples for PHR Noseck, U., Britz, S., Fricke, J., Gehrke, A., Fluegge, J., Brendler, V., ... & Lampe, M. (2018). Smart K d-concept for long-term safety assessments. Extension towards more complex applications (No. GRS--500). Gesellschaft fuer Anlagen-und Reaktorsicherheit (GRS) gGmbH. -Thoenen, T., Hummel, W., Berner, U., & Curti, E. (2014). *The PSI/Nagra Chemical Thermodynamic Database 12/07*. \ No newline at end of file +Thoenen, T., Hummel, W., Berner, U., & Curti, E. (2014). *The PSI/Nagra Chemical Thermodynamic Database 12/07*. diff --git a/web/content/docs/benchmarks/reactive-transport/wetland/Wetland_1d.gif b/web/content/docs/benchmarks/reactive-transport/wetland/Wetland/Wetland_1d.gif similarity index 100% rename from web/content/docs/benchmarks/reactive-transport/wetland/Wetland_1d.gif rename to web/content/docs/benchmarks/reactive-transport/wetland/Wetland/Wetland_1d.gif diff --git a/web/content/docs/benchmarks/reactive-transport/wetland/Wetland/index.md b/web/content/docs/benchmarks/reactive-transport/wetland/Wetland/index.md index 6ea67f1ac8..40ac6da103 100644 --- a/web/content/docs/benchmarks/reactive-transport/wetland/Wetland/index.md +++ b/web/content/docs/benchmarks/reactive-transport/wetland/Wetland/index.md @@ -98,7 +98,7 @@ For instance, the difference between the OGS-6 and the OGS-5 computation for the The relatively high error may be associated with the missing transport or charge in the OGS-6 simulation, which affects computations by Phreeqc. Please note that due to the long computation time of the simulation (~13 h), the corresponding test (Wetland_1d.prj) is reduced to the first four time steps (28800 s). -{{< img src="../Wetland_1d.gif" title="Fig. 3: Simulated concentrations of solutes (left) and bacteria (right). Solid lines represent solutions by OGS-5; dashed lines represent solution by OGS-6.">}} +{{< img src="Wetland_1d.gif" title="Fig. 3: Simulated concentrations of solutes (left) and bacteria (right). Solid lines represent solutions by OGS-5; dashed lines represent solution by OGS-6.">}} ----------------------------------------- diff --git a/web/layouts/shortcodes/img.html b/web/layouts/shortcodes/img.html index e35514f840..62efef8695 100644 --- a/web/layouts/shortcodes/img.html +++ b/web/layouts/shortcodes/img.html @@ -1,18 +1,28 @@ -
- {{ with .Get "link"}}{{ end }} - +
+ {{ with .Get "link"}}{{ end }} + {{ $src := .Get "src" }} + {{ $resource := .Page.Resources.GetMatch $src }} + {{ with .Get {{ if .Get "link"}}{{ end }} - {{ if or (or (.Get "title") (.Get "caption")) (.Get "attr")}} -
{{ if isset .Params "title" }} -

{{ .Get "title" | markdownify }}

{{ end }} - {{ if or (.Get "caption") (.Get "attr")}}

- {{ .Get "caption" | markdownify }} - {{ with .Get "attrlink"}} {{ end }} - {{ .Get "attr" }} - {{ if .Get "attrlink"}} {{ end }} -

{{ end }} -
+ {{ if or (or (.Get "title") (.Get "caption")) (.Get "attr")}} +
+ {{ if isset .Params "title" }} +

{{ .Get "title" | markdownify }}

{{ end }} + {{ if or (.Get "caption") (.Get "attr")}} +

+ {{ .Get "caption" | markdownify }} + {{ with .Get "attrlink"}} {{ end }} + {{ .Get "attr" }} + {{ if .Get "attrlink"}} {{ end }} +

+ {{ end }} +
+ {{ end }}
-- GitLab From bf98e8429242eaba18348f96d6a35f5e3f4cf844 Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Tue, 29 Mar 2022 15:53:30 +0200 Subject: [PATCH 17/17] [ci] Update black in pre-commit. https://github.com/psf/black/issues/2964 --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2345f41cbf..95c9e8e21a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -26,8 +26,8 @@ repos: language: system files: '.*\.cpp' stages: [commit, manual] - - repo: https://github.com/ambv/black - rev: 20.8b1 + - repo: https://github.com/psf/black + rev: 22.3.0 hooks: - id: black exclude: "ThirdParty|LinearMFront/generate_ref.py" -- GitLab

Download Video: -"MP4" +"MP4"