Diffusion PCSCproject c8a754ef1912

solve merge problems
c8a754ef1912
Actions

Authored by hamm on Nov 29 2019, 10:39.

Description

solve merge problems

Details

Committed

hamm	Nov 29 2019, 10:39

Pushed

hamm	Nov 29 2019, 10:40

Parents

R9686:41628794b49d: progress in multistep solving algo
R9686:526b0647f015: add testing framework

Branches

Unknown

Tags

Unknown

Event Timeline

hamm committed R9686:c8a754ef1912: solve merge problems (authored by hamm).Nov 29 2019, 10:39

Merged Changes

Commit	Author	Details	Committed
526b0647f015	lconstan	add testing framework	Nov 29 2019
3a71b8788580	lconstan	merge	Nov 29 2019
ab741244b754	lconstan	merge with recent work	Nov 29 2019

Changes (63)

		Path
D		.idea/misc.xml
V		{ → ODElibrary}/.idea/modules.xml
D		.idea/pcscproject.iml
D		.idea/vcs.xml
M		CMakeLists.txt
A	(dir)	ODElibrary/.idea/
A		ODElibrary/.idea/ODElibrary.iml
V		{ODElibrary ← }/.idea/modules.xml
M		ODElibrary/LinearCoefficients.h
M		cmake-build-debug/CMakeCache.txt
P		cmake-build-debug/CMakeFiles/3.15.3/CMakeCCompiler.cmake Copied from ODElibrary/cmake-build-debug/CMakeFiles/3.15.3/CMakeCCompiler.cmake
M		cmake-build-debug/CMakeFiles/3.15.3/CMakeCXXCompiler.cmake
M		cmake-build-debug/CMakeFiles/3.15.3/CMakeDetermineCompilerABI_C.bin
M		cmake-build-debug/CMakeFiles/3.15.3/CMakeDetermineCompilerABI_CXX.bin
D		cmake-build-debug/CMakeFiles/3.15.3/CMakeDetermineCompilerABI_Fortran.bin
D		cmake-build-debug/CMakeFiles/3.15.3/CMakeFortranCompiler.cmake
P		cmake-build-debug/CMakeFiles/3.15.3/CMakeSystem.cmake Copied from ODElibrary/cmake-build-debug/CMakeFiles/3.15.3/CMakeSystem.cmake
P		cmake-build-debug/CMakeFiles/3.15.3/CompilerIdC/a.out Copied from ODElibrary/cmake-build-debug/CMakeFiles/3.15.3/CompilerIdC/a.out
P		cmake-build-debug/CMakeFiles/3.15.3/CompilerIdCXX/a.out Copied from ODElibrary/cmake-build-debug/CMakeFiles/3.15.3/CompilerIdCXX/a.out
D		cmake-build-debug/CMakeFiles/3.15.3/CompilerIdFortran
D		cmake-build-debug/CMakeFiles/3.15.3/CompilerIdFortran/CMakeFortranCompilerId.F
D		cmake-build-debug/CMakeFiles/3.15.3/CompilerIdFortran/a.out
M		cmake-build-debug/CMakeFiles/CMakeDirectoryInformation.cmake
M		cmake-build-debug/CMakeFiles/CMakeError.log
M		cmake-build-debug/CMakeFiles/CMakeOutput.log
D		cmake-build-debug/CMakeFiles/FindMPI
D		cmake-build-debug/CMakeFiles/FindMPI/test_mpi.cpp
D		cmake-build-debug/CMakeFiles/FindMPI/test_mpi.f90
M		cmake-build-debug/CMakeFiles/Makefile.cmake
M		cmake-build-debug/CMakeFiles/Makefile2
M		cmake-build-debug/CMakeFiles/TargetDirectories.txt
M		cmake-build-debug/CMakeFiles/clion-log.txt
M		cmake-build-debug/CMakeFiles/progress.marks
M		cmake-build-debug/CMakeFiles/pscsproject.dir/CXX.includecache
M		cmake-build-debug/CMakeFiles/pscsproject.dir/DependInfo.cmake
M		cmake-build-debug/CMakeFiles/pscsproject.dir/build.make
M		cmake-build-debug/CMakeFiles/pscsproject.dir/depend.internal
M		cmake-build-debug/CMakeFiles/pscsproject.dir/depend.make
M		cmake-build-debug/CMakeFiles/pscsproject.dir/flags.make
M		cmake-build-debug/CMakeFiles/pscsproject.dir/link.txt
M		cmake-build-debug/CMakeFiles/pscsproject.dir/progress.make
M		cmake-build-debug/Makefile
M		cmake-build-debug/ODElibrary/CMakeFiles/CMakeDirectoryInformation.cmake
M		cmake-build-debug/ODElibrary/CMakeFiles/ODElibrary.dir/AdamsMoulton.cpp.o
M		cmake-build-debug/ODElibrary/CMakeFiles/ODElibrary.dir/BDF.cpp.o
M		cmake-build-debug/ODElibrary/CMakeFiles/ODElibrary.dir/CXX.includecache
M		cmake-build-debug/ODElibrary/CMakeFiles/ODElibrary.dir/DependInfo.cmake
M		cmake-build-debug/ODElibrary/CMakeFiles/ODElibrary.dir/ForwardEuler.cpp.o
M		cmake-build-debug/ODElibrary/CMakeFiles/ODElibrary.dir/LinearCoefficients.cpp.o
M		cmake-build-debug/ODElibrary/CMakeFiles/ODElibrary.dir/RungeKutta.cpp.o
M		cmake-build-debug/ODElibrary/CMakeFiles/ODElibrary.dir/build.make
M		cmake-build-debug/ODElibrary/CMakeFiles/ODElibrary.dir/depend.internal
M		cmake-build-debug/ODElibrary/CMakeFiles/ODElibrary.dir/depend.make
M		cmake-build-debug/ODElibrary/CMakeFiles/ODElibrary.dir/flags.make
M		cmake-build-debug/ODElibrary/CMakeFiles/ODElibrary.dir/library.cpp.o
M		cmake-build-debug/ODElibrary/CMakeFiles/ODElibrary.dir/link.txt
M		cmake-build-debug/ODElibrary/Makefile
M		cmake-build-debug/ODElibrary/ODElibrary.cbp
M		cmake-build-debug/ODElibrary/cmake_install.cmake
M		cmake-build-debug/cmake_install.cmake
M		cmake-build-debug/pscsproject.cbp
A	(dir)	tests/
A		tests/foo.cpp