Refactor

Update the master branch to provide a working CI again and small changes since last merge from branch 'refactor'

ci/build_mpi_complete.sh

@@ -14,8 +14,7 @@ mkdir -p build && cd build
 if [[ $? == 0 ]]; then
 
     #CC=/usr/lib64/mpi/gcc/openmpi3/bin/mpicc CXX=/usr/lib64/mpi/gcc/openmpi3/bin/mpicxx FC=/usr/lib64/mpi/gcc/openmpi3/bin/mpif90 ${CMAKE} ..
-    export VTK_DIR=/usr/lib/cmake/vtk-7.1 
-    VTK_DIR=/usr/lib/cmake/vtk-7.1 ${CMAKE} .. -DCM_ALL_FORTRAN=ON -DCM_ALL_USE_F08=ON -DCM_ALL_VORONOI=ON -DCM_ALL_VTK_OUTPUT=ON -DCM_ALL_TESTS=ON -DCM_ALL_AUTO_DOC=ON VTK_DIR=/usr/lib/cmake/vtk-7.1
+    ${CMAKE} .. -DCM_ALL_FORTRAN=ON -DCM_ALL_USE_F08=ON -DCM_ALL_VORONOI=ON -DCM_ALL_VTK_OUTPUT=ON -DCM_ALL_TESTS=ON -DCM_ALL_AUTO_DOC=ON VTK_DIR=/usr/lib/cmake/vtk-7.1
     make VERBOSE=1
     make test