Skip to content
Snippets Groups Projects
Commit cf0ef449 authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Merge branch 'develop' into hamilton-jacobi

Conflicts:
	CMakeLists.txt
	TODO
	build
	examples/CMakeLists.txt
	examples/hamilton-jacobi-parallel-map/no-Makefile
	examples/hamilton-jacobi-parallel/no-Makefile
	examples/hamilton-jacobi/HamiltonJacobiProblem.h
	examples/hamilton-jacobi/HamiltonJacobiProblemSetter.h
	examples/hamilton-jacobi/Makefile
	examples/hamilton-jacobi/main.cpp
	examples/heat-equation/tnl-heat-equation.h
	examples/inviscid-flow/2d/run-euler
	examples/mean-curvature-flow/Makefile
	examples/navier-stokes/navierStokesBoundaryConditions_impl.h
	examples/navier-stokes/navierStokesSolverMonitor_impl.h
	examples/simple-solver/Makefile
	examples/simple-solver/simpleProblemSetter.h
	src/core/CMakeLists.txt
	src/core/arrays/tnlArray_impl.h
	src/core/arrays/tnlConstSharedArray_impl.h
	src/core/arrays/tnlMultiArray1D_impl.h
	src/core/arrays/tnlMultiArray2D_impl.h
	src/core/arrays/tnlMultiArray3D_impl.h
	src/core/arrays/tnlMultiArray4D_impl.h
	src/core/arrays/tnlSharedArray_impl.h
	src/core/images/tnlPGMImage_impl.h
	src/core/terminal-colors.h
	src/core/tnlCudaDeviceInfo.cpp
	src/core/tnlCudaDeviceInfo.cu
	src/core/tnlCudaDeviceInfo.h
	src/core/tnlFile.h
	src/core/tnlHost.cpp
	src/core/tnlLogger.cpp
	src/core/tnlObject.cpp
	src/core/tnlStaticMultiIndex.h
	src/core/tnlTimerCPU.cpp
	src/core/tnlTimerRT.cpp
	src/core/vectors/tnlMultiVector1D_impl.h
	src/core/vectors/tnlMultiVector2D_impl.h
	src/core/vectors/tnlMultiVector3D_impl.h
	src/core/vectors/tnlMultiVector4D_impl.h
	src/core/vectors/tnlVectorOperationsHost_impl.h
	src/core/vectors/tnlVector_impl.h
	src/functions/CMakeLists.txt
	src/functions/tnlDomain.h
	src/functions/tnlMeshFunction.h
	src/functions/tnlMeshFunctionVTKWriter.h
	src/functions/tnlMeshFunctionVTKWriter_impl.h
	src/functions/tnlMeshFunction_impl.h
	src/functions/tnlTestFunction.h
	src/functions/tnlTestFunction_impl.h
	src/implementation/core/tnlHost.cpp
	src/legacy/benchmarks/tnlSpmvBenchmarkBase_impl.h
	src/legacy/benchmarks/tnlSpmvBenchmarkHybridMatrix.h
	src/legacy/matrices/tnlAdaptiveRgCSRMatrix.h
	src/legacy/matrices/tnlCSRMatrix.h
	src/legacy/matrices/tnlEllpackMatrix.h
	src/legacy/matrices/tnlFastCSRMatrix.h
	src/legacy/matrices/tnlFastRgCSRMatrix.h
	src/legacy/matrices/tnlFastRgCSRMatrixCUDA.h
	src/legacy/matrices/tnlRgCSRMatrix.h
	src/legacy/solvers/tnlMatrixSolver.h
	src/matrices/tnlCSRMatrix_impl.h
	src/matrices/tnlDenseMatrix.h
	src/matrices/tnlDenseMatrix_impl.h
	src/matrices/tnlEllpackMatrix_impl.h
	src/matrices/tnlMultidiagonalMatrix_impl.h
	src/matrices/tnlSlicedEllpackMatrix_impl.h
	src/matrices/tnlTridiagonalMatrix_impl.h
	src/mesh/grids/tnlGrid1D_impl.h
	src/mesh/grids/tnlGrid2D_impl.h
	src/mesh/grids/tnlGrid3D_impl.h
	src/mesh/grids/tnlGridTraverser.h
	src/mesh/grids/tnlGridTraverser_impl.h
	src/mesh/grids/tnlTraverser_Grid1D.h
	src/mesh/initializer/tnlMeshSuperentityStorageInitializer.h
	src/mesh/traits/tnlDimensionsTraits.h
	src/operators/CMakeLists.txt
	src/operators/diffusion/nonlinear-diffusion-operators/tnlFiniteVolumeNonlinearOperator.h
	src/operators/diffusion/nonlinear-diffusion-operators/tnlFiniteVolumeNonlinearOperator_impl.h
	src/operators/diffusion/tnlExactMeanCurvature.h
	src/operators/diffusion/tnlExactNonlinearDiffusion.h
	src/operators/diffusion/tnlLinearDiffusion.h
	src/operators/diffusion/tnlLinearDiffusion_impl.h
	src/operators/diffusion/tnlNonlinearDiffusion_impl.h
	src/operators/diffusion/tnlOneSidedMeanCurvature.h
	src/operators/diffusion/tnlOneSidedNonlinearDiffusion.h
	src/operators/euler/fvm/tnlLaxFridrichs_impl.h
	src/operators/geometric/tnlExactGradientNorm.h
	src/operators/hamilton-jacobi/upwind/CMakeLists.txt~
	src/operators/tnlDirichletBoundaryConditions.h
	src/operators/tnlNeumannBoundaryConditions.h
	src/operators/tnlNeumannBoundaryConditions_impl.h
	src/problems/tnlHeatEquationProblem.h
	src/problems/tnlHeatEquationProblem_impl.h
	src/problems/tnlPDEProblem.h
	src/problems/tnlPDEProblem_impl.h
	src/problems/tnlProblem.h
	src/solvers/linear/CMakeLists.txt
	src/solvers/linear/krylov/tnlBICGStabSolver_impl.h
	src/solvers/linear/krylov/tnlCGSolver_impl.h
	src/solvers/linear/krylov/tnlGMRESSolver_impl.h
	src/solvers/linear/krylov/tnlTFQMRSolver.h
	src/solvers/linear/krylov/tnlTFQMRSolver_impl.h
	src/solvers/linear/stationary/tnlSORSolver_impl.h
	src/solvers/ode/tnlEulerSolver_impl.h
	src/solvers/ode/tnlMersonSolver_impl.h
	src/solvers/ode/tnlODESolverMonitor_impl.h
	src/solvers/pde/tnlExplicitTimeStepper.h
	src/solvers/pde/tnlExplicitTimeStepper_impl.h
	src/solvers/pde/tnlExplicitUpdater.h
	src/solvers/pde/tnlExplicitUpdater_impl.h
	src/solvers/pde/tnlLinearSystemAssembler.h
	src/solvers/pde/tnlPDESolver.h
	src/solvers/pde/tnlPDESolver_impl.h
	src/solvers/pde/tnlSemiImplicitTimeStepper.h
	src/solvers/pde/tnlSemiImplicitTimeStepper_impl.h
	src/solvers/tnlBuildConfigTags.h
	src/solvers/tnlIterativeSolver.h
	src/solvers/tnlIterativeSolverMonitor_impl.h
	src/solvers/tnlIterativeSolver_impl.h
	src/solvers/tnlSolverConfig_impl.h
	src/solvers/tnlSolverStarter_impl.h
	src/solvers/tnlSolver_impl.h
	tests/benchmarks/CMakeLists.txt
	tests/benchmarks/tnl-benchmark-simple-heat-equation.h
	tests/benchmarks/tnl-benchmark-spmv.h
	tests/benchmarks/tnl-cuda-benchmarks.h
	tests/long-time-unit-tests/CMakeLists.txt
	tests/unit-tests/core/arrays/CMakeLists.txt
	tests/unit-tests/matrices/CMakeLists.txt
	tests/unit-tests/matrices/tnlRgCSRMatrixTester.h
	tests/unit-tests/operators/diffusion/CMakeLists.txt
	tests/unit-tests/operators/diffusion/tnlOneSidedMeanCurvatureTest.h
	tools/src/functions-benchmark.h
	tools/src/tnl-view.h
	tools/tnl-compile.in
	tools/tnl-quickstart/tnl-quickstart.py
parents 8a70122d 638ed6c7
No related branches found
No related tags found
No related merge requests found
Showing
with 1342 additions and 141 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