Wed Nov 5 15:42:24 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 8c209346f4530dafd48b8c266f9c94af4d07d234
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Sun Jun 22 17:24:59 2014 -0700

    Cleanup some error messages.


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

8c209346f4530dafd48b8c266f9c94af4d07d234
 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/ConstRateSlipFn.cc |  6 +++---
 9 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/libsrc/pylith/bc/AbsorbingDampers.cc b/libsrc/pylith/bc/AbsorbingDampers.cc
index 8a2c331..dc58860 100644
--- a/libsrc/pylith/bc/AbsorbingDampers.cc
+++ b/libsrc/pylith/bc/AbsorbingDampers.cc
@@ -186,8 +186,8 @@ pylith::bc::AbsorbingDampers::initialize(const topology::Mesh& mesh,
             << "(";
         for (int i=0; i < spaceDim; ++i)
           msg << "  " << quadPtsGlobal[iQuad*spaceDim+i];
-        msg << ") for absorbing boundary condition " << _label << "\n"
-            << "using spatial database " << _db->label() << ".";
+        msg << ") for absorbing boundary condition '" << _label
+            << "' using spatial database '" << _db->label() << "'.";
         throw std::runtime_error(msg.str());
       } // if
       // Nondimensionalize damping constants
diff --git a/libsrc/pylith/bc/BCIntegratorSubMesh.cc b/libsrc/pylith/bc/BCIntegratorSubMesh.cc
index 46d0ffb..5d24d3d 100644
--- a/libsrc/pylith/bc/BCIntegratorSubMesh.cc
+++ b/libsrc/pylith/bc/BCIntegratorSubMesh.cc
@@ -104,8 +104,7 @@ pylith::bc::BCIntegratorSubMesh::verifyConfiguration(const topology::Mesh& mesh)
   if (_quadrature->cellDim() != _boundaryMesh->dimension()) {
     std::ostringstream msg;
     msg << "Quadrature is incompatible with cells for boundary condition '"
-	<< _label << "'.\n"
-	<< "Dimension of boundary mesh: " << _boundaryMesh->dimension()
+	<< _label << "'. Dimension of boundary mesh: " << _boundaryMesh->dimension()
 	<< ", dimension of quadrature: " << _quadrature->cellDim()
 	<< ".";
     throw std::runtime_error(msg.str());
@@ -132,8 +131,7 @@ pylith::bc::BCIntegratorSubMesh::verifyConfiguration(const topology::Mesh& mesh)
     if (numCorners != cellNumCorners) {
       std::ostringstream msg;
       msg << "Quadrature is incompatible with cell for boundary condition '"
-	  << _label << "'.\n"
-	  << "Cell " << c << " has " << cellNumCorners
+	  << _label << "'. Cell " << c << " has " << cellNumCorners
 	  << " vertices but quadrature reference cell has "
 	  << numCorners << " vertices.";
       throw std::runtime_error(msg.str());
diff --git a/libsrc/pylith/bc/DirichletBC.cc b/libsrc/pylith/bc/DirichletBC.cc
index 39f58f4..f6f2a93 100644
--- a/libsrc/pylith/bc/DirichletBC.cc
+++ b/libsrc/pylith/bc/DirichletBC.cc
@@ -107,10 +107,10 @@ pylith::bc::DirichletBC::setConstraintSizes(const topology::Field& field)
     if (cdof + numFixedDOF > dof) {
       std::ostringstream msg;
       msg
-	<< "Found overly constrained point while setting up constraints for\n"
-	<< "DirichletBC boundary condition '" << _label << "'.\n"
+	<< "Found overly constrained point while setting up constraints for "
+	<< "DirichletBC boundary condition '" << _label << "'. "
 	<< "Number of DOF at point " << point << " is " << dof
-	<< "\nand number of attempted constraints is " << cdof+numFixedDOF << ".";
+	<< " and number of attempted constraints is " << cdof+numFixedDOF << ".";
       throw std::runtime_error(msg.str());
     } // if
     _offsetLocal[iPoint] = cdof;
@@ -158,9 +158,9 @@ pylith::bc::DirichletBC::setConstraints(const topology::Field& field)
       for (int jDOF=0; jDOF < numFixedDOF; ++jDOF)
         if (allCInd[iDOF] == _bcDOF[jDOF]) {
           std::ostringstream msg;
-          msg << "Found multiple constraints on degrees of freedom at\n"
-              << "point while setting up constraints for DirichletBC\n"
-              << "boundary condition '" << _label << "'.\n"
+          msg << "Found multiple constraints on degrees of freedom at "
+              << "point while setting up constraints for DirichletBC "
+              << "boundary condition '" << _label << "'. "
 	      << "Degree of freedom " << _bcDOF[jDOF] 
               << " is already constrained by another Dirichlet BC.";
           throw std::runtime_error(msg.str());
diff --git a/libsrc/pylith/bc/DirichletBoundary.cc b/libsrc/pylith/bc/DirichletBoundary.cc
index ef0e368..8ed8a19 100644
--- a/libsrc/pylith/bc/DirichletBoundary.cc
+++ b/libsrc/pylith/bc/DirichletBoundary.cc
@@ -203,7 +203,7 @@ pylith::bc::DirichletBoundary::_bufferScalar(const char* name,
 
   if (!_parameters->hasField(name)) {
     std::ostringstream msg;
-    msg << "Parameters for field '" << label << " not provided in "
+    msg << "Parameters for field '" << label << "' not provided in "
 	<< "Dirichlet BC '" << _label << "'.";
     throw std::runtime_error(msg.str());
   } // if
diff --git a/libsrc/pylith/bc/Neumann.cc b/libsrc/pylith/bc/Neumann.cc
index 701fa69..b512541 100644
--- a/libsrc/pylith/bc/Neumann.cc
+++ b/libsrc/pylith/bc/Neumann.cc
@@ -175,10 +175,6 @@ pylith::bc::Neumann::verifyConfiguration(const topology::Mesh& mesh) const
 { // verifyConfiguration
   PYLITH_METHOD_BEGIN;
 
-  if (1 == mesh.dimension())
-    throw std::runtime_error("Neumann boundary conditions are not "
-			     "implemented for a 1-D mesh.");
-
   BCIntegratorSubMesh::verifyConfiguration(mesh);
 
   PYLITH_METHOD_END;
@@ -453,8 +449,8 @@ pylith::bc::Neumann::_queryDB(const char* name,
         msg << "Could not find values at (";
         for (int i=0; i < spaceDim; ++i)
           msg << " " << quadPtsGlobal[i+iSpace];
-        msg << ") for traction boundary condition " << _label << "\n"
-            << "using spatial database " << db->label() << ".";
+        msg << ") for traction boundary condition '" << _label
+            << "' using spatial database '" << db->label() << "'.";
         throw std::runtime_error(msg.str());
       } // if
     } // for
diff --git a/libsrc/pylith/bc/TimeDependent.cc b/libsrc/pylith/bc/TimeDependent.cc
index 3edc231..41147c2 100644
--- a/libsrc/pylith/bc/TimeDependent.cc
+++ b/libsrc/pylith/bc/TimeDependent.cc
@@ -62,7 +62,7 @@ pylith::bc::TimeDependent::verifyConfiguration(const topology::Mesh& mesh) const
 { // verifyConfiguration
   if (!_dbChange && _dbTimeHistory) {
     std::ostringstream msg;
-    msg << "Time dependent boundary condition '" << _getLabel() << "',\n has a "
+    msg << "Time dependent boundary condition '" << _getLabel() << "', has a "
 	<< "time history database but not change in value spatial database.";
     throw std::runtime_error(msg.str());
   } // if
diff --git a/libsrc/pylith/bc/TimeDependentPoints.cc b/libsrc/pylith/bc/TimeDependentPoints.cc
index 94432cd..dd365a4 100644
--- a/libsrc/pylith/bc/TimeDependentPoints.cc
+++ b/libsrc/pylith/bc/TimeDependentPoints.cc
@@ -266,7 +266,7 @@ pylith::bc::TimeDependentPoints::_queryDB(const char* name,
       msg << "Error querying for '" << name << "' at (";
       for (int i=0; i < spaceDim; ++i)
         msg << "  " << coordsVertex[i];
-      msg << ") using spatial database " << db->label() << ".";
+      msg << ") using spatial database '" << db->label() << "'.";
       throw std::runtime_error(msg.str());
     } // if
     normalizer.nondimensionalize(&valueVertex[0], valueVertex.size(), scale);
@@ -372,8 +372,8 @@ pylith::bc::TimeDependentPoints::_calculateValue(const PylithScalar t)
 	  if (err) {
 	    std::ostringstream msg;
 	    msg << "Error querying for time '" << tDim 
-		<< "' in time history database "
-		<< _dbTimeHistory->label() << ".";
+		<< "' in time history database '"
+		<< _dbTimeHistory->label() << "'.";
 	    throw std::runtime_error(msg.str());
 	  } // if
 	} // if
@@ -485,8 +485,8 @@ pylith::bc::TimeDependentPoints::_calculateValueIncr(const PylithScalar t0,
           if (err) {
             std::ostringstream msg;
             msg << "Error querying for time '" << tDim 
-                << "' in time history database "
-                << _dbTimeHistory->label() << ".";
+                << "' in time history database '"
+                << _dbTimeHistory->label() << "'.";
             throw std::runtime_error(msg.str());
           } // if
           tDim = t1 - tChange;
@@ -495,8 +495,8 @@ pylith::bc::TimeDependentPoints::_calculateValueIncr(const PylithScalar t0,
           if (err) {
             std::ostringstream msg;
             msg << "Error querying for time '" << tDim 
-                << "' in time history database "
-                << _dbTimeHistory->label() << ".";
+                << "' in time history database '"
+                << _dbTimeHistory->label() << "'.";
             throw std::runtime_error(msg.str());
           } // if
         } // if
diff --git a/libsrc/pylith/faults/BruneSlipFn.cc b/libsrc/pylith/faults/BruneSlipFn.cc
index 6413f28..d2a4a3f 100644
--- a/libsrc/pylith/faults/BruneSlipFn.cc
+++ b/libsrc/pylith/faults/BruneSlipFn.cc
@@ -145,7 +145,7 @@ pylith::faults::BruneSlipFn::initialize(const topology::Mesh& faultMesh,
     } // case 3
     default :
       std::ostringstream msg;
-      msg << "Bad spatial dimension '" << spaceDim << " in BruneSlipFn'." << std::endl;
+      msg << "Bad spatial dimension '" << spaceDim << "' in BruneSlipFn." << std::endl;
       throw std::logic_error(msg.str());
     } // switch
 
@@ -189,7 +189,7 @@ pylith::faults::BruneSlipFn::initialize(const topology::Mesh& faultMesh,
       msg << "Could not find slip rate at (";
       for (int i=0; i < spaceDim; ++i)
         msg << "  " << vCoordsGlobal[i];
-      msg << ") using spatial database " << _dbFinalSlip->label() << ".";
+      msg << ") using spatial database '" << _dbFinalSlip->label() << "'.";
       throw std::runtime_error(msg.str());
     } // if
     normalizer.nondimensionalize(&_slipVertex[0], _slipVertex.size(), lengthScale);
@@ -203,7 +203,7 @@ pylith::faults::BruneSlipFn::initialize(const topology::Mesh& faultMesh,
       msg << "Could not find slip initiation time at (";
       for (int i=0; i < spaceDim; ++i)
         msg << "  " << vCoordsGlobal[i];
-      msg << ") using spatial database " << _dbSlipTime->label() << ".";
+      msg << ") using spatial database '" << _dbSlipTime->label() << "'.";
       throw std::runtime_error(msg.str());
     } // if
     normalizer.nondimensionalize(&_slipTimeVertex, 1, timeScale);
@@ -219,7 +219,7 @@ pylith::faults::BruneSlipFn::initialize(const topology::Mesh& faultMesh,
       msg << "Could not find rise time at (";
       for (int i=0; i < spaceDim; ++i)
         msg << "  " << vCoordsGlobal[i];
-      msg << ") using spatial database " << _dbRiseTime->label() << ".";
+      msg << ") using spatial database '" << _dbRiseTime->label() << "'.";
       throw std::runtime_error(msg.str());
     } // if
     normalizer.nondimensionalize(&_riseTimeVertex, 1, timeScale);
diff --git a/libsrc/pylith/faults/ConstRateSlipFn.cc b/libsrc/pylith/faults/ConstRateSlipFn.cc
index cd92c3a..ca336c7 100644
--- a/libsrc/pylith/faults/ConstRateSlipFn.cc
+++ b/libsrc/pylith/faults/ConstRateSlipFn.cc
@@ -134,7 +134,7 @@ pylith::faults::ConstRateSlipFn::initialize(const topology::Mesh& faultMesh,
     } // case 3
     default :
       std::ostringstream msg;
-      msg << "Bad spatial dimension '" << spaceDim << " in ConstRateSlipFn'." << std::endl;
+      msg << "Bad spatial dimension '" << spaceDim << "' in ConstRateSlipFn." << std::endl;
       throw std::logic_error(msg.str());
     } // switch
 
@@ -174,7 +174,7 @@ pylith::faults::ConstRateSlipFn::initialize(const topology::Mesh& faultMesh,
       msg << "Could not find slip rate at (";
       for (int i=0; i < spaceDim; ++i)
         msg << "  " << vCoordsGlobal[i];
-      msg << ") using spatial database " << _dbSlipRate->label() << ".";
+      msg << ") using spatial database '" << _dbSlipRate->label() << "'.";
       throw std::runtime_error(msg.str());
     } // if
     normalizer.nondimensionalize(&_slipRateVertex[0], _slipRateVertex.size(), velocityScale);
@@ -188,7 +188,7 @@ pylith::faults::ConstRateSlipFn::initialize(const topology::Mesh& faultMesh,
       msg << "Could not find slip initiation time at (";
       for (int i=0; i < spaceDim; ++i)
         msg << "  " << vCoordsGlobal[i];
-      msg << ") using spatial database " << _dbSlipTime->label() << ".";
+      msg << ") using spatial database '" << _dbSlipTime->label() << "'.";
       throw std::runtime_error(msg.str());
     } // if
     normalizer.nondimensionalize(&_slipTimeVertex, 1, timeScale);

