Merge branch 'master' of ssh://129.16.51.19:10122//home/carl/dev/oofem_workspace/oofem
Merge branch 'master' of ssh://129.16.51.19:10122//home/carl/dev/oofem_workspace/oofem
Merge /home/carl/WorkComputer/dev/oofem_workspace/oofem
Merge branch 'master' of github.com:Micket/oofem
Merge branch 'master' of ssh://129.16.51.19:10122//home/carl/dev/oofem_workspace/oofem
Merge branch 'master' of ssh://129.16.51.19:10122//home/carl/dev/oofem_workspace/oofem
Merge branch 'master' of ssh://129.16.51.19:10122//home/carl/dev/oofem_workspace/oofem
Merge branch 'master' of ssh://129.16.51.19:10122//home/carl/dev/oofem_workspace/oofem
Merge branch 'master' of github.com:Micket/oofem
Merge branch 'master' of ssh://129.16.51.19:10122//home/carl/dev/oofem_workspace/oofem
Merge branch 'master' of github.com:Micket/oofem
Fixed bug
Fixed merge conflicts
Bug with small deformations in tet21ghostsolid fixed
Added alternative piece of code for making the conversion from dS/dE -> dP/dF (for StructuralMaterial) on index form. New code is only preliminary and seems to be a bit slower but debugging is much simpler.
Fixed bug in Shell7BaseXFEM when computing cohesive forces.
Use explicitly displacement dofs when computing the deformation gradient
Adding support for large deformations in tet21ghostsolid
Resolved conflicts
Moved interface materials and elements to subfolders under materials and elements respectively. Also moved Shell7Base derived elements to a Shells subfolder.