From: bangerth Date: Fri, 9 Mar 2007 17:51:59 +0000 (+0000) Subject: Output the numbers of the DoF, not of the constraint. Also, no need to output node... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43166dbddcc9c5de90f49cfe86997d73c041fb22;p=dealii-svn.git Output the numbers of the DoF, not of the constraint. Also, no need to output node numbers if we don't want to attach any attributes to it. git-svn-id: https://svn.dealii.org/trunk@14564 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/source/dofs/dof_constraints.cc b/deal.II/deal.II/source/dofs/dof_constraints.cc index 2ad16f6521..549c08d275 100644 --- a/deal.II/deal.II/source/dofs/dof_constraints.cc +++ b/deal.II/deal.II/source/dofs/dof_constraints.cc @@ -450,6 +450,7 @@ void ConstraintMatrix::merge (const ConstraintMatrix &other_constraints) // constraints in the two objects // are for different degrees of // freedom +#ifdef DEBUG if (true) { // first insert all dofs in @@ -461,8 +462,10 @@ void ConstraintMatrix::merge (const ConstraintMatrix &other_constraints) // ...then check whether it // appears in the other object - // as well. note that we have - // to do this in a somewhat + // as well (in which case we + // would need to issue an + // error). note that we have to + // do this in a somewhat // complicated style since the // two objects may not be // sorted @@ -491,6 +494,7 @@ void ConstraintMatrix::merge (const ConstraintMatrix &other_constraints) AssertThrow (this_dofs.find (e->first) == this_dofs.end(), ExcDoFIsConstrainedToConstrainedDoF (e->first)); } +#endif // store the previous state with // respect to sorting @@ -1393,9 +1397,8 @@ ConstraintMatrix::write_dot (std::ostream &out) const << std::endl; for (unsigned int i=0; i!=lines.size(); ++i) { - out << " " << i << ";\n"; for (unsigned int j=0; j!=lines[i].entries.size(); ++j) - out << " " << i << "->" << lines[i].entries[j].first + out << " " << lines[i].line << "->" << lines[i].entries[j].first << "; // weight: " << lines[i].entries[j].second << "\n";