[cig-commits] [commit] next: Merge branch 'willic3/add-examples-grav2d' into next (4e9d24a)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/pylith

On branch  : next
Link       : https://github.com/geodynamics/pylith/compare/78c198a5c3423f05d7a652ed95299710128e568c...4e9d24aae671a33e8c3a251ee8fd6483e4b67d1b

>---------------------------------------------------------------

commit 4e9d24aae671a33e8c3a251ee8fd6483e4b67d1b
Merge: 78c198a 7eb9673
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Fri Nov 21 08:39:15 2014 -0800

    Merge branch 'willic3/add-examples-grav2d' into next
    
    * willic3/add-examples-grav2d:
    Small cleanup of figure display and formatting.
    Decrease file size of figure images.
    Simplify script to generate spatialdb file with initial stresses.
    Updated README to reflect change in directory structure.
    Small cleanup of Makfiles in configure.ac.
    Cleanup gravity example directory.
    Added tutorial for grav2d and put Makefile.am back in gravity example
    output directory (there are two .pvsm files in there).
    Made changes to makefiles for new files.
    Finished putting together gravity example. Added new pvsm files for
    scaled and unscaled velocity vectors, and added cases for no initial
    stresses.
    Removed old mesh file from Makefile.
    Modified the README to reflect the new layout of the examples.
    Cleaned up gravity example, and hopefully have stable solution for
    finite strain problem. New version uses symmetry and small time step to
    stabilize finite strain example.
    Added spatial database to Makefile.am so it will be included in
    distributions.
    Small tweaks to tolerances.
    Refine tolerances and scales.
    Changed comments to provide relaxation time.
    Cleanup of journal files.
    Cleanup APREPRO lines in journal files.
    Reduced mesh size for quicker runtimes.
    Fixed geometry.jou to be consistent with mesh.
    
    Conflicts:
    	examples/2d/gravity/geometry.jou



>---------------------------------------------------------------

4e9d24aae671a33e8c3a251ee8fd6483e4b67d1b
 configure.ac                                       |    2 +-
 .../tutorials/grav2d/figs/grav2d-finite-is3.jpg    |  Bin 0 -> 251571 bytes
 .../tutorials/grav2d/figs/grav2d_infin_is2.jpg     |  Bin 0 -> 245092 bytes
 .../tutorials/grav2d/figs/grav2d_infin_nois.jpg    |  Bin 0 -> 296900 bytes
 .../tutorials/grav2d/figs/gravity-mesh.jpg         |  Bin 0 -> 383224 bytes
 doc/userguide/tutorials/grav2d/figs/ref_config.jpg |  Bin 0 -> 365845 bytes
 doc/userguide/tutorials/grav2d/grav2d.lyx          | 1002 ++++
 doc/userguide/tutorials/tutorials.lyx              |   10 +-
 doc/userguide/userguide.lyx                        |   31 +-
 examples/2d/gravity/Makefile.am                    |    6 +-
 examples/2d/gravity/README                         |   63 +-
 examples/2d/gravity/deform_view.pvsm               | 6191 --------------------
 examples/2d/gravity/geometry.jou                   |   20 +-
 examples/2d/gravity/grav_stress.cfg                |    5 +-
 ...ss_infin_is1.cfg => grav_stress_finite_is1.cfg} |   27 +-
 examples/2d/gravity/grav_stress_finite_is2.cfg     |    8 -
 ...s_finite_is2.cfg => grav_stress_finite_is3.cfg} |   21 +-
 ...grav_stress.cfg => grav_stress_finite_nois.cfg} |   31 +-
 examples/2d/gravity/grav_stress_infin_is1.cfg      |   11 -
 examples/2d/gravity/grav_stress_infin_is2.cfg      |   11 -
 ...ess_infin_is2.cfg => grav_stress_infin_is3.cfg} |   21 +-
 ...{grav_stress.cfg => grav_stress_infin_nois.cfg} |   33 +-
 examples/2d/gravity/mat_maxwell.spatialdb          |    5 +-
 examples/2d/gravity/mesh.exo                       |  Bin 0 -> 619904 bytes
 examples/2d/gravity/mesh.jou                       |   18 +-
 examples/2d/gravity/pylithapp.cfg                  |   27 +-
 examples/2d/gravity/stress2spatialdb.py            |   89 +-
 examples/2d/gravity/view_deform.pvsm               | 5153 ++++++++++++++++
 examples/2d/gravity/view_deform_unscaled.pvsm      | 5153 ++++++++++++++++
 29 files changed, 11534 insertions(+), 6404 deletions(-)