.pre-commit-config.yaml

@@ -27,7 +27,7 @@ repos:
         files: '.*\.cpp'
         stages: [commit, manual]
 -   repo: https://github.com/ambv/black
-    rev: stable
+    rev: 20.8b1
     hooks:
     - id: black
       exclude: 'ThirdParty|LinearMFront/generate_ref.py'

Applications/DataExplorer/DataExplorer.cmake

@@ -22,6 +22,7 @@ set(APP_ICON ${SOURCE_DIR_REL}/scripts/packaging/ogs-de-icon.icns)
 
 # Create the executable
 add_executable(DataExplorer main.cpp ${SOURCES} ${UIS} ${APP_ICON} exe-icon.rc)
+target_compile_definitions(DataExplorer PUBLIC $<$<BOOL:${VTK_ADDED}>:VTK_VIA_CPM>)
 
 target_link_libraries(
     DataExplorer

Applications/DataExplorer/DataView/CMakeLists.txt

@@ -131,7 +131,7 @@ if(GEOTIFF_FOUND)
     include_directories(${GEOTIFF_INCLUDE_DIRS})
 endif() # GEOTIFF_FOUND
 
-ogs_add_library(QtDataView ${SOURCES} ${HEADERS} ${UIS})
+ogs_add_library(QtDataView STATIC ${SOURCES} ${HEADERS} ${UIS})
 
 target_link_libraries(
     QtDataView

Applications/DataExplorer/VtkVis/CMakeLists.txt

@@ -132,7 +132,7 @@ include_directories(
     ${GUI_SOURCE_DIR_REL}/VtkModules/Qt
 )
 
-ogs_add_library(VtkVis ${SOURCES} ${HEADERS} ${UIS})
+ogs_add_library(VtkVis STATIC ${SOURCES} ${HEADERS} ${UIS})
 
 if(GEOTIFF_FOUND)
     target_compile_definitions(VtkVis PRIVATE GEOTIFF_FOUND)

Applications/DataExplorer/main.cpp

@@ -9,6 +9,15 @@
 #include "InfoLib/GitInfo.h"
 #include "VtkVis/VtkConsoleOutputWindow.h"
 
+// TODO: Replace this on VTK 9 upgrade, see
+// https://discourse.vtk.org/t/vtk-use-file/3645/2
+#if VTK_VIA_CPM
+#include <vtkAutoInit.h>
+VTK_MODULE_INIT(vtkInteractionStyle)
+VTK_MODULE_INIT(vtkRenderingFreeType)
+VTK_MODULE_INIT(vtkRenderingOpenGL2)
+#endif
+
 int main(int argc, char* argv[])
 {
     // needed to ensure appropriate OpenGL context is created for VTK rendering.

ProcessLib/ComponentTransport/Tests.cmake

@@ -667,9 +667,9 @@ AddTest(
     REQUIREMENTS OGS_USE_MPI
     DIFF_DATA
     TracerSimulation_ts_100_t_100000_000000_0_expected.vtu TracerSimulation_ts_100_t_100000_000000_0.vtu Cs Cs 1e-10 1e-16
-    TracerSimulation_ts_100_t_100000_000000_0_expected.vtu TracerSimulation_ts_100_t_100000_000000_0.vtu pressure pressure 2.5e-5 1.7e-9
+    TracerSimulation_ts_100_t_100000_000000_0_expected.vtu TracerSimulation_ts_100_t_100000_000000_0.vtu pressure pressure 3.0e-5 2.0e-9
     TracerSimulation_ts_100_t_100000_000000_1_expected.vtu TracerSimulation_ts_100_t_100000_000000_1.vtu Cs Cs 1e-10 1e-16
-    TracerSimulation_ts_100_t_100000_000000_1_expected.vtu TracerSimulation_ts_100_t_100000_000000_1.vtu pressure pressure 2.5e-5 1.7e-9
+    TracerSimulation_ts_100_t_100000_000000_1_expected.vtu TracerSimulation_ts_100_t_100000_000000_1.vtu pressure pressure 3.0e-5 2.0e-9
     TracerSimulation_ts_100_t_100000_000000_2_expected.vtu TracerSimulation_ts_100_t_100000_000000_2.vtu Cs Cs 1e-10 1e-16
     TracerSimulation_ts_100_t_100000_000000_2_expected.vtu TracerSimulation_ts_100_t_100000_000000_2.vtu pressure pressure 2.5e-5 1.7e-9
     TracerSimulation_ts_100_t_100000_000000_3_expected.vtu TracerSimulation_ts_100_t_100000_000000_3.vtu Cs Cs 1e-10 1e-16

container-maker @ 56dcaa7d

-Subproject commit f3b23f2ac47237ee1fc2c19b09125b7a23201047
+Subproject commit 56dcaa7d5c0ea2cda99259aa2a896a7bfaa6f8d0

scripts/ci/jobs/build-docs.yml

@@ -3,7 +3,7 @@ build docs:
   tags: [envinf2-shell]
   dependencies: [meta]
   rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_TAG
       variables:
         ON_MASTER: "true"
         DEPLOY: "true"

scripts/ci/jobs/container.yml

@@ -20,19 +20,19 @@ container:
       poetry run ogscm compiler.py ogs.py -B -C -R --ogs ../..
       --build_args ' --progress=plain'
       --cvode --ccache --mfront
-      --cmake_args ' -DOGS_CPU_ARCHITECTURE=sandybridge -DBUILD_TESTING=OFF'
+      --cmake_args ' -DOGS_CPU_ARCHITECTURE=sandybridge -DOGS_BUILD_TESTING=OFF'
       $DOCKER_TAG
     - >
       poetry run ogscm compiler.py mpi.py ogs.py -B -C -R --ogs ../..
       --build_args ' --progress=plain'
       --cvode --ccache
-      --cmake_args ' -DOGS_CPU_ARCHITECTURE=sandybridge -DBUILD_TESTING=OFF'
+      --cmake_args ' -DOGS_CPU_ARCHITECTURE=sandybridge -DOGS_BUILD_TESTING=OFF'
       --base_image 'centos:8' --ompi 4.0.5 --mpi_benchmarks
     - >
       poetry run ogscm compiler.py ogs.py -B -C -R --ogs ../..
       --build_args ' --progress=plain'
       --cvode --ccache
-      --cmake_args ' -DOGS_CPU_ARCHITECTURE=sandybridge -DBUILD_TESTING=OFF'
+      --cmake_args ' -DOGS_CPU_ARCHITECTURE=sandybridge -DOGS_BUILD_TESTING=OFF'
       --gui
   artifacts:
     name: container

scripts/ci/jobs/web.yml

@@ -45,6 +45,7 @@ deploy web site:
   image: $WEB_IMAGE
   needs: ["pre commit"]
   rules:
+    - if: $CI_COMMIT_TAG
     - if: '$CI_COMMIT_BRANCH == "master"'
       changes:
         - web/**/*

scripts/cmake/Functions.cmake

@@ -83,12 +83,20 @@ endfunction()
 
 # Replacement for add_library() for ogs targets
 function(ogs_add_library targetName)
-    foreach(file ${ARGN})
+    set(options STATIC SHARED)
+    cmake_parse_arguments(ogs_add_library "${options}" "" "" ${ARGN})
+
+    foreach(file ${ogs_add_library_UNPARSED_ARGUMENTS})
         get_filename_component(file_path ${file} REALPATH)
         list(APPEND files ${file_path})
     endforeach()
 
-    add_library(${targetName} ${files})
+    if(ogs_add_library_STATIC)
+        set(type STATIC)
+    elseif(ogs_add_library_SHARED)
+        set(type SHARED)
+    endif()
+    add_library(${targetName} ${type} ${files})
     target_compile_options(
         ${targetName}
         PRIVATE # OR does not work with cotire

web/content/releases/6.4.0.md

 +++
-date = "2020-12-18T14:30:13+01:00"
+date = "2021-04-01T14:30:13+01:00"
 title = "OpenGeoSys 6.4.0"
 tag = "6.4.0"
 author = "Lars Bilke"