Skip to content
Snippets Groups Projects
Commit 2ed341ba authored by Martin Schönherr's avatar Martin Schönherr
Browse files

Merge remote-tracking branch 'origin/feature/numericalTests' into development/Martin

# Conflicts:
#	src/VirtualFluids_GPU/Init/InitLattice.cpp
#	src/VirtualFluids_GPU/Output/FileWriter.cpp
#	targets/tests/NumericalTestPostProcessing/Utilities/DataPoint/DataPoint.cpp
#	targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunktion/ListLinePlot/MathematicaListLinePlot.cpp
#	targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunktion/ListLinePlot/MathematicaListLinePlot.h
#	targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunktion/PointList/MathematicaPointList.cpp
#	targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunktion/PointList/MathematicaPointList.h
#	targets/tests/NumericalTestPostProcessing/main.cpp
#	targets/tests/NumericalTests/Tests/PhiAndNyTest/PhiAndNyTest.cpp
#	targets/tests/NumericalTests/Utilities/ConfigFileReader/ConfigFileReader.h
#	targets/tests/NumericalTests/Utilities/VirtualFluidSimulationFactory/VirtualFluidSimulationFactoryImp.cpp
parents 1ee9e5d1 734d47d0
No related branches found
No related tags found
No related merge requests found
Showing
with 415 additions and 435 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 to comment