Merge branch 'baagaard/add-release-2.0.1' into maint

* baagaard/add-release-2.0.1:
  Improve error message for fault quadrature check.
  Increment version number to 2.0.1. Added release notes.

Author: baagaard-usgs

README

@@ -1,4 +1,4 @@
-We are pleased to announce release of PyLith version 2.0.0
+We are pleased to announce release of PyLith version 2.0.1
 
 Please submit bug reports via the World Wide Web at:
     https://github.com/geodynamics/pylith/issues
@@ -9,10 +9,10 @@ Please send all questions by electronic mail to:
 PyLith is free software.  See the file COPYING for copying conditions.
 
 This release allows the solution of both quasi-static and dynamic
-problems in one, two, or three dimensions. The code runs in either
-serial or parallel mode, and the design allows for relatively easy
-scripting using the Python programming language. Material properties
-and parameters for boundary and fault conditions are specified using a
+problems in two or three dimensions. The code runs in either serial or
+parallel mode, and the design allows for relatively easy scripting
+using the Python programming language. Material properties and
+parameters for boundary and fault conditions are specified using a
 spatial database, which permits easy prescription of complex spatial
 variations of properties and parameters. Simulation parameters are
 generally specified through the use of simple ASCII files or the
@@ -82,6 +82,27 @@ nodeset/pset should be created and contain the vertices on the buried
 edges of the fault. See the Section 6.4.2 of the PyLith manual for
 more information.
 
+----------------------------------------------------------------------
+Version 2.0.1
+----------------------------------------------------------------------
+
+* Added example (examples/2d/gravity) for viscoelastic deformation in
+  2-D with gravitational body forces and small strain formulation.
+
+* Bug fixes
+
+  - Improved example journal files for CUBIT/Trelis to improve
+    compability. All journal files should work with CUBIT 14.1 and
+    Trelis 15.0.
+
+  - Created examples of IDless journal files in examples/2d/greensfns.
+    These files should work with all recent versions of CUBIT and
+    Trelis.
+
+  - Switched journal APREPRO lines to have leading '$' instead of '#'
+    to differentiate from comments.
+
+
 ----------------------------------------------------------------------
 Version 2.0.0
 ----------------------------------------------------------------------

configure.ac

@@ -17,7 +17,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([PyLith], [2.0.0], [[email protected]])
+AC_INIT([PyLith], [2.0.1], [[email protected]])
 AC_CONFIG_AUX_DIR([./aux-config])
 AC_CONFIG_HEADER([portinfo])
 AC_CONFIG_MACRO_DIR([m4])
@@ -395,8 +395,6 @@ AC_CONFIG_FILES([Makefile
 		examples/twocells/twotri3/Makefile
 		examples/meshing/Makefile
 		examples/meshing/surface_nurbs/Makefile
-		examples/meshing/surface_nurbs/contours/Makefile
-		examples/meshing/surface_nurbs/contours/journal/Makefile
 		examples/meshing/surface_nurbs/dem/Makefile
 		examples/meshing/surface_nurbs/dem/ulines/Makefile
 		examples/meshing/surface_nurbs/dem/vlines/Makefile

doc/releasenotes/announce_v2.0.1.txt

@@ -0,0 +1,77 @@
+Greetings,
+
+I am pleased to announce the release of PyLith 2.0.1, a finite-element
+code designed to solve dynamic elastic problems and quasi-static
+viscoelastic problems in tectonic deformation.
+
+This release improves fixes some issues with CUBIT/Trelis
+compatibility in example journal files.
+
+You can download the source code and binaries from
+
+    http://geodynamics.org/cig/software/packages/short/pylith
+
+Detailed installation instructions for the binary packages are in the
+User Manual with detailed building instructions for a few platforms in
+the INSTALL file bundled with the PyLith Installer utility.
+
+
+======================================================================
+MIGRATING FROM VERSION 1.9 TO 2.0
+======================================================================
+
+Changes to various C++ objects permitted simplifying the specification
+of a number of components. The map below indicates the name changes.
+
+  CellFilterAvgMesh -> CellFilterAvg
+  DataWriterVTKMesh -> DataWriterVTK
+  DataWriterVTKSubMesh -> DataWriterVTK
+  DataWriterVTKSubSubMesh -> DataWriterVTK
+  DataWriterHDF5Mesh -> DataWriterHDF5
+  DataWriterHDF5SubMesh -> DataWriterHDF5
+  DataWriterHDF5SubSubMesh -> DataWriterHDF5
+  DataWriterHDF5ExtMesh -> DataWriterHDF5Ext
+  DataWriterHDF5ExtSubMesh -> DataWriterHDF5Ext
+  DataWriterHDF5ExtSubSubMesh -> DataWriterHDF5Ext
+
+  Running the script:
+
+    bash $PYLITH_DIR/doc/developer/update_1.9to2.0.sh
+
+  will update all .cfg files in the current directory and all
+  subdirectories with the new names (you will need to replace
+  $PYLITH_DIR with the directory containing the PyLith source code).
+
+
+PyLith allows use of the Chaco and ParMetis/Metis partitioners. The
+name of the ParMetis/Metis partitioner was changed from "parmetis" to
+"metis".
+
+  [pylithapp.mesh_generator]
+  distributor.partitioner = metis
+
+Buried edges of faults are handled differently in v2.0. A separate
+nodeset/pset should be created and contain the vertices on the buried
+edges of the fault. See the Section 6.4.2 of the PyLith manual for
+more information.
+
+======================================================================
+RELEASE NOTES - PyLith v2.0.1
+======================================================================
+
+* Added example (examples/2d/gravity) for viscoelastic deformation in
+  2-D with gravitational body forces and small strain formulation.
+
+* Bug fixes
+
+  - Improved example journal files for CUBIT/Trelis to improve
+    compability. All journal files should work with CUBIT 14.1 and
+    Trelis 15.0.
+
+  - Created examples of IDless journal files in examples/2d/greensfns.
+    These files should work with all recent versions of CUBIT and
+    Trelis.
+
+  - Switched journal APREPRO lines to have leading '$' instead of '#'
+    to differentiate from comments.
+

doc/releasenotes/checklist.txt

@@ -28,8 +28,6 @@ SOURCE CODE
 
   * Increment version number in configure.ac.
 
-  * Increment version number in setup.py.
-
   * Add changes to README.
 
   * Add release notes in doc/releasenotes.

libsrc/pylith/faults/FaultCohesiveLagrange.cc

@@ -1069,10 +1069,10 @@ pylith::faults::FaultCohesiveLagrange::verifyConfiguration(const topology::Mesh&
     }
     if (numBasis != cellNumEdges) {
       std::ostringstream msg;
-      msg << "Number of dofs in reference cell (" << numBasis
-          << ") is not compatible with number of edges (" << cellNumEdges
-          << ") in cohesive cell " << cells[i] << " for fault '" << label()
-          << "'.";
+      msg << "Quadrature is incompatible with cell for fault '" << label() << "'.\n"
+	  << "Cell " << cells[i] << " has " << cellNumEdges
+	  << " edges but quadrature reference cell has "
+	  << numBasis << " edges.";
       throw std::runtime_error(msg.str());
     } // if
     err = DMPlexRestoreTransitiveClosure(dmMesh, cells[i], PETSC_TRUE, &closureSize, &closure);PYLITH_CHECK_ERROR(err);