resolution des conflits Merge branch 'master' of lsmssrv1.epfl.ch:tamaas
8ca024270cf8
Actions

Authored by Valentine <valentine@lsmspc27.epfl.ch> on Jun 23 2016, 11:12.

Description

resolution des conflits Merge branch 'master' of lsmssrv1.epfl.ch:tamaas

Committed

Valentine <valentine@lsmspc27.epfl.ch>

Jun 23 2016, 11:12

Pushed

anciaux

Sep 11 2017, 16:30

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
3e4b552ff61c	frerot	kato convergence criterion with pressure saturation	Jun 23 2016
c4da3602d676	frerot	better output tests	Jun 20 2016
85a288c24d8e	frerot	removed unused variable warning when compiling in release	Jun 20 2016
497507b701f5	frerot	added proxy types for convenience	Jun 20 2016
71e458cea544	frerot	wrapping complex grid	Jun 17 2016
4e3edbeeee28	frerot	removed plot code from tests	Jun 17 2016
fbe8eef3cc61	frerot	removed unused variable	Jun 17 2016
40d5e3b576f5	frerot	more generic computePressures in BemGigiPol	Jun 17 2016
d65c3b324a47	frerot	integration of new functionals	Jun 17 2016
4ffcbbdeb112	frerot	implemented new functionals	Jun 17 2016
5752da66107a	frerot	operators on grid replace map2d operators	Jun 16 2016
749163d42a7f	frerot	corrected compile error	Jun 16 2016
51a6f524e10a	frerot	compute true displacements for kato with pressure saturation (Valentine)	Jun 15 2016
552b8f12f925	frerot	added hertzian test for bem kato	Jun 15 2016
5d83b7d970be	frerot	fixed typo in release mode	Jun 15 2016
9ac792c832f9	frerot	added grid base class	Jun 15 2016
65fafc9c7edd	frerot	better functional interface wip	Jun 12 2016
9251b566b1bf	frerot	reorganizing functionals WIP	May 22 2016

				Path
	M			SConstruct
	M			examples/adhesion.py
	M			python/bem.i
	M			python/surface.i
	M			python/tamaas.i
	M			src/SConscript
	V			src/{adhesion_functional.cpp → exponential_adhesion_functional.cpp}
	P			src/adhesion_functional.hh Deleted after being copied to multiple locations: src/complimentary_term_functional.hh src/exponential_adhesion_functional.hh
	V			src/{array.hh ← my_vector.hh}
	M			src/bem_fft_base.cpp
	M			src/bem_fft_base.hh
	M			src/bem_gigi.cpp
	M			src/bem_gigipol.cpp
	M			src/bem_gigipol.hh
	M			src/bem_kato.cpp
	M			src/bem_kato.hh
	M			src/bem_penalty.cpp
	M			src/bem_uzawa.cpp
	P			src/complimentary_term_functional.cpp Copied from src/fftransform.cpp
	P			src/complimentary_term_functional.hh Copied from src/adhesion_functional.hh
	M			src/elastic_energy_functional.cpp
	M			src/elastic_energy_functional.hh
	V			src/{exponential_adhesion_functional.cpp ← adhesion_functional.cpp}
	V			src/{exponential_adhesion_functional.hh ← adhesion_functional.hh}
	P			src/functional.cpp Copied from src/tamaas.cpp
	M			src/functional.hh
	A			src/grid.cpp
	A			src/grid.hh
	M			src/map_2d.cpp
	M			src/map_2d.hh
	A			src/meta_functional.cpp
	P			src/meta_functional.hh Copied from src/tamaas.cpp
	V			src/{my_vector.hh → array.hh}
	M			src/tamaas.hh
	A			src/types.cpp
	P			src/types.hh Copied from src/fftransform.hh
	M			tests/SConscript
	M			tests/run_tests.sh
	M			tests/test_hertz_disp.py
	P			tests/test_hertz_kato.py Copied from tests/test_hertz_pressure.py
	P			tests/test_hertz_pressure.py Copied to tests/test_hertz_kato.py
	M			tests/test_westergaard.py