From: Jean-Paul Pelteret Date: Thu, 8 Feb 2018 11:34:05 +0000 (+0100) Subject: Fix error: Multiple defs. of internal::SolverBicgstabData constructor X-Git-Tag: v9.0.0-rc1~457^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3127359a3ed3b84ee51d9ce73b6d556c88d2826a;p=dealii.git Fix error: Multiple defs. of internal::SolverBicgstabData constructor Relates to #5817 --- diff --git a/include/deal.II/lac/solver_bicgstab.h b/include/deal.II/lac/solver_bicgstab.h index 89089636cb..70160571d9 100644 --- a/include/deal.II/lac/solver_bicgstab.h +++ b/include/deal.II/lac/solver_bicgstab.h @@ -307,19 +307,6 @@ SolverBicgstab::IterationResult::IterationResult -internal::SolverBicgstabData::SolverBicgstabData () - : - alpha(0.), - beta(0.), - omega(0.), - rho(0.), - rhobar(0.), - step(numbers::invalid_unsigned_int), - res(numbers::signaling_nan()) -{} - - - template SolverBicgstab::SolverBicgstab (SolverControl &cn, VectorMemory &mem, diff --git a/source/lac/CMakeLists.txt b/source/lac/CMakeLists.txt index defcbb0fb2..641a066998 100644 --- a/source/lac/CMakeLists.txt +++ b/source/lac/CMakeLists.txt @@ -39,6 +39,7 @@ SET(_unity_include_src relaxation_block.cc read_write_vector.cc solver.cc + solver_bicgstab.cc solver_control.cc sparse_decomposition.cc sparse_direct.cc diff --git a/source/lac/solver_bicgstab.cc b/source/lac/solver_bicgstab.cc new file mode 100644 index 0000000000..d49c7ef0c4 --- /dev/null +++ b/source/lac/solver_bicgstab.cc @@ -0,0 +1,34 @@ +// --------------------------------------------------------------------- +// +// Copyright (C) 1998 - 2017 by the deal.II authors +// +// This file is part of the deal.II library. +// +// The deal.II library is free software; you can use it, redistribute +// it, and/or modify it under the terms of the GNU Lesser General +// Public License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// The full text of the license can be found in the file LICENSE at +// the top level of the deal.II distribution. +// +// --------------------------------------------------------------------- + + +#include + +DEAL_II_NAMESPACE_OPEN + + +internal::SolverBicgstabData::SolverBicgstabData () + : + alpha(0.), + beta(0.), + omega(0.), + rho(0.), + rhobar(0.), + step(numbers::invalid_unsigned_int), + res(numbers::signaling_nan()) +{} + + +DEAL_II_NAMESPACE_CLOSE