Resolving conflict
Showing
- configure.ac 10 additions, 2 deletionsconfigure.ac
- m4/ax_petsc_lib.m4 4 additions, 2 deletionsm4/ax_petsc_lib.m4
- run.sh 14 additions, 0 deletionsrun.sh
- src/FiniteDifference/Average.hpp 7 additions, 7 deletionssrc/FiniteDifference/Average.hpp
- src/FiniteDifference/eq_unit_test_3d.hpp 19 additions, 21 deletionssrc/FiniteDifference/eq_unit_test_3d.hpp
- src/Makefile.am 2 additions, 2 deletionssrc/Makefile.am
- src/Matrix/SparseMatrix_petsc.hpp 20 additions, 0 deletionssrc/Matrix/SparseMatrix_petsc.hpp
- src/Operators/Vector/vector_dist_operators.hpp 6 additions, 1 deletionsrc/Operators/Vector/vector_dist_operators.hpp
- src/Operators/Vector/vector_dist_operators_functions.hpp 0 additions, 8 deletionssrc/Operators/Vector/vector_dist_operators_functions.hpp
Loading
Please register or sign in to comment