Merge branch 'develop' into 'RefactorParameter' (11afc053) · 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

11afc053

Commit 11afc053 authored 1 year ago by Anna Wellmann

Downloads
- Plain Diff

Merge branch 'develop' into 'RefactorParameter'

# Conflicts:
#   apps/gpu/LBM/SphereRefined/SphereRefined.cpp

parents 5047b817 a2283815

No related branches found

No related tags found

1 merge request!256Kernel names changed

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/basics/writer/WbWriterVtkXmlBinary.cpp 76 additions, 187 deletions

src/basics/writer/WbWriterVtkXmlBinary.cpp
src/basics/writer/WbWriterVtkXmlBinary.h 6 additions, 3 deletions

src/basics/writer/WbWriterVtkXmlBinary.h
src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp 17 additions, 1 deletion

src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp
src/gpu/VirtualFluids_GPU/Output/FileWriter.h 6 additions, 2 deletions

src/gpu/VirtualFluids_GPU/Output/FileWriter.h
src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp 3 additions, 3 deletions

src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp
src/gpu/VirtualFluids_GPU/Parameter/Parameter.h 3 additions, 3 deletions

src/gpu/VirtualFluids_GPU/Parameter/Parameter.h

with 111 additions and 199 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