Merge branch 'master' of lsmssrv1.epfl.ch:tamaas
75d897003195
Actions

Authored by frerot on Nov 29 2016, 08:27.

Description

Merge branch 'master' of lsmssrv1.epfl.ch:tamaas

Committed

frerot

Nov 29 2016, 08:27

Pushed

anciaux

Sep 11 2017, 16:30

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
e27bf806a9fb	Valentine	pouletMerge branch 'master' of lsmssrv1.epfl.ch:tamaas	Nov 23 2016
c7118e0a6b38	Valentine	initialisation dans resolution en deplacement	Nov 23 2016
0549ca0226af	frerot	added consts to analyticalRMS	Nov 22 2016
0e70f46e9d04	frerot	added analytical hrms to SurfaceGeneratorFilterFFT	Nov 22 2016
2513086c6b34	frerot	fixed broken tests	Nov 17 2016
611b0aabdd07	Valentine	test sur autocorrelation pour surfaces	Nov 17 2016
16f1a58beb89	Valentine	gigpol pressure driven	Nov 16 2016
452868de8595	Valentine	pouletMerge branch 'master' of lsmssrv1.epfl.ch:tamaas	Nov 8 2016
ba213d9f2804	Valentine	ajout fonctionnelle d adhesion	Nov 8 2016
36df6379a07b	anciaux	adding a proper normalization for the error in polonski	Nov 4 2016
7e6d156a2d92	anciaux	adding a few accessors	Nov 3 2016

				Path
	M			python/bem.i
	M			python/surface.i
	M			python/surface_generator.i
	M			site_scons/site_init.py
	M			src/SConscript
	M			src/bem_fft_base.cpp
	M			src/bem_fft_base.hh
	M			src/bem_gigipol.cpp
	M			src/bem_gigipol.hh
	M			src/bem_grid_condat.cpp
	M			src/bem_polonski.cpp
	M			src/bem_polonski.hh
	P			src/squared_exponential_adhesion_functional.cpp Copied from src/exponential_adhesion_functional.cpp
	P			src/squared_exponential_adhesion_functional.hh Copied from src/exponential_adhesion_functional.hh
	M			src/surface_generator.cpp
	M			src/surface_generator_filter.cpp
	M			src/surface_generator_filter_fft.cpp
	M			src/surface_generator_filter_fft.hh
	M			tests/SConscript
	A			tests/test_autocorrelation.py
	M			tests/test_fftransform.py
	M			tests/test_fractal.py
	M			tests/test_fractal.verified
	M			tests/test_saturated_pressure.py