From 0635b1cd4f06d25174ff22e8f180d6a059d6baea Mon Sep 17 00:00:00 2001 From: heister Date: Wed, 2 Oct 2013 17:35:40 +0000 Subject: [PATCH] remove references to n_default_threads() in error_estimator.h that are ignored anyway. git-svn-id: https://svn.dealii.org/trunk@31072 0785d39b-7218-0410-832d-ea1e28bc413d --- .../deal.II/numerics/error_estimator.h | 36 +++++++++---------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/deal.II/include/deal.II/numerics/error_estimator.h b/deal.II/include/deal.II/numerics/error_estimator.h index 6f15d97c2e..b18fa83acc 100644 --- a/deal.II/include/deal.II/numerics/error_estimator.h +++ b/deal.II/include/deal.II/numerics/error_estimator.h @@ -314,7 +314,7 @@ public: Vector &error, const ComponentMask &component_mask = ComponentMask(), const Function *coefficients = 0, - const unsigned int n_threads = multithread_info.n_default_threads, + const unsigned int n_threads = numbers::invalid_unsigned_int, const types::subdomain_id subdomain_id = numbers::invalid_subdomain_id, const types::material_id material_id = numbers::invalid_material_id); @@ -340,7 +340,7 @@ public: std::vector*> &errors, const ComponentMask &component_mask = ComponentMask(), const Function *coefficients = 0, - const unsigned int n_threads = multithread_info.n_default_threads, + const unsigned int n_threads = numbers::invalid_unsigned_int, const types::subdomain_id subdomain_id = numbers::invalid_subdomain_id, const types::material_id material_id = numbers::invalid_material_id); @@ -356,7 +356,7 @@ public: std::vector*> &errors, const ComponentMask &component_mask = ComponentMask(), const Function *coefficients = 0, - const unsigned int n_threads = multithread_info.n_default_threads, + const unsigned int n_threads = numbers::invalid_unsigned_int, const types::subdomain_id subdomain_id = numbers::invalid_subdomain_id, const types::material_id material_id = numbers::invalid_material_id); @@ -374,7 +374,7 @@ public: Vector &error, const ComponentMask &component_mask = ComponentMask(), const Function *coefficients = 0, - const unsigned int n_threads = multithread_info.n_default_threads, + const unsigned int n_threads = numbers::invalid_unsigned_int, const types::subdomain_id subdomain_id = numbers::invalid_subdomain_id, const types::material_id material_id = numbers::invalid_material_id); @@ -391,7 +391,7 @@ public: Vector &error, const ComponentMask &component_mask = ComponentMask(), const Function *coefficients = 0, - const unsigned int n_threads = multithread_info.n_default_threads, + const unsigned int n_threads = numbers::invalid_unsigned_int, const types::subdomain_id subdomain_id = numbers::invalid_subdomain_id, const types::material_id material_id = numbers::invalid_material_id); @@ -409,7 +409,7 @@ public: std::vector*> &errors, const ComponentMask &component_mask = ComponentMask(), const Function *coefficients = 0, - const unsigned int n_threads = multithread_info.n_default_threads, + const unsigned int n_threads = numbers::invalid_unsigned_int, const types::subdomain_id subdomain_id = numbers::invalid_subdomain_id, const types::material_id material_id = numbers::invalid_material_id); @@ -426,7 +426,7 @@ public: std::vector*> &errors, const ComponentMask &component_mask = ComponentMask(), const Function *coefficients = 0, - const unsigned int n_threads = multithread_info.n_default_threads, + const unsigned int n_threads = numbers::invalid_unsigned_int, const types::subdomain_id subdomain_id = numbers::invalid_subdomain_id, const types::material_id material_id = numbers::invalid_material_id); @@ -498,10 +498,8 @@ public: * bit-vector with all-set entries, or an empty bit-vector. All the other * parameters are as in the general case used for 2d and higher. * - * The estimator supports multithreading and splits the cells to - * multithread_info.n_default_threads (default) threads. The number - * of threads to be used in multithreaded mode can be set with the last - * parameter of the error estimator. Multithreading is not presently + * The parameter n_threads is no longer used and will be ignored. + * Multithreading is not presently * implemented for 1d, but we retain the respective parameter for * compatibility with the function signature in the general case. */ @@ -514,7 +512,7 @@ public: Vector &error, const ComponentMask &component_mask = ComponentMask(), const Function *coefficients = 0, - const unsigned int n_threads = multithread_info.n_default_threads, + const unsigned int n_threads = numbers::invalid_unsigned_int, const types::subdomain_id subdomain_id = numbers::invalid_subdomain_id, const types::material_id material_id = numbers::invalid_material_id); @@ -530,7 +528,7 @@ public: Vector &error, const ComponentMask &component_mask = ComponentMask(), const Function *coefficients = 0, - const unsigned int n_threads = multithread_info.n_default_threads, + const unsigned int n_threads = numbers::invalid_unsigned_int, const types::subdomain_id subdomain_id = numbers::invalid_subdomain_id, const types::material_id material_id = numbers::invalid_material_id); @@ -556,7 +554,7 @@ public: std::vector*> &errors, const ComponentMask &component_mask = ComponentMask(), const Function *coefficients = 0, - const unsigned int n_threads = multithread_info.n_default_threads, + const unsigned int n_threads = numbers::invalid_unsigned_int, const types::subdomain_id subdomain_id = numbers::invalid_subdomain_id, const types::material_id material_id = numbers::invalid_material_id); @@ -572,7 +570,7 @@ public: std::vector*> &errors, const ComponentMask &component_mask = ComponentMask(), const Function *coefficients = 0, - const unsigned int n_threads = multithread_info.n_default_threads, + const unsigned int n_threads = numbers::invalid_unsigned_int, const types::subdomain_id subdomain_id = numbers::invalid_subdomain_id, const types::material_id material_id = numbers::invalid_material_id); @@ -590,7 +588,7 @@ public: Vector &error, const ComponentMask &component_mask = ComponentMask(), const Function *coefficients = 0, - const unsigned int n_threads = multithread_info.n_default_threads, + const unsigned int n_threads = numbers::invalid_unsigned_int, const types::subdomain_id subdomain_id = numbers::invalid_subdomain_id, const types::material_id material_id = numbers::invalid_material_id); @@ -607,7 +605,7 @@ public: Vector &error, const ComponentMask &component_mask = ComponentMask(), const Function *coefficients = 0, - const unsigned int n_threads = multithread_info.n_default_threads, + const unsigned int n_threads = numbers::invalid_unsigned_int, const types::subdomain_id subdomain_id = numbers::invalid_subdomain_id, const types::material_id material_id = numbers::invalid_material_id); @@ -625,7 +623,7 @@ public: std::vector*> &errors, const ComponentMask &component_mask = ComponentMask(), const Function *coefficients = 0, - const unsigned int n_threads = multithread_info.n_default_threads, + const unsigned int n_threads = numbers::invalid_unsigned_int, const types::subdomain_id subdomain_id = numbers::invalid_subdomain_id, const types::material_id material_id = numbers::invalid_material_id); @@ -642,7 +640,7 @@ public: std::vector*> &errors, const ComponentMask &component_mask = ComponentMask(), const Function *coefficients = 0, - const unsigned int n_threads = multithread_info.n_default_threads, + const unsigned int n_threads = numbers::invalid_unsigned_int, const types::subdomain_id subdomain_id = numbers::invalid_subdomain_id, const types::material_id material_id = numbers::invalid_material_id); -- 2.39.5