From: bangerth Date: Tue, 18 Oct 2011 06:19:35 +0000 (+0000) Subject: Check in forgotten file. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3301dc0bca52924514a629b2a4fc0ffaee0638af;p=dealii-svn.git Check in forgotten file. git-svn-id: https://svn.dealii.org/trunk@24622 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/source/base/convergence_table.cc b/deal.II/source/base/convergence_table.cc index d2889b2b96..017c6c48ed 100644 --- a/deal.II/source/base/convergence_table.cc +++ b/deal.II/source/base/convergence_table.cc @@ -33,8 +33,8 @@ void ConvergenceTable::evaluate_convergence_rates(const std::string &data_column if (rate_mode==none) return; - std::vector &entries=columns[data_column_key].entries; - std::vector &ref_entries=columns[reference_column_key].entries; + std::vector &entries=columns[data_column_key].entries; + std::vector &ref_entries=columns[reference_column_key].entries; std::string rate_key=data_column_key; const unsigned int n=entries.size(); @@ -46,28 +46,8 @@ void ConvergenceTable::evaluate_convergence_rates(const std::string &data_column for (unsigned int i=0; i*>(entries[i]) != 0) - values[i]=dynamic_cast*>(entries[i])->value(); - else if (dynamic_cast*>(entries[i]) != 0) - values[i]=dynamic_cast*>(entries[i])->value(); - else if (dynamic_cast*>(entries[i]) != 0) - values[i]=dynamic_cast*>(entries[i])->value(); - else if (dynamic_cast*>(entries[i]) != 0) - values[i]=dynamic_cast*>(entries[i])->value(); - else - Assert(false, ExcWrongValueType()); - - // And now the reference values. - if (dynamic_cast*>(ref_entries[i]) != 0) - ref_values[i]=dynamic_cast*>(ref_entries[i])->value(); - else if (dynamic_cast*>(ref_entries[i]) != 0) - ref_values[i]=dynamic_cast*>(ref_entries[i])->value(); - else if (dynamic_cast*>(ref_entries[i]) != 0) - ref_values[i]=dynamic_cast*>(ref_entries[i])->value(); - else if (dynamic_cast*>(ref_entries[i]) != 0) - ref_values[i]=dynamic_cast*>(ref_entries[i])->value(); - else - Assert(false, ExcWrongValueType()); + values[i] = entries[i].get_numeric_value(); + ref_values[i] = ref_entries[i].get_numeric_value(); } switch (rate_mode) @@ -120,25 +100,14 @@ ConvergenceTable::evaluate_convergence_rates(const std::string &data_column_key, { Assert(columns.count(data_column_key), ExcColumnNotExistent(data_column_key)); - std::vector &entries=columns[data_column_key].entries; + std::vector &entries = columns[data_column_key].entries; std::string rate_key=data_column_key+"..."; const unsigned int n=entries.size(); std::vector values(n); for (unsigned int i=0; i*>(entries[i]) != 0) - values[i]=dynamic_cast*>(entries[i])->value(); - else if (dynamic_cast*>(entries[i]) != 0) - values[i]=dynamic_cast*>(entries[i])->value(); - else if (dynamic_cast*>(entries[i]) != 0) - values[i]=dynamic_cast*>(entries[i])->value(); - else if (dynamic_cast*>(entries[i]) != 0) - values[i]=dynamic_cast*>(entries[i])->value(); - else - Assert(false, ExcWrongValueType()); - } + values[i] = entries[i].get_numeric_value(); switch (rate_mode) {