Merge branch 'develop' into 'develop' (c6111a72) · Commits · iRMB / VirtualFluids · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

V

VirtualFluids
- Activity
- Members
- Labels
- Environments
- Terraform modules

Snippets Groups Projects

c6111a72

Commit c6111a72 authored 4 years ago by Sören Peters

Downloads
- Plain Diff

Merge branch 'develop' into 'develop'

Fixed CMake Cuda workaround and merge conflict error.

See merge request irmb/VirtualFluids_dev!9

parents 4513e369 94aee545

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 12 additions, 2 deletions

.gitlab-ci.yml
CMake/cmake_config_files/PHOENIX.config.cmake 2 additions, 0 deletions

CMake/cmake_config_files/PHOENIX.config.cmake
CMakeLists.txt 20 additions, 15 deletions

CMakeLists.txt
src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp 2 additions, 3 deletions

...re/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp

with 36 additions and 20 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment