Merge branch 'develop' of https://git.rz.tu-bs.de/irmb/VirtualFluids_dev into develop (f4908112) · 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

f4908112

Commit f4908112 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 cd5ff2c4 feb05911

No related branches found

No related tags found

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

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

src/basics/geometry3d/GbTriFaceMesh3D.cpp 71 additions, 80 deletions

src/basics/geometry3d/GbTriFaceMesh3D.cpp
src/basics/geometry3d/GbTriFaceMesh3D.h 1 addition, 0 deletions

src/basics/geometry3d/GbTriFaceMesh3D.h
src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp 21 additions, 5 deletions

...re/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp

with 93 additions and 85 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