Skip to content
Snippets Groups Projects
Unverified Commit 622bd013 authored by Lars Bilke's avatar Lars Bilke
Browse files

[web] Fixed pre-commit.

parent adb26612
No related branches found
No related tags found
No related merge requests found
File added
......@@ -74,7 +74,7 @@ The following table shows an overview of all input parameters available in the C
| Fluid density | $\rho$ |[kg/m$^{3}$] |[Link](https://doxygen.opengeosys.org/d1/d47/ogs_file_param__material__fluid__density.html) |
| Intrinsic permeability |$\textbf{k}$|[m$^{2}$] | [Link](https://doxygen.opengeosys.org/d5/d06/ogs_file_param__material__porous_medium__permeability.html),[Example](https://gitlab.opengeosys.org/ogs/ogs/-/blob/master/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d.prj) |
| Dynamic viscosity | $\mu$ |[Pa$\cdot$s]|[Link](https://doxygen.opengeosys.org/da/d5d/ogs_file_param__material__fluid__viscosity.html)|
| Gravity vector (specific body force) | $\textbf{g}$|[m/s$^{2}$] | | [Link](https://doxygen.opengeosys.org/db/d19/ogs_file_param__prj__processes__process__componenttransport__specific_body_force)
| Gravity vector (specific body force) | $\textbf{g}$|[m/s$^{2}$] | [Link](https://doxygen.opengeosys.org/db/d19/ogs_file_param__prj__processes__process__componenttransport__specific_body_force) |
| Retardation factor | $R$ |[-] | [Example](https://doxygen.opengeosys.org/d0/d40/ogs_ctest_prj__parabolic__componenttransport__advectiondiffusionsorptiondecay__1d_advectiondiffusionsorptiondecay__prj) |
| First-order decay constant | $\lambda$ |[1/s] | [Example](https://doxygen.opengeosys.org/d0/d40/ogs_ctest_prj__parabolic__componenttransport__advectiondiffusionsorptiondecay__1d_advectiondiffusionsorptiondecay__prj) |
......@@ -87,7 +87,7 @@ In the `ComponentTransport` process, the configuration is as follows.
* `<name>`: name of the chemical component.
* `<type>`: must be `ComponentTransport`.
* `<integration_order>`: This is the order of the integration method for element-wise integration. In common cases set to `2`.
* `<process_variables>`: The primary variables of the `ComponentTransport` process are either `<concentration>` or `<pressure>`. For the variable concentration, the name of the chemical component is given. Like in the following example, there are 3 chemical components, i.e. Si, Al and Cl. The `<pressure>` process' variable is also named 'pressure', see `<process_variables>` section outside of process' definition.
* `<process_variables>`: The primary variables of the `ComponentTransport` process are either `<concentration>` or `<pressure>`. For the variable concentration, the name of the chemical component is given. Like in the following example, there are 3 chemical components, i.e. Si, Al and Cl. The `<pressure>` process' variable is also named 'pressure', see `<process_variables>` section outside of process' definition.
```xml
<processes>
......
diff --git a/scripts/cmake/DependenciesExternalProject.cmake b/scripts/cmake/DependenciesExternalProject.cmake
index 0e1470fe249..87961bcd3b6 100644
--- a/scripts/cmake/DependenciesExternalProject.cmake
+++ b/scripts/cmake/DependenciesExternalProject.cmake
@@ -63,7 +63,9 @@ if(OGS_USE_MFRONT)
set(_py_boost_comp
"python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}"
)
- find_package(Boost ${ogs.minimum_version.boost} COMPONENTS ${_py_boost_comp})
+ find_package(
+ Boost ${ogs.minimum_version.boost} COMPONENTS ${_py_boost_comp}
+ )
if(Boost_${_py_boost_comp}_FOUND)
set(_tfel_cmake_args
"-DPython_ADDITIONAL_VERSIONS=${_py_version_major_minor}"
@@ -270,13 +272,14 @@ if(NOT ZLIB_FOUND)
${build_dir_ZLIB}/${CMAKE_INSTALL_BINDIR}/zlib${_zlib_debug_postfix}${CMAKE_SHARED_LIBRARY_SUFFIX}
)
# requires CMake 3.24 to be effective:
- set(ZLIB_USE_STATIC_LIBS "ON")
- set(ZLIB_ROOT ${build_dir_ZLIB})
+ set(ZLIB_USE_STATIC_LIBS "ON" CACHE BOOL "" FORCE)
+ set(ZLIB_ROOT ${build_dir_ZLIB} CACHE PATH "" FORCE)
# Force local zlib build, found netcdf-installed zlib sometimes
set(ZLIB_LIBRARIES
${build_dir_ZLIB}/${CMAKE_INSTALL_LIBDIR}/zlibstatic${_zlib_debug_postfix}${CMAKE_STATIC_LIBRARY_SUFFIX}
+ CACHE STRING "" FORCE
)
- set(ZLIB_INCLUDE_DIRS ${build_dir_ZLIB})
+ set(ZLIB_INCLUDE_DIRS ${build_dir_ZLIB} CACHE STRING "" FORCE)
endif()
set(_EXT_LIBS ${_EXT_LIBS} ZLIB CACHE INTERNAL "")
endif()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment