merge success
Description
Description
Details
Details
- Committed
anciaux May 18 2016, 17:32 - Pushed
anciaux Sep 11 2017, 16:30 - Parents
- rTAMAAS47f0e11cf893: saving the stash
rTAMAAS6f0b21d31eb1: commented G output from BemPolonski - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 6f0b21d31eb1 | frerot | commented G output from BemPolonski | May 12 2016 | |||
| 74348d7aaa92 | frerot | added options to fractal_surface.py example | May 12 2016 | |||
| fd0e37284647 | Valentine | It is finally working : use gigipol Merge branch 'master' of lsmssrv1.epfl.ch… | May 11 2016 | |||
| 4319bd405f56 | Valentine | Lot of contact algo | May 11 2016 | |||
| cc51615ad5d4 | frerot | changed functional parameters | May 10 2016 | |||
| b3b4d5d01e3a | frerot | added number of threads to initialize | May 9 2016 | |||
| 9de54841846e | frerot | added info in README | May 9 2016 | |||
| 665755da6873 | frerot | put back omp threads in initialize | May 9 2016 | |||
| 61101dc769b8 | frerot | more stringeant hertzian test | May 6 2016 | |||
| 3ae4c264e70d | frerot | test_fftransform temporarily disabled | May 6 2016 | |||
| b75844e771a1 | frerot | added optional FFT flags for plan creation | May 6 2016 | |||
| f6f2a376249b | frerot | removed virtual call from critical loop in Bem Kato | May 6 2016 | |||
| c4c74073f89f | frerot | fixed FFTransform implementation | May 6 2016 | |||
| 12ff319b671d | frerot | added FFTransform class to handle real FFTs | May 4 2016 | |||
| 48acd2ecb5b0 | anciaux | cleaning the compilation output | May 2 2016 | |||
| 0aa7aca17b0a | anciaux | merging things with lucas developments for namespace in particular | May 2 2016 | |||
| 1a19572edf49 | anciaux | modifying the namespace strategy from lucas | May 2 2016 | |||
| e96d4bebeabc | anciaux | moving code in cpp file | May 2 2016 | |||
| 78561d5f35f1 | anciaux | modifying the namespace strategy from lucas | May 2 2016 | |||
| f9a368c04ae1 | frerot | added test of fractal surface generator | Apr 29 2016 | |||
| 2b5aae539642 | frerot | corrected bugs in swig wrapping from SurfaceForPython | Apr 29 2016 | |||
| afbb6f1190e2 | anciaux | correct SmartPointer assign problem | Apr 29 2016 | |||
| ffc126206ad7 | frerot | ignore swig.pyc | Apr 29 2016 | |||
| c715535d704f | frerot | added newer swig find tool to compile on clusters | Apr 29 2016 | |||
| d810a8a28ba9 | frerot | added missing author | Apr 29 2016 | |||
| e894b221dd5a | frerot | added tamaas namespace | Apr 29 2016 | |||
| dade6802e791 | frerot | Merge branch 'master' into fftw_plans | Apr 29 2016 | |||
| 4142cccbc754 | Valentine | fixing conflicts | Apr 28 2016 | |||
| d7b69858f20f | Valentine | uzawa algorithm for contact | Apr 28 2016 | |||
| 4ec4af246359 | anciaux | remove coucou | Apr 28 2016 | |||
| 8c18a80baa99 | frerot | fixed for cluster compilation | Apr 16 2016 | |||
| e652acfdabba | frerot | cleaner scons config | Apr 16 2016 | |||
| f061a8d659ec | frerot | better fftw plans [WIP] | Apr 15 2016 |