Homec4science

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

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

Event Timeline

Valentine <valentine@lsmspc27.epfl.ch> committed rTAMAAS8ca024270cf8: resolution des conflits Merge branch 'master' of lsmssrv1.epfl.ch:tamaas (authored by Valentine <valentine@lsmspc27.epfl.ch>).Jun 23 2016, 11:12

Merged Changes

CommitAuthorDetailsCommitted
3e4b552ff61cfrerot
kato convergence criterion with pressure saturation 
Jun 23 2016
c4da3602d676frerot
better output tests 
Jun 20 2016
85a288c24d8efrerot
removed unused variable warning when compiling in release 
Jun 20 2016
497507b701f5frerot
added proxy types for convenience 
Jun 20 2016
71e458cea544frerot
wrapping complex grid 
Jun 17 2016
4e3edbeeee28frerot
removed plot code from tests 
Jun 17 2016
fbe8eef3cc61frerot
removed unused variable 
Jun 17 2016
40d5e3b576f5frerot
more generic computePressures in BemGigiPol 
Jun 17 2016
d65c3b324a47frerot
integration of new functionals 
Jun 17 2016
4ffcbbdeb112frerot
implemented new functionals 
Jun 17 2016
5752da66107afrerot
operators on grid replace map2d operators 
Jun 16 2016
749163d42a7ffrerot
corrected compile error 
Jun 16 2016
51a6f524e10afrerot
compute true displacements for kato with pressure saturation (Valentine) 
Jun 15 2016
552b8f12f925frerot
added hertzian test for bem kato 
Jun 15 2016
5d83b7d970befrerot
fixed typo in release mode 
Jun 15 2016
9ac792c832f9frerot
added grid base class 
Jun 15 2016
65fafc9c7eddfrerot
better functional interface wip 
Jun 12 2016
9251b566b1bffrerot
reorganizing functionals WIP 
May 22 2016