From: bangerth Date: Mon, 29 Dec 2008 23:22:25 +0000 (+0000) Subject: Remove some old cruft that happened to be still in this program. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c3248ebb53f7ede1af3a46c6cf2de3a1e51f137;p=dealii-svn.git Remove some old cruft that happened to be still in this program. git-svn-id: https://svn.dealii.org/trunk@18052 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/examples/step-28/step-28.cc b/deal.II/examples/step-28/step-28.cc index 8fd821af2b..a0dccc1b7f 100644 --- a/deal.II/examples/step-28/step-28.cc +++ b/deal.II/examples/step-28/step-28.cc @@ -1,6 +1,3 @@ -//TODO: remove direct (non-eigenvalue) problem possibility (remove -// ExtraneousSource and some stuff in run(), see isour) - /* $Id$ */ /* Version: $Name: $ */ /* */ @@ -2186,12 +2183,7 @@ void NeutronDiffusionProblem::run () double max_old = 0; - // indicate this is a eigenvalue problem - unsigned int isour = 0; - // store relative error between two - // successive power iterations double error; - unsigned int iteration = 1; do { @@ -2205,34 +2197,17 @@ void NeutronDiffusionProblem::run () energy_groups[group]->solve (); } - if (isour==1) + k_eff = get_total_fission_source(); + error = fabs(k_eff-k_eff_old)/fabs(k_eff); + std::cout << " Iteration " << iteration + << ": k_eff=" << k_eff + << std::endl; + k_eff_old=k_eff; + + for (unsigned int group=0; groupsolution.linfty_norm()); - - energy_groups[group]->solution_old = energy_groups[group]->solution; - } - - error = fabs(max_current-max_old)/max_current; - max_old = max_current; - } - else - { - k_eff = get_total_fission_source(); - error = fabs(k_eff-k_eff_old)/fabs(k_eff); - std::cout << " Iteration " << iteration - << ": k_eff=" << k_eff - << std::endl; - k_eff_old=k_eff; - - for (unsigned int group=0; groupsolution_old = energy_groups[group]->solution; - energy_groups[group]->solution_old /= k_eff; - } + energy_groups[group]->solution_old = energy_groups[group]->solution; + energy_groups[group]->solution_old /= k_eff; } ++iteration;