Merge branch 'develop' of https://git.rz.tu-bs.de/irmb/VirtualFluids_dev into develop (cb4c8bfc) · 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

cb4c8bfc

Commit cb4c8bfc authored 3 years ago by schoen

Downloads
- Plain Diff

Merge branch 'develop' of https://git.rz.tu-bs.de/irmb/VirtualFluids_dev into develop

# Conflicts:
#	src/gpu/VirtualFluids_GPU/GPU/CalcMac27.cu

parents 117a80c4 94f4b537

No related branches found

No related tags found

1 merge request!57Develop

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 3 additions, 1 deletion

.gitlab-ci.yml
src/gpu/VirtualFluids_GPU/GPU/CalcMac27.cu 14 additions, 3 deletions

src/gpu/VirtualFluids_GPU/GPU/CalcMac27.cu
src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/RunLBMKernel.cuh 4 additions, 2 deletions

...nels/BasicKernels/FluidFlow/Compressible/RunLBMKernel.cuh
src/gpu/VirtualFluids_GPU/Kernel/Utilities/DistributionHelper.cu 2 additions, 3 deletions

.../VirtualFluids_GPU/Kernel/Utilities/DistributionHelper.cu
src/gpu/VirtualFluids_GPU/Kernel/Utilities/DistributionHelper.cuh 1 addition, 1 deletion

...VirtualFluids_GPU/Kernel/Utilities/DistributionHelper.cuh

with 24 additions and 10 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