Homec4science
Diffusion µSpectre ddc4f21774f3

Fix: fix merge problems of feat/implement_new_materials with master
ddc4f21774f3
Actions

Authored by RLeute on Sep 26 2018, 11:12.

Description

Fix: fix merge problems of feat/implement_new_materials with master

Details

Committed
RLeuteSep 26 2018, 11:12
Pushed
RLeuteSep 26 2018, 13:37
Parents
rMUSPECTRE05fd07b68837: Merge branch 'master' of ssh://c4science.ch/source/muSpectre into…
Branches
Unknown
Tags
Unknown
References
feat/implement_new_materials

Changes (6)

Path
Mbin/profile_material_linear_elastic4.cc
Msrc/materials/material_hyper_elasto_plastic2.cc
Msrc/materials/material_hyper_elasto_plastic2.hh
Msrc/materials/material_linear_elastic4.hh
Msrc/solver/solver_cg.hh
Mtests/python_muSpectre_tools_test.py

rMUSPECTREddc4f21774f3

View Options

bin/profile_material_linear_elastic4.cc

Loading...
View Options

src/materials/material_hyper_elasto_plastic2.cc

Loading...
View Options

src/materials/material_hyper_elasto_plastic2.hh

Loading...
View Options

src/materials/material_linear_elastic4.hh

Loading...
View Options

src/solver/solver_cg.hh

Loading...
View Options

tests/python_muSpectre_tools_test.py

Loading...
c4science · Help