Merge branch 'master' into dem_coupling (1f5f760e) · 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

1f5f760e

Commit 1f5f760e authored 6 years ago by Konstantin Kutscher

Downloads
- Plain Diff

Merge branch 'master' into dem_coupling

# Conflicts:
#	source/Applications/pChannel/configBombadilpChannel.cfg

parents 6f2bafbe a49f3650

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

source/Applications/DLR-F16-Porous/f16.cpp 141 additions, 46 deletions

source/Applications/DLR-F16-Porous/f16.cpp
source/Applications/DLR-F16-Solid/f16.cpp 96 additions, 44 deletions

source/Applications/DLR-F16-Solid/f16.cpp
source/Applications/pChannel/configBombadilpChannel.cfg 4 additions, 2 deletions

source/Applications/pChannel/configBombadilpChannel.cfg
source/Applications/pChannel/pChannel.cpp 167 additions, 21 deletions

source/Applications/pChannel/pChannel.cpp

with 408 additions and 113 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