resolve merge conflicts (c9425d79) · 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

c9425d79

Commit c9425d79 authored 3 years ago by niikonst

Downloads
- Patches
- Plain Diff

resolve merge conflicts

parent 2be957a0

No related branches found

No related tags found

2 merge requests!171Newest Update,!83Fix MPICommunicator

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

apps/cpu/Applications.cmake 0 additions, 1 deletion

apps/cpu/Applications.cmake
apps/cpu/LaminarTubeFlow/ltf.cpp 1 addition, 1 deletion

apps/cpu/LaminarTubeFlow/ltf.cpp
src/cpu/VirtualFluidsCore/CoProcessors/CalculateTorqueCoProcessor.cpp 0 additions, 19 deletions

...ualFluidsCore/CoProcessors/CalculateTorqueCoProcessor.cpp
src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp 0 additions, 4 deletions

...tualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp

with 1 addition and 25 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