Merge pull request #1943 from bilke/various-fixes2

Various fixes from #1907

.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

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;

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

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') {

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

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

scripts/jenkins/docs.groovy

-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'
-        }
-    }
-}

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()
 }