Homec4science
Diffusion akantu f79b5473587e

merging after conflict resolution
f79b5473587e
Actions

Authored by Aurelia Cuba Ramos <aurelia.cubaramos@epfl.ch> on Feb 1 2016, 09:24.

Description

merging after conflict resolution

Details

Committed
Aurelia Cuba Ramos <aurelia.cubaramos@epfl.ch>Feb 1 2016, 09:24
Pushed
richartDec 6 2019, 13:35
richartDec 6 2019, 13:16
richartDec 6 2019, 12:16
richartDec 6 2019, 11:45
richartDec 5 2019, 22:54
richartDec 5 2019, 18:45
Parents
rAKAb266e36a8204: conflicts resolved
Branches
Unknown
Tags
Unknown

Event Timeline

Aurelia Cuba Ramos <aurelia.cubaramos@epfl.ch> committed rAKAf79b5473587e: merging after conflict resolution (authored by Aurelia Cuba Ramos <aurelia.cubaramos@epfl.ch>).Feb 1 2016, 09:24

Changes (50)

Path
M(sub)extra_packages/extra-materials
M(sub)extra_packages/igfem
Mextra_packages/traction-at-split-node-contact/README.txt
Mextra_packages/traction-at-split-node-contact/package.cmake
Mextra_packages/traction-at-split-node-contact/src/boundary_conditions/force_based_dirichlet.hh
Mextra_packages/traction-at-split-node-contact/src/boundary_conditions/inclined_flat_dirichlet.hh
Mextra_packages/traction-at-split-node-contact/src/boundary_conditions/spring_bc.hh
Mextra_packages/traction-at-split-node-contact/src/common/manual_restart.cc
Mextra_packages/traction-at-split-node-contact/src/common/manual_restart.hh
Mextra_packages/traction-at-split-node-contact/src/common/parameter_reader.cc
Mextra_packages/traction-at-split-node-contact/src/common/parameter_reader.hh
Mextra_packages/traction-at-split-node-contact/src/common/synchronized_array.cc
Mextra_packages/traction-at-split-node-contact/src/common/synchronized_array.hh
Mextra_packages/traction-at-split-node-contact/src/common/synchronized_array_inline_impl.cc
Mextra_packages/traction-at-split-node-contact/src/functions/boundary_functions.cc
Mextra_packages/traction-at-split-node-contact/src/functions/boundary_functions.hh
Mextra_packages/traction-at-split-node-contact/src/functions/node_filter.hh
Mextra_packages/traction-at-split-node-contact/src/ntn_contact/friction_laws/ntn_friclaw_coulomb.hh
Mextra_packages/traction-at-split-node-contact/src/ntn_contact/friction_laws/ntn_friclaw_coulomb_tmpl.hh
Mextra_packages/traction-at-split-node-contact/src/ntn_contact/friction_laws/ntn_friclaw_linear_cohesive.hh
Mextra_packages/traction-at-split-node-contact/src/ntn_contact/friction_laws/ntn_friclaw_linear_cohesive_tmpl.hh
Mextra_packages/traction-at-split-node-contact/src/ntn_contact/friction_laws/ntn_friclaw_linear_slip_weakening.hh
Mextra_packages/traction-at-split-node-contact/src/ntn_contact/friction_laws/ntn_friclaw_linear_slip_weakening_no_healing.hh
Mextra_packages/traction-at-split-node-contact/src/ntn_contact/friction_laws/ntn_friclaw_linear_slip_weakening_no_healing_tmpl.hh
Mextra_packages/traction-at-split-node-contact/src/ntn_contact/friction_laws/ntn_friclaw_linear_slip_weakening_tmpl.hh
Mextra_packages/traction-at-split-node-contact/src/ntn_contact/friction_regularisations/ntn_fricreg_no_regularisation.cc
Mextra_packages/traction-at-split-node-contact/src/ntn_contact/friction_regularisations/ntn_fricreg_no_regularisation.hh
Mextra_packages/traction-at-split-node-contact/src/ntn_contact/friction_regularisations/ntn_fricreg_rubin_ampuero.cc
Mextra_packages/traction-at-split-node-contact/src/ntn_contact/friction_regularisations/ntn_fricreg_rubin_ampuero.hh
Mextra_packages/traction-at-split-node-contact/src/ntn_contact/friction_regularisations/ntn_fricreg_simplified_prakash_clifton.cc
Mextra_packages/traction-at-split-node-contact/src/ntn_contact/friction_regularisations/ntn_fricreg_simplified_prakash_clifton.hh
Mextra_packages/traction-at-split-node-contact/src/ntn_contact/mIIasym_contact.cc
Mextra_packages/traction-at-split-node-contact/src/ntn_contact/mIIasym_contact.hh
Mextra_packages/traction-at-split-node-contact/src/ntn_contact/ntn_base_contact.cc
Mextra_packages/traction-at-split-node-contact/src/ntn_contact/ntn_base_contact.hh
Mextra_packages/traction-at-split-node-contact/src/ntn_contact/ntn_base_contact_inline_impl.cc
Mextra_packages/traction-at-split-node-contact/src/ntn_contact/ntn_base_friction.cc
Mextra_packages/traction-at-split-node-contact/src/ntn_contact/ntn_base_friction.hh
Mextra_packages/traction-at-split-node-contact/src/ntn_contact/ntn_contact.cc
Mextra_packages/traction-at-split-node-contact/src/ntn_contact/ntn_contact.hh
Mextra_packages/traction-at-split-node-contact/src/ntn_contact/ntn_friction.hh
Mextra_packages/traction-at-split-node-contact/src/ntn_contact/ntn_friction_tmpl.hh
Mextra_packages/traction-at-split-node-contact/src/ntn_contact/ntn_initiation_function.cc
Mextra_packages/traction-at-split-node-contact/src/ntn_contact/ntn_initiation_function.hh
Mextra_packages/traction-at-split-node-contact/src/ntn_contact/ntrf_contact.cc
Mextra_packages/traction-at-split-node-contact/src/ntn_contact/ntrf_contact.hh
Mextra_packages/traction-at-split-node-contact/src/ntn_contact/ntrf_friction.hh
Mextra_packages/traction-at-split-node-contact/src/ntn_contact/ntrf_friction_tmpl.hh
Mextra_packages/traction-at-split-node-contact/src/tasn_contact.hh
Mtest/test_model/test_solid_mechanics_model/test_materials/orthotropic.dat

rAKAf79b5473587e

View Options

extra_packages/extra-materials

Loading...
View Options

extra_packages/igfem

Loading...
View Options

extra_packages/traction-at-split-node-contact/README.txt

Loading...
View Options

extra_packages/traction-at-split-node-contact/package.cmake

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/boundary_conditions/force_based_dirichlet.hh

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/boundary_conditions/inclined_flat_dirichlet.hh

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/boundary_conditions/spring_bc.hh

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/common/manual_restart.cc

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/common/manual_restart.hh

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/common/parameter_reader.cc

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/common/parameter_reader.hh

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/common/synchronized_array.cc

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/common/synchronized_array.hh

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/common/synchronized_array_inline_impl.cc

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/functions/boundary_functions.cc

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/functions/boundary_functions.hh

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/functions/node_filter.hh

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/ntn_contact/friction_laws/ntn_friclaw_coulomb.hh

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/ntn_contact/friction_laws/ntn_friclaw_coulomb_tmpl.hh

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/ntn_contact/friction_laws/ntn_friclaw_linear_cohesive.hh

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/ntn_contact/friction_laws/ntn_friclaw_linear_cohesive_tmpl.hh

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/ntn_contact/friction_laws/ntn_friclaw_linear_slip_weakening.hh

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/ntn_contact/friction_laws/ntn_friclaw_linear_slip_weakening_no_healing.hh

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/ntn_contact/friction_laws/ntn_friclaw_linear_slip_weakening_no_healing_tmpl.hh

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/ntn_contact/friction_laws/ntn_friclaw_linear_slip_weakening_tmpl.hh

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/ntn_contact/friction_regularisations/ntn_fricreg_no_regularisation.cc

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/ntn_contact/friction_regularisations/ntn_fricreg_no_regularisation.hh

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/ntn_contact/friction_regularisations/ntn_fricreg_rubin_ampuero.cc

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/ntn_contact/friction_regularisations/ntn_fricreg_rubin_ampuero.hh

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/ntn_contact/friction_regularisations/ntn_fricreg_simplified_prakash_clifton.cc

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/ntn_contact/friction_regularisations/ntn_fricreg_simplified_prakash_clifton.hh

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/ntn_contact/mIIasym_contact.cc

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/ntn_contact/mIIasym_contact.hh

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/ntn_contact/ntn_base_contact.cc

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/ntn_contact/ntn_base_contact.hh

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/ntn_contact/ntn_base_contact_inline_impl.cc

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/ntn_contact/ntn_base_friction.cc

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/ntn_contact/ntn_base_friction.hh

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/ntn_contact/ntn_contact.cc

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/ntn_contact/ntn_contact.hh

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/ntn_contact/ntn_friction.hh

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/ntn_contact/ntn_friction_tmpl.hh

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/ntn_contact/ntn_initiation_function.cc

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/ntn_contact/ntn_initiation_function.hh

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/ntn_contact/ntrf_contact.cc

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/ntn_contact/ntrf_contact.hh

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/ntn_contact/ntrf_friction.hh

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/ntn_contact/ntrf_friction_tmpl.hh

Loading...
View Options

extra_packages/traction-at-split-node-contact/src/tasn_contact.hh

Loading...
View Options

test/test_model/test_solid_mechanics_model/test_materials/orthotropic.dat

Loading...
c4science · Help