diff --git a/.gitmodules b/.gitmodules
index bdb03687f031d1ddf2c80c73bca9254d17b22821..9d87446c19d3de9a27f8d8d1d123db16a4ba7b00 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -36,7 +36,7 @@
url = https://github.com/ufz/MFrontGenericInterfaceSupport.git
[submodule "ThirdParty/container-maker"]
path = ThirdParty/container-maker
- url = https://github.com/ufz/ogs-container-maker.git
+ url = https://gitlab.opengeosys.org/ogs/container-maker.git
[submodule "ThirdParty/ogs6py"]
path = ThirdParty/ogs6py
url = https://github.com/joergbuchwald/ogs6py.git
diff --git a/Applications/DataExplorer/Base/RecentFiles.cpp b/Applications/DataExplorer/Base/RecentFiles.cpp
index 097568d059b2228d12935b4418eeea1710b7f3c3..3072737a10a9d623bc3c8fd7555b236df9265e49 100644
--- a/Applications/DataExplorer/Base/RecentFiles.cpp
+++ b/Applications/DataExplorer/Base/RecentFiles.cpp
@@ -5,7 +5,7 @@
* \brief Implementation of the RecentFiles class.
*
* \copyright
- * Copyright (c) 2012-2020, OpenGeoSys Community (http://www.opengeosys.net)
+ * Copyright (c) 2012-2020, OpenGeoSys Community (https://www.opengeosys.org)
* Distributed under a Modified BSD License.
* See accompanying file LICENSE.txt or
* http://www.opengeosys.org/project/license
diff --git a/Applications/DataExplorer/VtkVis/NetCdfConfigureDialog.cpp b/Applications/DataExplorer/VtkVis/NetCdfConfigureDialog.cpp
index 34af27d325e6fc74400f2a766048320580b6a777..e10708e06ee66db9aac774868e7dd27cf2530c0c 100644
--- a/Applications/DataExplorer/VtkVis/NetCdfConfigureDialog.cpp
+++ b/Applications/DataExplorer/VtkVis/NetCdfConfigureDialog.cpp
@@ -1,6 +1,6 @@
/**
* \copyright
- * Copyright (c) 2012-2020, OpenGeoSys Community (http://www.opengeosys.net)
+ * Copyright (c) 2012-2020, OpenGeoSys Community (https://www.opengeosys.org)
* Distributed under a Modified BSD License.
* See accompanying file LICENSE.txt or
* http://www.opengeosys.org/project/license
diff --git a/Applications/DataExplorer/VtkVis/NetCdfConfigureDialog.h b/Applications/DataExplorer/VtkVis/NetCdfConfigureDialog.h
index a194754ecbee3afcaf2c93a300de2a820f5fbc1e..a73d15c07bc8abf92893e0b115df3d9561169053 100644
--- a/Applications/DataExplorer/VtkVis/NetCdfConfigureDialog.h
+++ b/Applications/DataExplorer/VtkVis/NetCdfConfigureDialog.h
@@ -1,6 +1,6 @@
/**
* \copyright
- * Copyright (c) 2012-2020, OpenGeoSys Community (http://www.opengeosys.net)
+ * Copyright (c) 2012-2020, OpenGeoSys Community (https://www.opengeosys.org)
* Distributed under a Modified BSD License.
* See accompanying file LICENSE.txt or
* http://www.opengeosys.org/project/license
diff --git a/Applications/DataExplorer/VtkVis/VisualizationWidget.h b/Applications/DataExplorer/VtkVis/VisualizationWidget.h
index db48b6115832b1ba9ce88092837a52a12a6e6876..cadf4b5a0000c54f736417b7e2571a707fbbf43e 100644
--- a/Applications/DataExplorer/VtkVis/VisualizationWidget.h
+++ b/Applications/DataExplorer/VtkVis/VisualizationWidget.h
@@ -64,7 +64,6 @@ public slots:
vtkRenderer* renderer() const { return _vtkRender; }
/// @brief Sets the widgets cursor shape.
- /// @see http://doc.qt.nokia.com/4.7/qt.html#CursorShape-enum
void setCursorShape(Qt::CursorShape shape);
protected slots:
diff --git a/Applications/DataExplorer/mainwindow.cpp b/Applications/DataExplorer/mainwindow.cpp
index 761c98400c137ef2a1be1a0523541554326e7495..6e2f36965993c8a99571531c1951011d871da563 100644
--- a/Applications/DataExplorer/mainwindow.cpp
+++ b/Applications/DataExplorer/mainwindow.cpp
@@ -5,7 +5,7 @@
* \brief Implementation of the MainWindow class.
*
* \copyright
- * Copyright (c) 2012-2020, OpenGeoSys Community (http://www.opengeosys.net)
+ * Copyright (c) 2012-2020, OpenGeoSys Community (https://www.opengeosys.org)
* Distributed under a Modified BSD License.
* See accompanying file LICENSE.txt or
* http://www.opengeosys.org/project/license
diff --git a/Applications/DataExplorer/mainwindow.h b/Applications/DataExplorer/mainwindow.h
index e34df4221c9f62ceb0e763d58f42bbe9c2b492af..1a201db3e722305bd8916ed03351ccb373e5f48d 100644
--- a/Applications/DataExplorer/mainwindow.h
+++ b/Applications/DataExplorer/mainwindow.h
@@ -1,7 +1,7 @@
/**
* \file
* \copyright
- * Copyright (c) 2012-2020, OpenGeoSys Community (http://www.opengeosys.net)
+ * Copyright (c) 2012-2020, OpenGeoSys Community (https://www.opengeosys.org)
* Distributed under a Modified BSD License.
* See accompanying file LICENSE.txt or
* http://www.opengeosys.org/project/license
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 93929975f315d2151bd81268f031864515945321..9e14f508668ae8bd15de6e830fa122546f678c9f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -40,7 +40,6 @@
* [General GitHub documentation](http://help.github.com/)
* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
-* [OGS Jenkins-CI server](https://svn.ufz.de/hudson/job/OGS-6/)
* [OGS Styleguide][styleguide]
-[styleguide]: http://ufz.github.com/styleguide/cppguide.xml
\ No newline at end of file
+[styleguide]: http://ufz.github.com/styleguide/cppguide.xml
diff --git a/Documentation/bibliography/other.bib b/Documentation/bibliography/other.bib
index 6c83ad2c487aae3803c9751a4afd11c7e0c86085..3b8c3bd2de6af76225c2727e760cf153630c6602 100644
--- a/Documentation/bibliography/other.bib
+++ b/Documentation/bibliography/other.bib
@@ -55,8 +55,7 @@
ISSN = {0961-5539},
Keywords = {abstract this paper deals,at the geothermal research,darcian flow behavior was,finite elements,fractured rock,non-,non-linear dynamics,observed in pumping tests,of fluid flow in,pumps,site at soultz-,with theory and computation},
Owner = {localadmin},
- Timestamp = {2015.06.10},
- Url = {http://www.emeraldinsight.com/journals.htm?articleid=877229\&show=abstract}
+ Timestamp = {2015.06.10}
}
@Article{Campbell:2008,
diff --git a/Documentation/mainpage.dox b/Documentation/mainpage.dox
index bbbd5d8cdcb19a87d23f5bd2e5d99ffce43b68a1..81621aabe702a457151b6686f4fdc467bc525b2b 100644
--- a/Documentation/mainpage.dox
+++ b/Documentation/mainpage.dox
@@ -4,11 +4,9 @@
*
* This page only describes the source code itself. See the following links for additional information:
*
- * - Wiki: https://svn.ufz.de/ogs
- * - Developer guide: http://docs.opengeosys.org/docs/devguide
- * - Data Explorer (Gui) manual: http://docs.opengeosys.org/assets/releases/head/docs/DataExplorer-Manual.pdf
+ * - Developer guide: https://opengeosys.org/docs/devguide
+ * - Data Explorer (Gui) manual: https://jenkins.opengeosys.org/job/ufz/job/data_explorer_manual/job/master/lastSuccessfulBuild/artifact/DataExplorer-Manual.pdf
* - Discussion forum: https://discourse.opengeosys.org
- * - Jenkins build server: https://svn.ufz.de/hudson
*
*
* \section internal_modules Internal Modules
diff --git a/GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.cpp b/GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.cpp
index f24722bd472dcde4e7e676b6415b7bbfdb64c234..c414ad5a88cbce08dc7560e7438a46c8592ad8a0 100644
--- a/GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.cpp
+++ b/GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.cpp
@@ -287,7 +287,7 @@ bool BoostXmlGmlInterface::write()
// put header in property tree
pt.put("<xmlattr>.xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
- pt.put("<xmlattr>.xmlns:ogs", "http://www.opengeosys.net");
+ pt.put("<xmlattr>.xmlns:ogs", "https://www.opengeosys.org");
auto& geometry_set = pt.add("OpenGeoSysGLI", "");
geometry_set.add("name", _exportName);
diff --git a/MathLib/Vector3.h b/MathLib/Vector3.h
index 004304a8c3dbb4506ee4b716d24d59cb218592fa..7d982e87209555ebc523358841f7daf2b1e72c38 100644
--- a/MathLib/Vector3.h
+++ b/MathLib/Vector3.h
@@ -3,7 +3,7 @@
* \author Lars Bilke
* \date 2009-10-27
* \brief Definition of the Vector3 class.
- * From: http://www.strout.net/info/coding/classlib/intro.html
+ * From: http://www.strout.net
* with modifications to derive from TemplatePoint
*
* \copyright
diff --git a/NumLib/DOF/LocalToGlobalIndexMap.h b/NumLib/DOF/LocalToGlobalIndexMap.h
index 88b23dcc6ce2d27190db068007e9f5afc0ac3db2..a05df32aab480cb5df5dcc5acb87f7b49d6653b4 100644
--- a/NumLib/DOF/LocalToGlobalIndexMap.h
+++ b/NumLib/DOF/LocalToGlobalIndexMap.h
@@ -44,7 +44,7 @@ class LocalToGlobalIndexMap final
{
// Enables using std::make_unique with private constructors from within
// member functions of LocalToGlobalIndexMap. Cf.
- // http://seanmiddleditch.com/enabling-make_unique-with-private-constructors/
+ // https://seanmiddleditch.com/enabling-make-unique-with-private-constructors/
struct ConstructorTag
{
explicit ConstructorTag() = default;
diff --git a/ThirdParty/container-maker b/ThirdParty/container-maker
index 1260fd50f674c4c00ce719d97c5c2bad275f2765..e12696ff7cf4ee03d94e34f6b9d3615f43befeb9 160000
--- a/ThirdParty/container-maker
+++ b/ThirdParty/container-maker
@@ -1 +1 @@
-Subproject commit 1260fd50f674c4c00ce719d97c5c2bad275f2765
+Subproject commit e12696ff7cf4ee03d94e34f6b9d3615f43befeb9
diff --git a/scripts/ci/extends/rules-master-manual.yml b/scripts/ci/extends/rules-master-manual.yml
index 57e526cd403efe06aefa598d3eae3ac5648e5b86..35c0f41b3341e7a071a27b8754bb45780386fa7d 100644
--- a/scripts/ci/extends/rules-master-manual.yml
+++ b/scripts/ci/extends/rules-master-manual.yml
@@ -1,5 +1,5 @@
.rules-master-manual:
rules:
- - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
+ - if: '$CI_COMMIT_BRANCH == "master"'
- when: manual
allow_failure: true
diff --git a/scripts/ci/jobs/build-docs.yml b/scripts/ci/jobs/build-docs.yml
index b4545e593c0ccb77613cfd84689d5b3fd8c8330f..f5b174f0d6776170fcc18eb2c0ea69bc5c3559fd 100644
--- a/scripts/ci/jobs/build-docs.yml
+++ b/scripts/ci/jobs/build-docs.yml
@@ -4,6 +4,8 @@ build docs:
name: $CONTAINER_GCC_IMAGE
before_script:
+ # HACK to easier linking to the generated pages
+ - echo '<meta http-equiv="REFRESH" content="0;URL=build/docs/index.html">' >> Doxygen.html
- mkdir -p build
- cd build
@@ -13,5 +15,7 @@ build docs:
artifacts:
expose_as: 'Doxygen'
- paths: ['build/docs/']
+ paths:
+ - Doxygen.html
+ - build/docs/
expire_in: 1 week
diff --git a/scripts/ci/jobs/build-gui-linux.yml b/scripts/ci/jobs/build-gui-linux.yml
index ad4040fa255121b59e1c5087c880b07bd5d53c28..c69a7edd4bc5ba5536ad0ceb40214694dc8f1e2f 100644
--- a/scripts/ci/jobs/build-gui-linux.yml
+++ b/scripts/ci/jobs/build-gui-linux.yml
@@ -8,7 +8,7 @@ build gui linux:
- job: build linux
artifacts: false
rules:
- - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
+ - if: '$CI_COMMIT_BRANCH == "master"'
- changes:
- Applications/DataExplorer/**/*
- when: manual
diff --git a/scripts/ci/jobs/build-gui-mac.yml b/scripts/ci/jobs/build-gui-mac.yml
index 4b8d86c3b0d4aaa66838aa62c448e69beb139027..476482cffc63a16e0e5fa6979e565c1d68a5a5c8 100644
--- a/scripts/ci/jobs/build-gui-mac.yml
+++ b/scripts/ci/jobs/build-gui-mac.yml
@@ -7,7 +7,7 @@ build gui mac:
tags:
- mac
rules:
- - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
+ - if: '$CI_COMMIT_BRANCH == "master"'
- changes:
- Applications/DataExplorer/**/*
- when: manual
diff --git a/scripts/ci/jobs/build-gui-win.yml b/scripts/ci/jobs/build-gui-win.yml
index d19123916365d89c4af34665bae99dc871226f43..504e63bdf75e8ad1a5e1bb05dad08fdc7c6cf0e9 100644
--- a/scripts/ci/jobs/build-gui-win.yml
+++ b/scripts/ci/jobs/build-gui-win.yml
@@ -5,7 +5,7 @@ build gui win:
- job: build win
artifacts: false
rules:
- - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
+ - if: '$CI_COMMIT_BRANCH == "master"'
- changes:
- Applications/DataExplorer/**/*
- when: manual
diff --git a/scripts/ci/jobs/build-linux-frontend.yml b/scripts/ci/jobs/build-linux-frontend.yml
index 113ec15e129ad2c4ec1c58a70d8f28de464cf3fb..594264ef42ada913f40174a555eea018d38ac9a1 100644
--- a/scripts/ci/jobs/build-linux-frontend.yml
+++ b/scripts/ci/jobs/build-linux-frontend.yml
@@ -3,7 +3,7 @@ build linux frontend:
tags:
- frontend1
rules:
- - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
+ - if: '$CI_COMMIT_BRANCH == "master"'
- when: manual
allow_failure: true
diff --git a/scripts/ci/jobs/build_image.yml b/scripts/ci/jobs/build_image.yml
index 12f6a4544de269b8c74fc02c88a74a854332dc3b..9d9e1ba86b485ce06915b9f43ebd2151930e0d7f 100644
--- a/scripts/ci/jobs/build_image.yml
+++ b/scripts/ci/jobs/build_image.yml
@@ -14,17 +14,17 @@ build container images:
extends: .container-maker-setup
script:
- docker login -u $OGS_CI_REGISTRY_USER -p $OGS_CI_REGISTRY_PASSWORD $CI_REGISTRY
- - docker pull $CONTAINER_GCC_IMAGE:latest || true
- - python ThirdParty/container-maker/ogscm/cli.py --build --gitlab
+ - docker pull registry.opengeosys.org/ogs/ogs/ogs/gcc:master || true
+ - python ThirdParty/container-maker/ogscm/cli.py --build --ogs off
--pm system --cvode --cppcheck --docs --gcovr
--tag $CONTAINER_GCC_IMAGE --upload
- - docker pull $CONTAINER_GCC_GUI_IMAGE:latest || true
- - python ThirdParty/container-maker/ogscm/cli.py --build --gitlab
+ - docker pull registry.opengeosys.org/ogs/ogs/ogs/gcc-gui:master || true
+ - python ThirdParty/container-maker/ogscm/cli.py --build --ogs off
--pm conan --cvode --cppcheck --docs --gcovr --gui
--tag $CONTAINER_GCC_GUI_IMAGE --upload
- - docker pull $CONTAINER_CLANG_IMAGE:latest || true
- - python ThirdParty/container-maker/ogscm/cli.py --build --gitlab
- --base_image ubuntu:18.04 --compiler clang --compiler_version 9
+ - docker pull registry.opengeosys.org/ogs/ogs/ogs/clang:master || true
+ - python ThirdParty/container-maker/ogscm/cli.py --build --ogs off
+ --compiler clang --compiler_version 9
--tag $CONTAINER_CLANG_IMAGE --upload
### global project images ###
diff --git a/scripts/cmake/DocumentationSetup.cmake b/scripts/cmake/DocumentationSetup.cmake
index 81f31cb06af5c652f38c58ac5ab047f1a9abd7c5..3c0ab7173e9553b8111b4929ae8acb9c8a13aedd 100644
--- a/scripts/cmake/DocumentationSetup.cmake
+++ b/scripts/cmake/DocumentationSetup.cmake
@@ -48,6 +48,7 @@ set(DOXYGEN_ALIASES
"ogs_file_param_special{1} = \\xrefitem ogs_file_param \\\"Input File Parameter\\\" \\\"List of all Input File Parameters\\\" \\ref ogs_file_param__\\1 \\\"\\1\\\""
"ogs_file_attr_special{1} = \\xrefitem ogs_file_param \\\"Input File Parameter\\\" \\\"List of all Input File Parameters\\\" \\ref ogs_file_attr__\\1 \\\"\\1\\\""
"ogs_missing_documentation = \\xrefitem ogs_missing_documentation \\\"Missing Documentation\\\" \\\"OGS Input File Parameters&mdash\;List of incomplete documentation pages\\\" Documentation missing/incomplete")
+set(DOXYGEN_CREATE_SUBDIRS YES)
doxygen_add_docs(doc
${PROJECT_SOURCE_DIR}/