Merge branch 'develop' of https://git.rz.tu-bs.de/k.kutscher/VirtualFluids_dev into develop
# Conflicts: # apps/cpu/ViskomatXL/viskomat.cpp
No related branches found
No related tags found
Showing
- .devcontainer/devcontainer.json 1 addition, 1 deletion.devcontainer/devcontainer.json
- .gitignore 7 additions, 2 deletions.gitignore
- .gitlab-ci.yml 77 additions, 44 deletions.gitlab-ci.yml
- CITATION.cff 40 additions, 0 deletionsCITATION.cff
- CMake/FileUtilities.cmake 16 additions, 16 deletionsCMake/FileUtilities.cmake
- CMake/VirtualFluidsMacros.cmake 9 additions, 4 deletionsCMake/VirtualFluidsMacros.cmake
- CMake/cmake_config_files/MOLLOK.config.cmake 2 additions, 1 deletionCMake/cmake_config_files/MOLLOK.config.cmake
- CMake/cmake_config_files/MULE.config.cmake 4 additions, 1 deletionCMake/cmake_config_files/MULE.config.cmake
- CMake/cmake_config_files/PHOENIX.config.cmake 1 addition, 1 deletionCMake/cmake_config_files/PHOENIX.config.cmake
- CMakeLists.txt 1 addition, 1 deletionCMakeLists.txt
- CMakePresets.json 68 additions, 57 deletionsCMakePresets.json
- MANIFEST.in 1 addition, 0 deletionsMANIFEST.in
- Python/SlurmTests/poiseuille/PoiseuilleTestContainer.def 28 additions, 3 deletionsPython/SlurmTests/poiseuille/PoiseuilleTestContainer.def
- Python/SlurmTests/poiseuille/rocket.yml 23 additions, 0 deletionsPython/SlurmTests/poiseuille/rocket.yml
- Python/SlurmTests/poiseuille/settings.py 39 additions, 6 deletionsPython/SlurmTests/poiseuille/settings.py
- Python/SlurmTests/poiseuille/simulation_runner.py 1 addition, 1 deletionPython/SlurmTests/poiseuille/simulation_runner.py
- Python/SlurmTests/poiseuille/slurm.job 4 additions, 0 deletionsPython/SlurmTests/poiseuille/slurm.job
- Python/acousticscaling.py 48 additions, 15 deletionsPython/acousticscaling.py
- Python/actuator_line/actuator_line.py 178 additions, 65 deletionsPython/actuator_line/actuator_line.py
- Python/actuator_line/config.txt 0 additions, 2 deletionsPython/actuator_line/config.txt
Loading
Please register or sign in to comment