Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

V

VirtualFluids
- Activity
- Members
- Labels
- Environments
- Terraform modules

Snippets Groups Projects

0fd519d4

Commit 0fd519d4 authored 4 years ago by Soeren Peters

Downloads
- Plain Diff

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

parents f4908112 4513e369

No related branches found

No related tags found

1 merge request!9Fixed CMake Cuda workaround and merge conflict error.

Changes 284

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/cpu/simulationconfig/include/simulationconfig/Simulation.h 24 additions, 24 deletions

...pu/simulationconfig/include/simulationconfig/Simulation.h
src/cpu/simulationconfig/include/simulationconfig/SimulationParameters.h 37 additions, 5 deletions

...ionconfig/include/simulationconfig/SimulationParameters.h
src/cpu/simulationconfig/include/simulationconfig/WriterConfiguration.h 5 additions, 5 deletions

...tionconfig/include/simulationconfig/WriterConfiguration.h
src/cpu/simulationconfig/src/Simulation.cpp 60 additions, 62 deletions

src/cpu/simulationconfig/src/Simulation.cpp

with 126 additions and 96 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