Merge branch 'master' into feature/mpi_fft_engine
0defcff64961
Actions

Authored by frerot on Jul 10 2020, 23:59.

Description

Merge branch 'master' into feature/mpi_fft_engine

Committed

frerot

Jul 10 2020, 23:59

Pushed

frerot

Jul 11 2020, 00:23

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
6124726e1b08	frerot	redirecting iostreams to python streams for solve functions	Jul 10 2020
9046874a9be5	frerot	[JOSS] added citation to Pybind11	Jul 10 2020
7d3736dfcf1f	frerot	removing unecessary calls to initialize/finalize in examples	Jul 10 2020
aba0a246fdf6	frerot	using std::shared_ptr<Functional> as holder type for functionals	Jul 10 2020
aec3fa0599a4	frerot	correcting typos in rough surface doc	Jul 10 2020
f16ec5b85e49	frerot	setting proper rpath for tests	Jul 3 2020
c970723f194b	frerot	added fftw libpath to rpath	Jul 3 2020
afb7a2500c3b	frerot	added lib64 directory to search for fftw	Jul 3 2020
a4420cd7baa8	frerot	propertly setting rpaths with $ORIGIN	Jul 3 2020
14b215073440	frerot	forcing update with pip on scons install call	Jul 2 2020
8fe083d0bc1b	frerot	[DOC] fix in example code	Jun 30 2020

				Path
	M			SConstruct
	M			doc/sphinx/source/contact.rst
	M			doc/sphinx/source/rough_surfaces.rst
	M			joss/paper.bibtex
	M			joss/paper.md
	M			python/SConscript
	M			python/tamaas/nonlinear_solvers/__init__.py
	M			python/wrap/core.cpp
	M			python/wrap/model.cpp
	M			python/wrap/solvers.cpp
	M			site_scons/detect.py
	M			src/core/logger.cpp
	M			src/core/logger.hh
	M			src/model/meta_functional.cpp
	M			src/model/meta_functional.hh
	M			src/solvers/contact_solver.cpp
	M			src/solvers/contact_solver.hh
	M			src/solvers/polonsky_keer_rey.cpp
	M			src/solvers/polonsky_keer_rey.hh
	M			tests/SConscript