From: Guido Kanschat Date: Fri, 10 Nov 2000 11:10:50 +0000 (+0000) Subject: bug removed X-Git-Tag: v8.0.0~19955 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71c0bead4b90de52532d4cc9dcc8efdb01da403f;p=dealii.git bug removed git-svn-id: https://svn.dealii.org/trunk@3477 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/base/source/function_lib.cc b/deal.II/base/source/function_lib.cc index 03eaca928a..b27e0e391f 100644 --- a/deal.II/base/source/function_lib.cc +++ b/deal.II/base/source/function_lib.cc @@ -799,7 +799,7 @@ double JumpFunction::value (const Point &p, const unsigned int) const { - double x = steepness*(cosine*p(0)+sine*p(1)); + double x = steepness*(-cosine*p(0)+sine*p(1)); return -atan(x); } @@ -816,7 +816,7 @@ JumpFunction::value_list (const vector > &p, for (unsigned int i=0;i::laplacian (const Point &p, const unsigned int) const { - double x = steepness*(cosine*p(0)+sine*p(1)); + double x = steepness*(-cosine*p(0)+sine*p(1)); double r = 1+x*x; return 2*steepness*steepness*x/(r*r); } @@ -846,7 +846,7 @@ JumpFunction::laplacian_list (const vector > &p, for (unsigned int i=0;i JumpFunction::gradient (const Point &p, const unsigned int) const { - double x = steepness*(cosine*p(0)+sine*p(1)); + double x = steepness*(-cosine*p(0)+sine*p(1)); double r = -steepness*(1+x*x); Tensor<1,dim> erg; erg[0] = cosine*r; diff --git a/deal.II/base/source/parameter_handler.cc b/deal.II/base/source/parameter_handler.cc index 94286d487f..9b49941a22 100644 --- a/deal.II/base/source/parameter_handler.cc +++ b/deal.II/base/source/parameter_handler.cc @@ -775,20 +775,19 @@ void ParameterHandler::log_parameters_section (LogStream &out) // traverse entry list Section::EntryType::const_iterator ptr; - // first find out the longest entry name - unsigned int longest_entry = 0; - for (ptr = pd->entries.begin(); ptr != pd->entries.end(); ++ptr) - if (ptr->first.length() > longest_entry) - longest_entry = ptr->first.length(); - // print entries one by one for (ptr = pd->entries.begin(); ptr != pd->entries.end(); ++ptr) { + if ((pc->entries.find(ptr->first) != pc->entries.end()) && + (pc->entries[ptr->first].first != pd->entries[ptr->first].first)) // check whether this entry is listed // in the Changed tree and actually // differs from the default value - out << ptr->first << setw(longest_entry-ptr->first.length()+2) << "= " - << ptr->second.first << endl; + out << ptr->first << ": " + << pc->entries[ptr->first].first << endl; + else + out << ptr->first << ": " + << ptr->second.first << endl; };