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 56ae730af120b57965ebcac83f592ba4f6b80998..901ff2246f35d97fd61a3c97f23e297d8b7f8b6c 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 231516dfb9da4b564a7ff2df9826cff076f0dc4d..3d90c5cfd7ff1b0df922ac27195701ff49456baf 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 dee7413f17c5caceb484568121a188dfbb38dab1..e5e63050e057508187f1f384b5fcd38b5128e48b 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! - -<!-- {{< img src="single_fracture_3D_vs_2D.png" >}} --> 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 414428f91abe5459cf0a261b9568b0c2a7120712..4c91a63b4e739c334f5f80a53deb6ceb44e30ed6 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 6801dfc261d1a3391721c7103371207d61422b30..1ecbd88974bc5f2ad5bbbd0be4c9856d1e789e45 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 6ea67f1ac8a187484e00a4d6339b9be45fb1261a..40ac6da10396917ef8d06d7917b37e673587e0be 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 e35514f8403ad783e340a1abff4c2d30ca640566..62efef869537515c650d410f57ae99584bf0bc9e 100644 --- a/web/layouts/shortcodes/img.html +++ b/web/layouts/shortcodes/img.html @@ -1,18 +1,28 @@ <!-- img --> -<figure class="img-responsive{{ with .Get "class" }} {{.}}{{ end }}"> - {{ with .Get "link"}}<a href="{{.}}">{{ end }} - <img src="{{ .Get "src" }}" {{ if or (.Get "alt") (.Get "caption") }}alt="{{ with .Get "alt"}}{{.}}{{else}}{{ .Get "caption" }}{{ end }}"{{ end }} /> +<figure class="img-responsive{{ with .Get " class" }} {{.}}{{ end }}"> + {{ with .Get "link"}}<a href="{{.}}">{{ end }} + {{ $src := .Get "src" }} + {{ $resource := .Page.Resources.GetMatch $src }} + <img src="data:{{ $resource.MediaType }};base64,{{ $resource.Content | base64Encode }}" + {{ if or (.Get "alt" ) (.Get "caption" ) }} + alt="{{ with .Get " alt"}}{{.}}{{else}}{{ .Get "caption" }}{{ end }}" + {{ end }} + /> {{ if .Get "link"}}</a>{{ end }} - {{ if or (or (.Get "title") (.Get "caption")) (.Get "attr")}} - <figcaption>{{ if isset .Params "title" }} - <h4>{{ .Get "title" | markdownify }}</h4>{{ end }} - {{ if or (.Get "caption") (.Get "attr")}}<p> - {{ .Get "caption" | markdownify }} - {{ with .Get "attrlink"}}<a href="{{.}}"> {{ end }} - {{ .Get "attr" }} - {{ if .Get "attrlink"}}</a> {{ end }} - </p> {{ end }} - </figcaption> + {{ if or (or (.Get "title") (.Get "caption")) (.Get "attr")}} + <figcaption> + {{ if isset .Params "title" }} + <h4>{{ .Get "title" | markdownify }}</h4> {{ end }} + {{ if or (.Get "caption") (.Get "attr")}} + <p> + {{ .Get "caption" | markdownify }} + {{ with .Get "attrlink"}}<a href="{{.}}"> {{ end }} + {{ .Get "attr" }} + {{ if .Get "attrlink"}}</a> {{ end }} + </p> + {{ end }} + </figcaption> + {{ end }} </figure> <!-- img -->