Diffusion PCSCproject fdbac09d4d56

solve conflicts
fdbac09d4d56
Actions

Authored by lconstan on Nov 29 2019, 11:58.

Description

solve conflicts

Details

Committed

lconstan

Nov 29 2019, 11:58

Pushed

lconstan

Nov 29 2019, 11:58

Parents

R9686:1c10724e70ea: tried to pass the tests
R9686:fcf9b1b36508: solve git prob

Branches

Unknown

Tags

Unknown

Event Timeline

lconstan committed R9686:fdbac09d4d56: solve conflicts (authored by lconstan).Nov 29 2019, 11:58

Merged Changes

Commit	Author	Details	Committed
fcf9b1b36508	hamm	solve git prob	Nov 29 2019
c8a754ef1912	hamm	solve merge problems	Nov 29 2019
41628794b49d	hamm	progress in multistep solving algo	Nov 29 2019

Changes (67)

		Path
P		.DS_Store Copied to multiple locations: cmake-build-debug/.DS_Store cmake-build-debug/CMakeFiles/3.15.3/CompilerIdC/a.out cmake-build-debug/CMakeFiles/3.15.3/CompilerIdCXX/a.out
A	(dir)	.idea/
A		.idea/workspace.xml
M		CMakeLists.txt
M		ODElibrary/AbstractSolver.h
M		ODElibrary/AdamsBashforth.cpp
M		ODElibrary/AdamsBashforth.h
M		ODElibrary/MultistepAbstractSolver.cpp
M		ODElibrary/MultistepAbstractSolver.h
A	(dir)	cmake-build-debug/
P		cmake-build-debug/.DS_Store Copied from .DS_Store
A		cmake-build-debug/CMakeCache.txt
A	(dir)	cmake-build-debug/CMakeFiles/
A	(dir)	cmake-build-debug/CMakeFiles/3.15.3/
P		cmake-build-debug/CMakeFiles/3.15.3/CMakeCCompiler.cmake Copied from ODElibrary/cmake-build-debug/CMakeFiles/3.15.3/CMakeCCompiler.cmake
P		cmake-build-debug/CMakeFiles/3.15.3/CMakeCXXCompiler.cmake Copied from ODElibrary/cmake-build-debug/CMakeFiles/3.15.3/CMakeCXXCompiler.cmake
A		cmake-build-debug/CMakeFiles/3.15.3/CMakeDetermineCompilerABI_C.bin
A		cmake-build-debug/CMakeFiles/3.15.3/CMakeDetermineCompilerABI_CXX.bin
A		cmake-build-debug/CMakeFiles/3.15.3/CMakeSystem.cmake
A	(dir)	cmake-build-debug/CMakeFiles/3.15.3/CompilerIdC/
P		cmake-build-debug/CMakeFiles/3.15.3/CompilerIdC/a.out Copied from .DS_Store
A	(dir)	cmake-build-debug/CMakeFiles/3.15.3/CompilerIdCXX/
P		cmake-build-debug/CMakeFiles/3.15.3/CompilerIdCXX/a.out Copied from .DS_Store
P		cmake-build-debug/CMakeFiles/CMakeDirectoryInformation.cmake Copied from ODElibrary/cmake-build-debug/CMakeFiles/CMakeDirectoryInformation.cmake
A		cmake-build-debug/CMakeFiles/CMakeOutput.log
A		cmake-build-debug/CMakeFiles/Makefile.cmake
A		cmake-build-debug/CMakeFiles/Makefile2
A		cmake-build-debug/CMakeFiles/TargetDirectories.txt
A		cmake-build-debug/CMakeFiles/clion-log.txt
A	(dir)	cmake-build-debug/CMakeFiles/foo.dir/
A		cmake-build-debug/CMakeFiles/foo.dir/DependInfo.cmake
A		cmake-build-debug/CMakeFiles/foo.dir/build.make
A		cmake-build-debug/CMakeFiles/foo.dir/cmake_clean.cmake
P		cmake-build-debug/CMakeFiles/foo.dir/depend.make Copied from ODElibrary/cmake-build-debug/CMakeFiles/ODElibrary.dir/depend.make
P		cmake-build-debug/CMakeFiles/foo.dir/flags.make Copied from ODElibrary/cmake-build-debug/CMakeFiles/ODElibrary.dir/flags.make
A		cmake-build-debug/CMakeFiles/foo.dir/link.txt
A		cmake-build-debug/CMakeFiles/foo.dir/progress.make
A		cmake-build-debug/CMakeFiles/progress.marks
A	(dir)	cmake-build-debug/CMakeFiles/pscsproject.dir/
A		cmake-build-debug/CMakeFiles/pscsproject.dir/DependInfo.cmake
A		cmake-build-debug/CMakeFiles/pscsproject.dir/build.make
P		cmake-build-debug/CMakeFiles/pscsproject.dir/depend.make Copied from ODElibrary/cmake-build-debug/CMakeFiles/ODElibrary.dir/depend.make
A		cmake-build-debug/CMakeFiles/pscsproject.dir/flags.make
A		cmake-build-debug/CMakeFiles/pscsproject.dir/link.txt
A		cmake-build-debug/CMakeFiles/pscsproject.dir/progress.make
A		cmake-build-debug/CTestTestfile.cmake
A		cmake-build-debug/Makefile
A	(dir)	cmake-build-debug/ODElibrary/
A	(dir)	cmake-build-debug/ODElibrary/CMakeFiles/
P		cmake-build-debug/ODElibrary/CMakeFiles/CMakeDirectoryInformation.cmake Copied from ODElibrary/cmake-build-debug/CMakeFiles/CMakeDirectoryInformation.cmake
A	(dir)	cmake-build-debug/ODElibrary/CMakeFiles/ODElibrary.dir/
A		cmake-build-debug/ODElibrary/CMakeFiles/ODElibrary.dir/AbstractSolver.cpp.o
A		cmake-build-debug/ODElibrary/CMakeFiles/ODElibrary.dir/AdamsBashforth.cpp.o
A		cmake-build-debug/ODElibrary/CMakeFiles/ODElibrary.dir/CXX.includecache
A		cmake-build-debug/ODElibrary/CMakeFiles/ODElibrary.dir/DependInfo.cmake
A		cmake-build-debug/ODElibrary/CMakeFiles/ODElibrary.dir/MultistepAbstractSolver.cpp.o
A		cmake-build-debug/ODElibrary/CMakeFiles/ODElibrary.dir/build.make
P		cmake-build-debug/ODElibrary/CMakeFiles/ODElibrary.dir/flags.make Copied from ODElibrary/cmake-build-debug/CMakeFiles/ODElibrary.dir/flags.make
A		cmake-build-debug/ODElibrary/CMakeFiles/ODElibrary.dir/link.txt
A		cmake-build-debug/ODElibrary/Makefile
A		cmake-build-debug/ODElibrary/ODElibrary.cbp
P		cmake-build-debug/ODElibrary/cmake_install.cmake Copied from ODElibrary/cmake-build-debug/cmake_install.cmake
A		cmake-build-debug/ODElibrary/libODElibrary.a
P		cmake-build-debug/cmake_install.cmake Copied from ODElibrary/cmake-build-debug/cmake_install.cmake
A		cmake-build-debug/pscsproject
A		cmake-build-debug/pscsproject.cbp
M		main.cpp