diff --git a/.gitmodules b/.gitmodules
index 7d85724fadf9688055e5b7b9009885fad793dbd1..8021c5e26d8d9d95504d93e6dd540d5967e0f09d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,6 +16,7 @@
[submodule "Tests/Data"]
path = Tests/Data
url = https://github.com/ufz/ogs-data
+ shallow = true
[submodule "ThirdParty/vtkGUISupportQt"]
path = ThirdParty/vtkGUISupportQt
url = https://github.com/ufz/vtkGUISupportQt.git
diff --git a/Applications/CLI/ogs.cpp b/Applications/CLI/ogs.cpp
index ad40c3315dd726fb8562b4ed8774e73698375151..af931ac1850c9cf914efbc503e1b31a69c4f4f0e 100644
--- a/Applications/CLI/ogs.cpp
+++ b/Applications/CLI/ogs.cpp
@@ -14,7 +14,11 @@
#include <tclap/CmdLine.h>
#ifndef _WIN32
+#ifdef __APPLE__
+#include <xmmintrin.h>
+#else
#include <cfenv>
+#endif // __APPLE__
#endif // _WIN32
#ifdef USE_PETSC
@@ -111,7 +115,11 @@ int main(int argc, char *argv[])
#ifndef _WIN32 // On windows this command line option is not present.
// Enable floating point exceptions
if (enable_fpe_arg.isSet())
+#ifdef __APPLE__
+ _MM_SET_EXCEPTION_MASK(_MM_GET_EXCEPTION_MASK() & ~_MM_MASK_INVALID);
+#else
feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW);
+#endif // __APPLE__
#endif // _WIN32
BaseLib::RunTime run_time;
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4593697ea34ee04627de520aebe9d924d98db15a..1158fdb69ceb5d913a370cdff20d5e32034c8b9d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@
cmake_minimum_required(VERSION 3.1)
# Set CMake policies
-cmake_policy(SET CMP0011 OLD)
+cmake_policy(SET CMP0011 NEW)
cmake_policy(SET CMP0054 NEW)
# Project name
diff --git a/Jenkinsfile b/Jenkinsfile
index f2ac28a47137873557ed70e4d9616b8d3419d8bc..c51bbc3f72dd079d79e001017259e6d2b6e95054 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -54,13 +54,6 @@ if (helper.isRelease(this)) {
}
}
-builders['docs'] = {
- node('docker') {
- dir('ogs') { checkoutWithTags() }
- load 'ogs/scripts/jenkins/docs.groovy'
- }
-}
-
if (helper.isOriginMaster(this)) {
builders['coverage'] = {
node('docker') {
diff --git a/ProcessLib/LIE/HydroMechanics/Tests.cmake b/ProcessLib/LIE/HydroMechanics/Tests.cmake
index 10be51cf617ad4c06365394928abdaa4238b4aa5..e7e77acf88954326bea11532b163fc0b57510a87 100644
--- a/ProcessLib/LIE/HydroMechanics/Tests.cmake
+++ b/ProcessLib/LIE/HydroMechanics/Tests.cmake
@@ -15,7 +15,7 @@ AddTest(
)
AddTest(
- NAME LIE_HM_single_fracture_3D
+ NAME LARGE_LIE_HM_single_fracture_3D
PATH LIE/HydroMechanics
EXECUTABLE ogs
EXECUTABLE_ARGS single_fracture_3D.prj
diff --git a/ProcessLib/ThermoMechanics/Tests.cmake b/ProcessLib/ThermoMechanics/Tests.cmake
index e4576227ff8ee09007c925fe74a5b72c195bf84c..b5b17e82e7d6e64940b91acec656c62908b7b1eb 100644
--- a/ProcessLib/ThermoMechanics/Tests.cmake
+++ b/ProcessLib/ThermoMechanics/Tests.cmake
@@ -50,7 +50,7 @@ AddTest(
)
AddTest(
- NAME 2D_ThermoElastic_IGLU_Plane_Strain_Quadratic_Mesh
+ NAME LARGE_2D_ThermoElastic_IGLU_Plane_Strain_Quadratic_Mesh
PATH ThermoMechanics
EXECUTABLE ogs
EXECUTABLE_ARGS iglu_quarter_plane_strain_quad.prj
diff --git a/scripts/jenkins/docs.groovy b/scripts/jenkins/docs.groovy
deleted file mode 100644
index c3129e1758e32f6fb5e5f70786e1640b625da7f9..0000000000000000000000000000000000000000
--- a/scripts/jenkins/docs.groovy
+++ /dev/null
@@ -1,43 +0,0 @@
-def defaultCMakeOptions =
- '-DOGS_LIB_BOOST=System ' +
- '-DOGS_LIB_VTK=System ' +
- '-DDOCS_GENERATE_LOGFILE=ON'
-
-def configure = new ogs.configure()
-def build = new ogs.build()
-def post = new ogs.post()
-def helper = new ogs.helper()
-
-def image = docker.image('ogs6/gcc-latex:latest')
-image.pull()
-image.inside() {
- stage('Configure (Docs)') {
- configure.linux(cmakeOptions: defaultCMakeOptions, script: this)
- }
-
- stage('Generate (Docs)') {
- build.linux(script: this, target: 'doc')
- }
-}
-
-stage('Reports (Docs)') {
- publishHTML(target: [allowMissing: false, alwaysLinkToLastBuild: true,
- keepAll: true, reportDir: 'build/docs', reportFiles: 'index.html',
- reportName: 'Doxygen'])
- step([$class: 'WarningsPublisher', canResolveRelativePaths: false,
- messagesPattern: """
- .*DOT_GRAPH_MAX_NODES.
- .*potential recursive class relation.*""",
- parserConfigurations: [[parserName: 'Doxygen', pattern:
- 'build/DoxygenWarnings.log']], unstableTotalAll: '0'])
-}
-
-if (helper.isOriginMaster(this)) {
- stage('Deploy (Docs)') {
- sshagent(credentials: ['www-data_jenkins']) {
- sh 'rsync -a --delete --stats -e "ssh -o StrictHostKeyChecking=no"' +
- ' build/docs/ www-data@jenkins.opengeosys.org:'+
- '/var/www/doxygen.opengeosys.org'
- }
- }
-}
diff --git a/scripts/jenkins/gcc.groovy b/scripts/jenkins/gcc.groovy
index cc9c58f1ac6bcec1d471b573b2db3f1efdb43d4b..8d72688c6cb3f918b1aeb4597c9d54fdd0dd5a8a 100644
--- a/scripts/jenkins/gcc.groovy
+++ b/scripts/jenkins/gcc.groovy
@@ -58,8 +58,8 @@ image.inside(defaultDockerArgs) {
if (helper.isOriginMaster(this)) {
sshagent(credentials: ['www-data_jenkins']) {
- sh 'rsync -a --delete --stats -e "ssh -o StrictHostKeyChecking=no"' +
- ' ogs/web/public/ www-data@jenkins.opengeosys.org:'+
+ sh 'rsync -a --delete --stats ogs/web/public/ ' +
+ 'www-data@jenkins.opengeosys.org:' +
'/var/www/dev.opengeosys.org'
}
} else {
@@ -76,11 +76,30 @@ image.inside(defaultDockerArgs) {
keepDir: true,
script: this
)
- build.linux(script: this)
+ build.linux(script: this, target: 'package doc')
}
}
stage('Post (Linux-Docker)') {
post.publishTestReports 'build/Testing/**/*.xml', 'build/Tests/testrunner.xml'
+
+ publishHTML(target: [allowMissing: false, alwaysLinkToLastBuild: true,
+ keepAll: true, reportDir: 'build/docs', reportFiles: 'index.html',
+ reportName: 'Doxygen'])
+ step([$class: 'WarningsPublisher', canResolveRelativePaths: false,
+ messagesPattern: """
+ .*DOT_GRAPH_MAX_NODES.
+ .*potential recursive class relation.*""",
+ parserConfigurations: [[parserName: 'Doxygen', pattern:
+ 'build/DoxygenWarnings.log']], unstableTotalAll: '0'])
+
+ if (helper.isOriginMaster(this)) {
+ sshagent(credentials: ['www-data_jenkins']) {
+ sh 'rsync -a --delete --stats -e "ssh -o StrictHostKeyChecking=no"' +
+ ' build/docs/ www-data@jenkins.opengeosys.org:'+
+ '/var/www/doxygen.opengeosys.org'
+ }
+ }
+
post.cleanup()
}