[cig-commits] [commit] master: Merge branch 'willic3/fix-plasticity' (1d7550d)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Nov 19 08:53:23 PST 2014
Repository : https://github.com/geodynamics/pylith
On branch : master
Link : https://github.com/geodynamics/pylith/compare/62d706613047bb2e420be5294fd3d72016c02c51...1d7550d853e7269ae2c039f38f58f9436ed11d00
>---------------------------------------------------------------
commit 1d7550d853e7269ae2c039f38f58f9436ed11d00
Merge: 62d7066 192c608
Author: Brad Aagaard <baagaard at usgs.gov>
Date: Wed Nov 19 08:52:57 2014 -0800
Merge branch 'willic3/fix-plasticity'
* willic3/fix-plasticity:
Fixed makefiles for 3-D plasticity test.
Cleanup of 3-D plasticity test.
Cleanup of Makefiles for creating source distribution.
Cleaned up cfg files and dir structure for 2-D plasticity test.
Updated userguide to describe feasible stress state.
Added 2D version of plasticity test and moved existing plasticity tests down a level. They probably need updating.
Added missing makefiles.
Modified Drucker-Prager for the case where there is no plastic yield and tensile yield is not allowed.
Added test for plasticity + initial stress (3d).
Some changes to plasticity section plus changed version of LyX to older version.
>---------------------------------------------------------------
1d7550d853e7269ae2c039f38f58f9436ed11d00
configure.ac | 4 +-
doc/userguide/materials/materials.lyx | 104 ++++++++-----
examples/2d/gravity/Makefile.am | 8 +-
examples/2d/gravity/{output => }/deform_view.pvsm | 0
examples/2d/gravity/output/Makefile.am | 23 ---
libsrc/pylith/materials/DruckerPrager3D.cc | 50 +++---
.../pylith/materials/DruckerPragerPlaneStrain.cc | 50 +++---
tests/2d/Makefile.am | 3 +-
{libsrc => tests/2d/plasticity}/Makefile.am | 3 +-
tests/2d/plasticity/{ => compare3d}/README | 0
tests/2d/plasticity/{ => compare3d}/cyclic/README | 0
.../{ => compare3d}/cyclic/cycle_cont2d.cfg | 0
.../{ => compare3d}/cyclic/cycle_cont3d.cfg | 0
.../plasticity/{ => compare3d}/cyclic/dynamic.cfg | 0
.../{ => compare3d}/cyclic/loadcycle.timedb | 0
.../{ => compare3d}/cyclic/loadcycle_sin.timedb | 0
.../{ => compare3d}/cyclic/onecell_2d.cfg | 0
.../{ => compare3d}/cyclic/onecell_3d.cfg | 0
.../plasticity/{ => compare3d}/cyclic/plot_data.py | 0
.../{ => compare3d}/cyclic/pylithapp.cfg | 0
.../{ => compare3d}/cyclic/quasistatic.cfg | 0
.../{ => compare3d}/cyclic/run-models.sh | 0
.../2d/plasticity/{ => compare3d}/cyclic/sin2d.cfg | 0
.../{ => compare3d}/cyclic/sin2d_dynamic.cfg | 0
.../{ => compare3d}/cyclic/sin2d_quasistatic.cfg | 0
.../2d/plasticity/{ => compare3d}/cyclic/sin3d.cfg | 0
.../{ => compare3d}/cyclic/sin3d_dynamic.cfg | 0
.../{ => compare3d}/cyclic/sin3d_quasistatic.cfg | 0
.../{ => compare3d}/mesh/box_hex8_0.2m.exo | Bin
.../plasticity/{ => compare3d}/mesh/geometry2d.jou | 0
.../plasticity/{ => compare3d}/mesh/geometry3d.jou | 0
.../{ => compare3d}/mesh/mesh_hex8_0.2m.jou | 0
.../{ => compare3d}/mesh/mesh_quad4_0.2m.jou | 0
.../plasticity/{ => compare3d}/mesh/onehex8.mesh | 0
.../plasticity/{ => compare3d}/mesh/onequad4.mesh | 0
.../{ => compare3d}/mesh/plane_quad4_0.2m.exo | Bin
.../plasticity/{ => compare3d}/mesh/twohex8.mesh | 0
.../plasticity/{ => compare3d}/mesh/twoquad4.mesh | 0
tests/2d/plasticity/{ => compare3d}/static/README | 0
.../{ => compare3d}/static/axialdisp_fine_2d.cfg | 0
.../{ => compare3d}/static/axialdisp_fine_3d.cfg | 0
.../static/axialdisp_twocells_2d.cfg | 0
.../static/axialdisp_twocells_3d.cfg | 0
.../{ => compare3d}/static/planestrain_fine_2d.cfg | 0
.../{ => compare3d}/static/planestrain_fine_3d.cfg | 0
.../static/planestrain_twocells_2d.cfg | 0
.../static/planestrain_twocells_3d.cfg | 0
.../{ => compare3d}/static/pylithapp.cfg | 0
.../{ => compare3d}/static/run-models.sh | 0
.../{ => compare3d}/static/sheardisp_fine_2d.cfg | 0
.../{ => compare3d}/static/sheardisp_fine_3d.cfg | 0
.../static/sheardisp_twocells_2d.cfg | 0
.../static/sheardisp_twocells_3d.cfg | 0
.../plasticity/initialstress}/Makefile.am | 21 ++-
tests/2d/plasticity/initialstress/README | 17 +++
tests/2d/plasticity/initialstress/elastic.cfg | 18 +++
.../plasticity/initialstress/elastic_dt01.cfg} | 14 +-
.../plasticity/initialstress/elastic_dt02.cfg} | 14 +-
.../plasticity/initialstress/elastic_dt05.cfg} | 14 +-
.../plasticity/initialstress/elastic_dt10.cfg} | 14 +-
.../plasticity/initialstress/mesh.jou} | 54 ++++---
tests/2d/plasticity/initialstress/mesh_quad4.exo | Bin 0 -> 3936 bytes
tests/2d/plasticity/initialstress/plastic.cfg | 23 +++
.../plasticity/initialstress/plastic_dt01.cfg} | 14 +-
.../plasticity/initialstress/plastic_dt02.cfg} | 14 +-
.../plasticity/initialstress/plastic_dt05.cfg} | 14 +-
.../plasticity/initialstress/plastic_dt10.cfg} | 14 +-
tests/2d/plasticity/initialstress/plot_invars.py | 118 +++++++++++++++
tests/2d/plasticity/initialstress/pylithapp.cfg | 159 ++++++++++++++++++++
tests/2d/plasticity/initialstress/runtests.sh | 12 ++
.../initialstress/simpleshear_velbc.spatialdb | 17 +++
tests/3d/plasticity/Makefile.am | 3 +-
.../{dynamic => initialstress}/Makefile.am | 21 ++-
tests/3d/plasticity/initialstress/README | 14 ++
tests/3d/plasticity/initialstress/elastic.cfg | 18 +++
.../initialstress/elastic_dt01.cfg} | 14 +-
.../initialstress/elastic_dt02.cfg} | 14 +-
.../initialstress/elastic_dt05.cfg} | 14 +-
.../initialstress/elastic_dt10.cfg} | 14 +-
.../initialstress/mesh.jou} | 55 ++++---
tests/3d/plasticity/initialstress/mesh_hex8.exo | Bin 0 -> 15848 bytes
tests/3d/plasticity/initialstress/plastic.cfg | 17 +++
.../initialstress/plastic_dt01.cfg} | 14 +-
.../initialstress/plastic_dt02.cfg} | 14 +-
.../initialstress/plastic_dt05.cfg} | 14 +-
.../initialstress/plastic_dt10.cfg} | 14 +-
tests/3d/plasticity/initialstress/plot_invars.py | 133 ++++++++++++++++
tests/3d/plasticity/initialstress/pylithapp.cfg | 167 +++++++++++++++++++++
tests/3d/plasticity/initialstress/runtests.sh | 13 ++
.../initialstress/simpleshear_velbc.spatialdb | 17 +++
90 files changed, 1066 insertions(+), 300 deletions(-)
More information about the CIG-COMMITS
mailing list