Wed Nov 5 15:41:18 PST 2014

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

On branches: baagaard/add-examples-debugging,baagaard/add-release-2.0.3,baagaard/add-release-2.1.0,baagaard/dynrup-new-lagrange,baagaard/feature-output-station-names,baagaard/feature-progress-monitor,baagaard/fix-custom-faultpc,baagaard/fix-error-messages,baagaard/fix-faults-intersect,baagaard/fix-friction-initial-state,baagaard/update-autoconf,knepley/feature-petsc-fe,knepley/upgrade-petsc-3.5,knepley/upgrade-petsc-master,maint,master,next,willic3/fix-plasticity
Link       : https://github.com/geodynamics/pylith/compare/f33c75b19fd60eedb2a3405db76a1fee333bb1d7...5b6d812b1612809fea3bd331c4e5af98c25a536a

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

commit e00660430680abef535ba211abeedff90164f635
Merge: d42a67a 256700b
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Fri Jun 20 13:01:09 2014 -0700

    Merge branch 'baagaard/fix-meshing-examples-trelis' into next
    
    * baagaard/fix-meshing-examples-trelis:
      Updated geometry journal file based on updated surfaces (change in ids).
      Updated meshing README.
      Fixed typo.
      Improve subduction meshing example. Make Trelis compatible.
      Removed obsolete contour meshing example (covered by 3-D subduction).


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

e00660430680abef535ba211abeedff90164f635
 examples/meshing/surface_nurbs/README              |   15 +-
 .../meshing/surface_nurbs/contours/Makefile.am     |   33 -
 examples/meshing/surface_nurbs/contours/README     |   39 -
 .../meshing/surface_nurbs/contours/cont2lines.cfg  |    5 -
 .../meshing/surface_nurbs/contours/cont2lines.py   |  149 -
 .../surface_nurbs/contours/fill_contours.cfg       |    6 -
 .../surface_nurbs/contours/fill_contours.py        |  304 -
 .../surface_nurbs/contours/hikurangi_shiftrot.txt  | 6883 --------------------
 .../surface_nurbs/contours/journal/Makefile.am     |   22 -
 examples/meshing/surface_nurbs/merge_surfs/README  |    2 +-
 .../meshing/surface_nurbs/subduction/geometry.jou  |    7 +-
 .../surface_nurbs/subduction/interface_netsurf.py  |   74 +-
 examples/meshing/surface_nurbs/subduction/mesh.jou |    3 +-
 .../surface_nurbs/subduction/splay_skinsurf.py     |   50 +-
 .../surface_nurbs/subduction/topobath_netsurf.py   |   75 +-
 15 files changed, 114 insertions(+), 7553 deletions(-)