[cig-commits] [commit] baagaard/dynrup-new-lagrange: Merge branch 'master' into baagaard/dynrup-new-lagrange (c771342)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Tue Jul 1 09:42:06 PDT 2014


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

On branch  : baagaard/dynrup-new-lagrange
Link       : https://github.com/geodynamics/pylith/compare/2718cca1eccb33a08fd7ae4f9d0c25206daffd99...c7713420c67c7f13dfe041981e51efcce9f262e6

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

commit c7713420c67c7f13dfe041981e51efcce9f262e6
Merge: 2718cca c8e4d80
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Tue Jul 1 09:41:56 2014 -0700

    Merge branch 'master' into baagaard/dynrup-new-lagrange
    
    * master: (40 commits)
      Improved some error messages.
      Incremented version number and updated README.
      Added README to examples/debugging.
      Added debugging to examples Makefile. Updated filenames in debugging Makefile.
      Field: Setup DM field objects
      Solver: Remove DM from Vecs used in MatNullSpace - This avoids a reference cycle
      Update configure.ac for obsolete directories (removed).
      Updated spline creation for compatibility with Trelis.
      Fixed typo in comment.
      Added files to Makefile.
      Added files to Makefile.
      Accidentally removed errors.
      Finished setting up files with error and correct files. Moved correct files to correct directory.
      Add more errors into mat_elastic and step02.
      Small adjustments to errors.
      Introduce some errors into spatialdb file.
      Cleanup some error messages.
      Added files for examples/debugging.
      Improve error message for fault quadrature check.
      Remove old directory from Makefile.
      ...



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

c7713420c67c7f13dfe041981e51efcce9f262e6
 README                                             |   52 +-
 configure.ac                                       |    7 +-
 doc/releasenotes/announce_v2.0.1.txt               |   77 +
 doc/releasenotes/checklist.txt                     |    2 -
 examples/2d/Makefile.am                            |    3 +-
 .../{greensfns/strikeslip => gravity}/Makefile.am  |   22 +-
 examples/2d/gravity/README                         |   43 +
 .../nonplanar => examples/2d/gravity}/geometry.jou |   56 +-
 examples/2d/gravity/grav_stress-initial.spatialdb  |   19 +
 examples/2d/gravity/grav_stress.cfg                |   53 +
 examples/2d/gravity/grav_stress_finite_is2.cfg     |   78 +
 examples/2d/gravity/grav_stress_infin_is1.cfg      |   70 +
 examples/2d/gravity/grav_stress_infin_is2.cfg      |   73 +
 .../mat_elastic.spatialdb}                         |    2 +-
 .../mat_maxwell.spatialdb}                         |    2 +-
 .../strikeslip/mesh_tri3.jou => gravity/mesh.jou}  |   37 +-
 .../2d/gravity/output}/Makefile.am                 |    3 +-
 examples/2d/gravity/output/deform_view.pvsm        | 6191 ++++++++++++++++++
 examples/2d/{subduction => gravity}/pylithapp.cfg  |  147 +-
 examples/2d/gravity/stress2spatialdb.py            |   75 +
 examples/2d/greensfns/README                       |    3 +
 examples/2d/greensfns/reverse/createbc.jou         |   13 +-
 examples/2d/greensfns/reverse/eqslip.spatialdb     |    4 +-
 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/3d/hex8/Makefile.am                       |    7 +-
 examples/Makefile.am                               |    1 +
 .../greensfns/reverse => debugging}/Makefile.am    |   28 +-
 examples/debugging/README                          |    8 +
 .../correct}/mat_elastic.spatialdb                 |    0
 .../{3d/hex8 => debugging/correct}/pylithapp.cfg   |   52 +-
 examples/debugging/correct/step01.cfg              |  108 +
 .../step03.cfg => debugging/correct/step02.cfg}    |  103 +-
 .../step11.cfg => debugging/correct/step03.cfg}    |   93 +-
 .../cubit_cellsize => debugging}/geometry.jou      |   54 +-
 .../spatialdb => debugging}/mat_elastic.spatialdb  |    4 +-
 .../spatialdb => debugging}/mat_maxwell.spatialdb  |    0
 examples/debugging/mesh.exo                        |  Bin 0 -> 30752 bytes
 .../mesh_hex8_1000m.jou => debugging/mesh.jou}     |  100 +-
 examples/{3d/hex8 => debugging}/pylithapp.cfg      |   81 +-
 examples/debugging/step01.cfg                      |  108 +
 .../{3d/hex8/step03.cfg => debugging/step02.cfg}   |  103 +-
 .../{3d/hex8/step11.cfg => debugging/step03.cfg}   |   94 +-
 examples/meshing/cubit_cellsize/Makefile.am        |    3 +-
 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/dem/dem2lines.py    |   19 +-
 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 +-
 libsrc/pylith/bc/AbsorbingDampers.cc               |    4 +-
 libsrc/pylith/bc/BCIntegratorSubMesh.cc            |    6 +-
 libsrc/pylith/bc/DirichletBC.cc                    |   12 +-
 libsrc/pylith/bc/DirichletBoundary.cc              |    2 +-
 libsrc/pylith/bc/Neumann.cc                        |    8 +-
 libsrc/pylith/bc/TimeDependent.cc                  |    2 +-
 libsrc/pylith/bc/TimeDependentPoints.cc            |   14 +-
 libsrc/pylith/faults/BruneSlipFn.cc                |    8 +-
 libsrc/pylith/faults/CohesiveTopology.cc           |   12 +-
 libsrc/pylith/faults/ConstRateSlipFn.cc            |    6 +-
 libsrc/pylith/faults/FaultCohesive.cc              |    3 +-
 libsrc/pylith/faults/FaultCohesiveImpulses.cc      |   11 +-
 libsrc/pylith/faults/FaultCohesiveLagrange.cc      |   12 +-
 libsrc/pylith/faults/TimeHistorySlipFn.cc          |    4 +-
 libsrc/pylith/faults/TopologyOps.cc                |    2 +-
 libsrc/pylith/faults/TractionPerturbation.cc       |    6 +-
 libsrc/pylith/feassemble/CellGeometry.cc           |    3 +-
 libsrc/pylith/friction/FrictionModel.cc            |   10 +-
 libsrc/pylith/materials/ElasticMaterial.cc         |   10 +-
 libsrc/pylith/materials/Material.cc                |   11 +-
 libsrc/pylith/meshio/DataWriterHDF5.cc             |    6 +-
 libsrc/pylith/meshio/DataWriterHDF5Ext.cc          |    6 +-
 libsrc/pylith/meshio/MeshBuilder.cc                |    3 +-
 libsrc/pylith/meshio/MeshIOCubit.cc                |    3 +-
 libsrc/pylith/problems/Solver.cc                   |    2 +
 libsrc/pylith/topology/Field.cc                    |   13 +-
 libsrc/pylith/topology/Fields.cc                   |   18 +-
 libsrc/pylith/topology/Jacobian.cc                 |    8 +-
 libsrc/pylith/topology/Mesh.cc                     |    6 +-
 libsrc/pylith/topology/MeshOps.cc                  |    3 +-
 libsrc/pylith/topology/SolutionFields.cc           |    3 +-
 106 files changed, 7928 insertions(+), 8331 deletions(-)




More information about the CIG-COMMITS mailing list