diff --git a/.gitignore b/.gitignore index 182a78aa1f85b2b69ac85452b2d87fbd87e68e56..285f67f351ae8abf4d088f0364417b2f55d4883d 100644 --- a/.gitignore +++ b/.gitignore @@ -16,10 +16,17 @@ __pycache__/ .devcontainer/ .sync/ .idea/ +.vscode-server # Simulation results output/ logs/ +# Input files +stl/ + +# Scripts +scripts/ + # MacOS .DS_Store diff --git a/CMakeLists.txt b/CMakeLists.txt index 5805108c4864dbdb2eca3a497ae876503524a429..d7aae3233d1f17e804e29ba3090d7a3bc9ca8a3f 100644 --- a/CMakeLists.txt +++ b/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 diff --git a/Containers/dockerfiles/Ubuntu20_04.Dockerfile b/Containers/dockerfiles/Ubuntu20_04.Dockerfile index 537efec86ec7b20f23e966c5b65acf4a1ce91316..93ff4f896b6ce1518661bb343ed2bfd94ebbbf89 100644 --- a/Containers/dockerfiles/Ubuntu20_04.Dockerfile +++ b/Containers/dockerfiles/Ubuntu20_04.Dockerfile @@ -45,4 +45,4 @@ RUN apt-get update && \ pyvista \ numpy \ ansible \ - gcovr==5.1 \ No newline at end of file + 'jinja2<3.1' gcovr==5.0