Homec4science

Merge remote-tracking branch 'origin/master'

Authored by ollitrault on Dec 15 2016, 16:12.

Description

Merge remote-tracking branch 'origin/master'

  1. Conflicts:
  2. Config.cpp

Details

Committed
ollitraultDec 15 2016, 16:12
Pushed
ollitraultDec 15 2016, 16:13
Parents
R1695:5e5c40bd9602: Doxygen comments
R1695:87272839223f: Update data names and configuration file
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
87272839223frouaze
Update data names and configuration file 
Dec 15 2016
3b2b6bfbc54erouaze
Implementation of the test suite with one exemple for each feature in the… 
Dec 15 2016
a308fc0b59e1rouaze
Correction of the 2D Trapezoidal integrator using weight matrices and… 
Dec 15 2016