From: kronbichler Date: Sun, 28 Sep 2008 17:09:11 +0000 (+0000) Subject: Added a few references to serial TrilinosWrappers vectors. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc489e5f39ca3c3d43e6f5ee65cf79026e62ce29;p=dealii-svn.git Added a few references to serial TrilinosWrappers vectors. git-svn-id: https://svn.dealii.org/trunk@17032 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/source/fe/fe_tools.cc b/deal.II/deal.II/source/fe/fe_tools.cc index 42dd5e1872..98152efbea 100644 --- a/deal.II/deal.II/source/fe/fe_tools.cc +++ b/deal.II/deal.II/source/fe/fe_tools.cc @@ -21,6 +21,8 @@ #include #include #include +#include +#include #include #include #include @@ -2018,6 +2020,54 @@ void FETools::extrapolate Vector &); +#ifdef DEAL_II_USE_TRILINOS + +template +void FETools::interpolate +(const DoFHandler &, const TrilinosWrappers::Vector &, + const DoFHandler &, TrilinosWrappers::Vector &); +template +void FETools::interpolate +(const DoFHandler &, const TrilinosWrappers::Vector &, + const DoFHandler &, const ConstraintMatrix &, + TrilinosWrappers::Vector &); +template +void FETools::back_interpolate +(const DoFHandler &, const TrilinosWrappers::Vector &, + const FiniteElement &, TrilinosWrappers::Vector &); +template +void FETools::back_interpolate +(const DoFHandler &, const ConstraintMatrix &, + const TrilinosWrappers::Vector &, + const DoFHandler &, const ConstraintMatrix &, + TrilinosWrappers::Vector &); +template +void FETools::interpolation_difference +(const DoFHandler &, const TrilinosWrappers::Vector &, + const FiniteElement &, TrilinosWrappers::Vector &); +template +void FETools::interpolation_difference +(const DoFHandler &, const ConstraintMatrix &, + const TrilinosWrappers::Vector &, + const DoFHandler &, const ConstraintMatrix &, + TrilinosWrappers::Vector &); +template +void FETools::project_dg +(const DoFHandler &, const TrilinosWrappers::Vector &, + const DoFHandler &, TrilinosWrappers::Vector &); +template +void FETools::extrapolate +(const DoFHandler &, const TrilinosWrappers::Vector &, + const DoFHandler &, TrilinosWrappers::Vector &); +template +void FETools::extrapolate +(const DoFHandler &, const TrilinosWrappers::Vector &, + const DoFHandler &, const ConstraintMatrix &, + TrilinosWrappers::Vector &); + +#endif + + template void FETools::interpolate (const DoFHandler &, const BlockVector &, @@ -2123,6 +2173,55 @@ void FETools::extrapolate const DoFHandler &, const ConstraintMatrix &, Vector &); + +#ifdef DEAL_II_USE_TRILINOS + +template +void FETools::interpolate +(const DoFHandler &, const TrilinosWrappers::BlockVector &, + const DoFHandler &, TrilinosWrappers::BlockVector &); +template +void FETools::interpolate +(const DoFHandler &, const TrilinosWrappers::BlockVector &, + const DoFHandler &, const ConstraintMatrix &, + TrilinosWrappers::BlockVector &); +template +void FETools::back_interpolate +(const DoFHandler &, const TrilinosWrappers::BlockVector &, + const FiniteElement &, TrilinosWrappers::BlockVector &); +template +void FETools::back_interpolate +(const DoFHandler &, const ConstraintMatrix &, + const TrilinosWrappers::BlockVector &, + const DoFHandler &, const ConstraintMatrix &, + TrilinosWrappers::BlockVector &); +template +void FETools::interpolation_difference +(const DoFHandler &, const TrilinosWrappers::BlockVector &, + const FiniteElement &, TrilinosWrappers::BlockVector &); +template +void FETools::interpolation_difference +(const DoFHandler &, const ConstraintMatrix &, + const TrilinosWrappers::BlockVector &, + const DoFHandler &, const ConstraintMatrix &, + TrilinosWrappers::BlockVector &); +template +void FETools::project_dg +(const DoFHandler &, const TrilinosWrappers::BlockVector &, + const DoFHandler &, TrilinosWrappers::BlockVector &); +template +void FETools::extrapolate +(const DoFHandler &, const TrilinosWrappers::BlockVector &, + const DoFHandler &, TrilinosWrappers::BlockVector &); +template +void FETools::extrapolate +(const DoFHandler &, const TrilinosWrappers::BlockVector &, + const DoFHandler &, const ConstraintMatrix &, + TrilinosWrappers::BlockVector &); + +#endif + + template void FETools::interpolate (const hp::DoFHandler &, const Vector &, diff --git a/deal.II/deal.II/source/grid/grid_refinement.cc b/deal.II/deal.II/source/grid/grid_refinement.cc index c1207500ff..4d29f5353d 100644 --- a/deal.II/deal.II/source/grid/grid_refinement.cc +++ b/deal.II/deal.II/source/grid/grid_refinement.cc @@ -13,6 +13,7 @@ #include #include +#include #include #include @@ -76,6 +77,26 @@ namespace return m; } #endif + + +#ifdef DEAL_II_USE_TRILINOS + TrilinosScalar + max_element (const TrilinosWrappers::Vector &criteria) + { + TrilinosScalar m = 0; + criteria.vector->MaxValue(&m); + return m; + } + + + TrilinosScalar + min_element (const TrilinosWrappers::Vector &criteria) + { + TrilinosScalar m = 0; + criteria.vector->MinValue(&m); + return m; + } +#endif } @@ -583,5 +604,47 @@ refine_and_coarsen_optimize (Triangulation &, const PETScWrappers::Vector &); #endif + +#ifdef DEAL_II_USE_TRILINOS +template +void +GridRefinement:: +refine (Triangulation &, + const TrilinosWrappers::Vector &, + const double); + +template +void +GridRefinement:: +coarsen (Triangulation &, + const TrilinosWrappers::Vector &, + const double); + + +template +void +GridRefinement:: +refine_and_coarsen_fixed_number (Triangulation &, + const TrilinosWrappers::Vector &, + const double, + const double, + const unsigned int); + +template +void +GridRefinement:: +refine_and_coarsen_fixed_fraction (Triangulation &, + const TrilinosWrappers::Vector &, + const double, + const double, + const unsigned int); + +template +void +GridRefinement:: +refine_and_coarsen_optimize (Triangulation &, + const TrilinosWrappers::Vector &); +#endif + DEAL_II_NAMESPACE_CLOSE