Merge branch 'develop' into developMartin

.gitignore

@@ -16,10 +16,17 @@ __pycache__/
 .devcontainer/
 .sync/
 .idea/
+.vscode-server
 
 # Simulation results
 output/
 logs/
 
+# Input files
+stl/
+
+# Scripts
+scripts/
+
 # MacOS
 .DS_Store

CMakeLists.txt

@@ -170,7 +170,9 @@ endif()
 
 if(BUILD_USE_MPI)
     find_package(MPI REQUIRED)
-    #list(APPEND VF_COMPILER_DEFINITION VF_MPI)
+    if(BUILD_VF_CPU)
+        list(APPEND VF_COMPILER_DEFINITION VF_MPI)
+    endif()
 endif()
 
 # boost

Containers/dockerfiles/Ubuntu20_04.Dockerfile

@@ -45,4 +45,4 @@ RUN apt-get update &&   \
         pyvista          \
         numpy            \
         ansible          \
-        gcovr==5.1
+        'jinja2<3.1' gcovr==5.0
\ No newline at end of file