Homec4science

conflict with master resolved

Authored by pundir on Jun 19 2019, 14:14.

Description

conflict with master resolved

Details

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
05c872f48febrichart
Bug fixed again after merge 
Jun 16 2019
121f89dc006frichart
Bug fix on static patch tests 
Jun 16 2019
f387b399ae6erichart
Small leak fix 
Jun 16 2019
9fdb8de9cf68richart
Bug fix in non linear tests 
Jun 16 2019
5adfe4547377richart
Bug fix in the python patch tests 
Jun 16 2019
9ff675c44194richart
Modified gitignore 
Jun 16 2019
7d83cd218a34richart
Bug fix in Dumper shared_ptr changes 
Jun 16 2019
1dd86a07d392richart
Bug fixing in the python interface 
Jun 16 2019
59acc25aa216richart
Merge branch 'features/pybind11' of c4science:/diffusion/AKAPRIV/akantu-private… 
Jun 16 2019
0e4984f5a64drichart
Merge branch 'master' into features/pybind11 
Jun 15 2019
05ff840cd866anciaux
remove a warning 
Jun 14 2019
dacd1c6ce4d6anciaux
added the possibility to build dumper::Field in python 
Jun 14 2019
b8a8a46e2135anciaux
Remove the raw pointers on dumper::Fields 
Jun 14 2019
5d2dc82607derichart
Bug fix in the createElementGroups function 
Jun 13 2019
c7e89d5fc02brichart
Version change 
Jun 13 2019
788ec250fa23richart
Fixing bugs in parallel: 
Jun 12 2019
f2382b4ee542richart
Make it compatible with the new versions of google-test 
Jun 12 2019
36cb05800fb2richart
Compiling with clang with -fsanitize=memory 
Jun 12 2019
f6f78a8e1f57richart
Bug fix in cohesive elements 
Jun 5 2019
1308f870eb08richart
Repairing some swig things 
Jun 5 2019
69c3f4c90ff0richart
Merge branch 'master' into features/petsc 
Jun 5 2019
8a8cbaa53817richart
Few modifications 
May 31 2019
1db43774e5c0anciaux
renaming a file 
May 14 2019
93c1c85addbdanciaux
adding a full example with eigen mode treatments 
May 14 2019
46779f984fa4anciaux
adding a few methods for solidmechanics model 
May 14 2019
0dda5dcc1039anciaux
heat transfer patch test working 
May 10 2019
eaa9fd19df2aanciaux
on my way to fix heattransfer tests 
May 9 2019
28153145c446anciaux
remove swig completely 
May 9 2019
8b217bd84ecdanciaux
removing python files useless now thanks to pybind 
May 9 2019
5f01385313a8anciaux
adding the heat transfert interface 
May 9 2019
f26800db0de2anciaux
revert the BC namespace 
May 9 2019
4cfbb587ed7danciaux
sparse matrix example working in pybind 
May 9 2019
576e37d3ad30anciaux
towards sparsematrix 
May 9 2019
cc57f6b6180aanciaux
towards sparsematrix 
May 9 2019
3ba30aa1a99eanciaux
change path and last example 
May 9 2019
0d0f950ac257anciaux
change a path 
May 9 2019
84d2362e4f31anciaux
removing swig 
May 9 2019
ca3d0ab179d5anciaux
tests run with pytest-3: need cmake expert to make it clean 
May 9 2019
4a76700356f7anciaux
complement the python interface 
May 9 2019
6f0e746f4e18anciaux
adding a test for meshes 
May 9 2019
233c48a8f69fanciaux
adapt the test for pytest and pybind 
May 9 2019
964e2d0ba785anciaux
update the patch tests for pybind and pytest 
May 9 2019
9a2d8cd8e68banciaux
bc test in pytest 
May 8 2019
9d83a1df7a5eanciaux
change getForce to getExternalForce in a test 
May 8 2019
a7017467bb54anciaux
bind node/element groups 
May 8 2019
16fe68ba4a6fanciaux
correct the construction of the element filter with ek_regular 
May 8 2019
2aa1e344ee31gallyamov/anciaux
Correction of the default element types within element_type_map: 
May 8 2019
3565525f24c3anciaux
clang formating 
May 8 2019
2ae4208c4135anciaux
remove Dirichlet namespace in test 
May 8 2019
d8014c9dd01danciaux
remove nonexisting call in the pybind interface 
May 8 2019