[cig-commits] [commit] maint: Merge branch 'baagaard/fix-meshing-examples-trelis' into maint (fb01d2b)

[cig_noreply at geodynamics.org]

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

On branch  : maint
Link       : https://github.com/geodynamics/pylith/compare/f33c75b19fd60eedb2a3405db76a1fee333bb1d7...5b6d812b1612809fea3bd331c4e5af98c25a536a

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

commit fb01d2bdd681c7fcb217bf53118d3e61c753246c
Merge: d42a67a 6531fb1
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Sun Jun 22 13:25:50 2014 -0700

    Merge branch 'baagaard/fix-meshing-examples-trelis' into maint
    
    * baagaard/fix-meshing-examples-trelis:
      Remove old directory from Makefile.
      Cleanup of APREPRO lines.
      Cleanup of APREPRO lines.
      Cleanup of APREPRO lines.
      Switched to IDless journal files. Minor cleanup.
      Updated to remove vertices while creating splines.
      Fixed meshing for examples/2d/greensfns/reverse. No object ids used.
      Updated for change in ids (works for CUBIT 14.1 and Trelis 15.0).
      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).



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

fb01d2bdd681c7fcb217bf53118d3e61c753246c
 examples/2d/greensfns/README                       |    3 +
 examples/2d/greensfns/reverse/createbc.jou         |   13 +-
 examples/2d/greensfns/reverse/geometry.jou         |   98 +-
 examples/2d/greensfns/reverse/gradient.jou         |   39 +-
 examples/2d/greensfns/reverse/mesh_tri3.exo        |  Bin 150488 -> 149700 bytes
 examples/2d/greensfns/reverse/mesh_tri3.jou        |    3 +-
 examples/2d/greensfns/strikeslip/createbc.jou      |   18 +-
 examples/2d/greensfns/strikeslip/geometry.jou      |  107 +-
 examples/2d/greensfns/strikeslip/gradient.jou      |   31 +-
 examples/2d/greensfns/strikeslip/mesh_tri3.exo     |  Bin 234976 -> 234976 bytes
 examples/2d/greensfns/strikeslip/mesh_tri3.jou     |    2 +-
 examples/2d/subduction/geometry.jou                |   24 +-
 examples/2d/subduction/mesh_tri3.jou               |    4 +-
 examples/meshing/cubit_cellsize/geometry.jou       |   14 +-
 examples/meshing/cubit_cellsize/mesh_cellsize.jou  |    2 +-
 .../cubit_cellsize/mesh_size_analyticfn.jou        |    8 +-
 .../meshing/cubit_cellsize/mesh_size_spatialdb.jou |    8 +-
 examples/meshing/surface_nurbs/Makefile.am         |    1 -
 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 +-
 examples/meshing/surface_nurbs/subduction/bc.jou   |    5 +-
 .../meshing/surface_nurbs/subduction/geometry.jou  |   23 +-
 .../surface_nurbs/subduction/interface_netsurf.py  |   72 +-
 examples/meshing/surface_nurbs/subduction/mesh.jou |    5 +-
 .../surface_nurbs/subduction/splay_skinsurf.py     |   49 +-
 .../surface_nurbs/subduction/topobath_netsurf.py   |   73 +-
 34 files changed, 377 insertions(+), 7683 deletions(-)