# Conflicts:
#	gpu.cmake

Merge new StressBC, new Probes and various small changes from UU

See merge request irmb/VirtualFluids_dev!98

Use coverage_report instead of cobertura in .gitlab-ci.yml file

See merge request irmb/VirtualFluids_dev!100

cobertura was removed in gitlab 15.0 --> https://git.rz.tu-bs.de/help/ci/yaml/artifacts_reports.md

Use coverage_report:cobertura instead of cobertura in .gitlab-ci.yml file

See merge request irmb/uppsala/VirtualFluids_dev!5

pull latest changes from upstream develop

Flag causes mpi compiler bug in GPU version - fixed + grid generator fix

See merge request irmb/VirtualFluids_dev!99

(cherry picked from commit f931849c)

(cherry picked from commit 9a2ba67f)

merge wall_model into fresh upstream develop

added WallModelProbe, replaced PostProcessingVariable with Statistic in Probe (and all derived classes) and added some documentation

Added SG model to StressBC, added Timer-class which wraps existing timer in Simulation, added round-off correction in TurbulentViscosityCumulantK17CompChim_Device (testing ongoing)

Run analyse job also manual on forks.

See merge request irmb/VirtualFluids_dev!97