Skip to content
Snippets Groups Projects
Select Git revision
No matching results
An error occurred while fetching branches. Retry the search.
An error occurred while fetching tags. Retry the search.
Blame Permalink
  • Tomáš Oberhuber's avatar
    2250e28c
    Merge branch 'mhfem' into revisions · 2250e28c
    Tomáš Oberhuber authored 
    Conflicts:
	src/core/arrays/tnlStaticArray.h
	src/core/arrays/tnlStaticArray1D_impl.h
	src/core/arrays/tnlStaticArray2D_impl.h
	src/core/arrays/tnlStaticArray3D_impl.h
	src/core/arrays/tnlStaticArray_impl.h
	src/core/vectors/tnlSharedVector.h
	src/core/vectors/tnlStaticVector.h
	src/functions/tnlFunctionEnumerator_impl.h
	src/functions/tnlTestFunction.h
	src/solvers/linear/krylov/tnlGMRESSolver_impl.h
	src/solvers/linear/krylov/tnlTFQMRSolver_impl.h
	src/solvers/tnlSolverConfig_impl.h
	tools/src/tnl-cuda-arch.cu
    2250e28c
    History
    Merge branch 'mhfem' into revisions
    Tomáš Oberhuber authored 
    Conflicts:
	src/core/arrays/tnlStaticArray.h
	src/core/arrays/tnlStaticArray1D_impl.h
	src/core/arrays/tnlStaticArray2D_impl.h
	src/core/arrays/tnlStaticArray3D_impl.h
	src/core/arrays/tnlStaticArray_impl.h
	src/core/vectors/tnlSharedVector.h
	src/core/vectors/tnlStaticVector.h
	src/functions/tnlFunctionEnumerator_impl.h
	src/functions/tnlTestFunction.h
	src/solvers/linear/krylov/tnlGMRESSolver_impl.h
	src/solvers/linear/krylov/tnlTFQMRSolver_impl.h
	src/solvers/tnlSolverConfig_impl.h
	tools/src/tnl-cuda-arch.cu