Merge branch 'dev'

gimli-org · Apr 3, 2018 · 5f134d8 · 5f134d8
2 parents 52dc18a + bc304c9
commit 5f134d8
Show file tree

Hide file tree

Showing 68 changed files with 851 additions and 2,451 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,14 @@
 # Files and filetypes exluded from version control
 # Python standard taken from https://github.com/github/gitignore/blob/master/Python.gitignore
 
+# Documentation
+_build/
+_tutorials_auto/
+_examples_auto/
+_generated/
+# sidebar gallery is created on the fly
+doc/_templates/gallery.html
+
 # Customizations
 *.log
 *.pdf
@@ -14,6 +22,7 @@ command.history
 *.vector
 
 # Gmsh
+*.geo.*
 *.geo
 *.msh
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -162,10 +162,12 @@ function(find_boost_from_distname_file)
     endif()
 endfunction(find_boost_from_distname_file)
 
-if (NOT WIN32)
-    set (USE_BOOST_THREAD FALSE)
-else()
-    set (USE_BOOST_THREAD TRUE)
+if (NOT USE_BOOST_THREAD)
+    if (NOT WIN32)
+        set (USE_BOOST_THREAD FALSE)
+    else()
+        set (USE_BOOST_THREAD TRUE)
+    endif()
 endif()
 
 if (USE_BOOST_THREAD)

diff --git a/README.rst b/README.rst
@@ -58,7 +58,7 @@ regularization on meshes (1D, 2D, 3D) with regular or irregular arrangement are
 available. There is flexible control of all inversion parameters. The default
 inversion framework is based on the generalized Gauss-Newton method.
 
-Please see :ref:`inversion tutorial<tut:inversion>` for examples and more
+Please see :ref:`tut:inversion` for examples and more
 details.
 
 .. _sec:about_gimli_modelling:
@@ -79,7 +79,7 @@ The modelling capabilities of pyGIMLi inlcude:
 * Triangle, Quads, Tetrahedron, Prism and Hexahedron, mixed meshes
 * solver for elliptic problems (Helmholtz-type PDE)
 
-Please see :ref:`modelling tutorial<tut:modelling>` for examples and more details.
+Please see :ref:`tut:modelling` for examples and more details.
 
 License
 -------

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -83,7 +83,7 @@ add_custom_target(sphinxapi
     COMMAND
         cmake -E copy_if_different ${SPHINX_SRC_DIR}/doc/sidebar_gallery.py ${SPHINX_SRCBUILD_DIR}/doc
     COMMAND
-	      sphinx-autogen ${SPHINX_SRC_DIR}/doc/pygimliapi/index.rst -t ${SPHINX_SRC_DIR}/doc/_templates -o ${SPHINX_SRCBUILD_DIR}/doc/pygimliapi/_generated
+	      sphinx-autogen -i ${SPHINX_SRC_DIR}/doc/pygimliapi/index.rst -t ${SPHINX_SRC_DIR}/doc/_templates -o ${SPHINX_SRCBUILD_DIR}/doc/pygimliapi/_generated
     COMMENT
         "Building pygimli api doc"
     DEPENDS

diff --git a/doc/Makefile b/doc/Makefile
@@ -53,7 +53,7 @@ clean:
 	rm -f _templates/gallery.html
 
 api:
-	sphinx-autogen pygimliapi/index.rst -t _templates
+	sphinx-autogen -i pygimliapi/index.rst -t _templates
 
 gallery:
 	python3 ./sidebar_gallery.py

diff --git a/doc/_sphinx-ext/myexec_directive.py b/doc/_sphinx-ext/myexec_directive.py
diff --git a/doc/_sphinx-ext/myliterate_directive.py b/doc/_sphinx-ext/myliterate_directive.py