fix conflicts after merge upstream (f03b9d22) · 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

f03b9d22

Commit f03b9d22 authored 1 year ago by Kutscher

Downloads
- Patches
- Plain Diff

fix conflicts after merge upstream

parent 7bea01be

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

apps/cpu/ConcreteExtrusion/ConcreteExtrusion.cpp 1 addition, 1 deletion

apps/cpu/ConcreteExtrusion/ConcreteExtrusion.cpp
apps/cpu/JetBreakup/JetBreakup.cpp 29 additions, 7 deletions

apps/cpu/JetBreakup/JetBreakup.cpp
apps/cpu/Nozzle/nozzleSinglePhase.cpp 1 addition, 1 deletion

apps/cpu/Nozzle/nozzleSinglePhase.cpp
apps/cpu/NozzleMultiphase/nozzleMultiPhase.cpp 1 addition, 1 deletion

apps/cpu/NozzleMultiphase/nozzleMultiPhase.cpp
apps/cpu/ShotcreteJet/jet.cpp 1 addition, 1 deletion

apps/cpu/ShotcreteJet/jet.cpp
src/cpu/LiggghtsCoupling/SimulationObserver/LiggghtsCouplingSimulationObserver.cpp 1 addition, 1 deletion

...SimulationObserver/LiggghtsCouplingSimulationObserver.cpp
src/cpu/VirtualFluidsCore/SimulationObservers/ShearStressSimulationObserver.cpp 1 addition, 1 deletion

...ore/SimulationObservers/ShearStressSimulationObserver.cpp

with 35 additions and 13 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