From: Wolfgang Bangerth Date: Fri, 18 May 2001 09:06:44 +0000 (+0000) Subject: Make variables const and thus Intel C++ compiler more happy. X-Git-Tag: v8.0.0~19124 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c034b4d7c379579da4d0f0dc4da8becb599c42e8;p=dealii.git Make variables const and thus Intel C++ compiler more happy. git-svn-id: https://svn.dealii.org/trunk@4670 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/numerics/error_estimator.h b/deal.II/deal.II/include/numerics/error_estimator.h index 7ab4fef26d..73e2375eab 100644 --- a/deal.II/deal.II/include/numerics/error_estimator.h +++ b/deal.II/deal.II/include/numerics/error_estimator.h @@ -278,7 +278,8 @@ class KellyErrorEstimator Vector &error, const std::vector &component_mask = std::vector(), const Function *coefficients = 0, - unsigned int n_threads = multithread_info.n_default_threads); + const unsigned int n_threads = multithread_info.n_default_threads); + /** * Same function as above, but * accepts more than one solution @@ -314,7 +315,7 @@ class KellyErrorEstimator std::vector*> &errors, const std::vector &component_mask = std::vector(), const Function *coefficients = 0, - unsigned int n_threads = multithread_info.n_default_threads); + const unsigned int n_threads = multithread_info.n_default_threads); /** * Calls the @p{estimate} @@ -328,7 +329,7 @@ class KellyErrorEstimator std::vector*> &errors, const std::vector &component_mask = std::vector(), const Function *coefficients = 0, - unsigned int n_threads = multithread_info.n_default_threads); + const unsigned int n_threads = multithread_info.n_default_threads); /** diff --git a/deal.II/deal.II/source/numerics/error_estimator.cc b/deal.II/deal.II/source/numerics/error_estimator.cc index bd58662875..9f17f6a727 100644 --- a/deal.II/deal.II/source/numerics/error_estimator.cc +++ b/deal.II/deal.II/source/numerics/error_estimator.cc @@ -65,6 +65,8 @@ KellyErrorEstimator<1>::Data::Data(const Mapping<1> &, quadrature(* static_cast *> (0)), neumann_bc(* static_cast ::type *> (0)), solutions(* static_cast *> *> (0)), + n_threads (0), + n_solution_vectors (0), face_integrals (* static_cast (0)) { Assert (false, ExcInternalError()); @@ -157,7 +159,7 @@ void KellyErrorEstimator::estimate (const Mapping &mapping, Vector &error, const std::vector &component_mask, const Function *coefficients, - unsigned int n_threads) + const unsigned int n_threads) { // just pass on to the other function const std::vector*> solutions (1, &solution); @@ -175,7 +177,7 @@ void KellyErrorEstimator::estimate (const DoFHandler &dof_handler, Vector &error, const std::vector &component_mask, const Function *coefficients, - unsigned int n_threads) + const unsigned int n_threads) { Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); static const MappingQ1 mapping; @@ -679,7 +681,7 @@ void KellyErrorEstimator::estimate (const DoFHandler &do std::vector*> &errors, const std::vector &component_mask, const Function *coefficients, - unsigned int n_threads) + const unsigned int n_threads) { Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); static const MappingQ1 mapping;