Skip to content
Snippets Groups Projects
  • Vít Hanousek's avatar
    8fc0b0a1
    Merge branch 'develop' into MIC-devel · 8fc0b0a1
    Vít Hanousek authored
    Conflicts:
    	CMakeLists.txt
    	build
    	src/TNL/Assert.h
    	src/TNL/Containers/SharedArray.h
    	src/TNL/Containers/StaticVector.h
    	src/TNL/Containers/StaticVector1D_impl.h
    	src/TNL/DevicePointer.h
    	src/TNL/Devices/Cuda.h
    	src/TNL/Operators/diffusion/LinearDiffusion_impl.h
    	src/TNL/Problems/HeatEquationProblem_impl.h
    	src/TNL/SharedPointer.h
    	src/TNL/Solvers/PDE/ExplicitUpdater.h
    	src/TNL/Solvers/SolverMonitor.h
    	src/TNL/UniquePointer.h
    8fc0b0a1
    History
    Merge branch 'develop' into MIC-devel
    Vít Hanousek authored
    Conflicts:
    	CMakeLists.txt
    	build
    	src/TNL/Assert.h
    	src/TNL/Containers/SharedArray.h
    	src/TNL/Containers/StaticVector.h
    	src/TNL/Containers/StaticVector1D_impl.h
    	src/TNL/DevicePointer.h
    	src/TNL/Devices/Cuda.h
    	src/TNL/Operators/diffusion/LinearDiffusion_impl.h
    	src/TNL/Problems/HeatEquationProblem_impl.h
    	src/TNL/SharedPointer.h
    	src/TNL/Solvers/PDE/ExplicitUpdater.h
    	src/TNL/Solvers/SolverMonitor.h
    	src/TNL/UniquePointer.h