<h3>Specific improvements</h3>
<ol>
+ <li> Fixed: The DerivativeApproximation class did not work for
+ parallel programs. This is now fixed.
+ <br>
+ (Wolfgang Bangerth, 2013/12/18)
+ </li>
+
<li> Fixed: Move the implementation of Subscriptor::(un)subscribe() to
the .cc file so that it is possible to link against the debug library
without specifying <code>-DDEBUG</code>
template <class DerivativeDescription, int dim,
template <int, int> class DH, class InputVector, int spacedim>
static void
- approximate (SynchronousIterators<std_cxx1x::tuple<FilteredIterator<typename DH<dim,spacedim>::active_cell_iterator>,
+ approximate (SynchronousIterators<std_cxx1x::tuple<typename DH<dim,spacedim>::active_cell_iterator,
Vector<float>::iterator> > const &cell,
const Mapping<dim,spacedim> &mapping,
const DH<dim,spacedim> &dof,
Assert (component < dof_handler.get_fe().n_components(),
ExcIndexRange (component, 0, dof_handler.get_fe().n_components()));
- // Only act on the locally owned cells
- typedef FilteredIterator<typename DH<dim,spacedim>::active_cell_iterator> CellFilter;
-
- typedef std_cxx1x::tuple<CellFilter,Vector<float>::iterator>
+ typedef std_cxx1x::tuple<typename DH<dim,spacedim>::active_cell_iterator,Vector<float>::iterator>
Iterators;
- SynchronousIterators<Iterators> begin(Iterators (CellFilter(IteratorFilters::LocallyOwnedCell(),
- dof_handler.begin_active()),derivative_norm.begin())),
- end(Iterators (CellFilter(IteratorFilters::LocallyOwnedCell(),dof_handler.end()),
- derivative_norm.end()));
+ SynchronousIterators<Iterators> begin(Iterators(dof_handler.begin_active(),
+ derivative_norm.begin())),
+ end(Iterators(dof_handler.end(),
+ derivative_norm.end()));
// There is no need for a copier because there is no conflict between threads
// to write in derivative_norm. Scratch and CopyData are also useless.
- WorkStream::run(begin,end,
+ WorkStream::run(begin,
+ end,
static_cast<std_cxx1x::function<void (SynchronousIterators<Iterators> const &,
internal::Assembler::Scratch const &,internal::Assembler::CopyData &)> >
(std_cxx1x::bind(&DerivativeApproximation::template approximate<DerivativeDescription,dim,DH,
template <class DerivativeDescription, int dim,
template <int, int> class DH, class InputVector, int spacedim>
void
-DerivativeApproximation::approximate (SynchronousIterators<std_cxx1x::tuple<FilteredIterator<typename DH<dim,spacedim>::active_cell_iterator>,Vector<float>::iterator> > const &cell,
+DerivativeApproximation::approximate (SynchronousIterators<std_cxx1x::tuple<typename DH<dim,spacedim>::active_cell_iterator,Vector<float>::iterator> > const &cell,
const Mapping<dim,spacedim> &mapping,
const DH<dim,spacedim> &dof_handler,
const InputVector &solution,
const unsigned int component)
{
+ // if the cell is not locally owned, then there is nothing to do
+ if (std_cxx1x::get<0>(cell.iterators)->is_locally_owned() == false)
+ *std_cxx1x::get<1>(cell.iterators) = 0;
+ else
+ {
typename DerivativeDescription::Derivative derivative;
// call the function doing the actual
// work on this cell
// evaluate the norm and fill the vector
//*derivative_norm_on_this_cell
*std_cxx1x::get<1>(cell.iterators) = DerivativeDescription::derivative_norm (derivative);
+ }
}
--------------------------------------------------------
An error occurred in line <3349> of file </ssd/deal-trunk/deal.II/include/deal.II/dofs/dof_accessor.templates.h> in function
void dealii::DoFCellAccessor<DH, lda>::get_dof_values(const InputVector&, ForwardIterator, ForwardIterator) const [with InputVector = dealii::TrilinosWrappers::MPI::Vector, ForwardIterator = double*, DH = dealii::DoFHandler<2>, bool level_dof_access = false]
- The violated condition was:
+ The violated condition was:
this->is_artificial() == false
The name and call sequence of the exception was:
ExcMessage ("Can't ask for DoF indices on artificial cells.")
- Additional Information:
+ Additional Information:
Can't ask for DoF indices on artificial cells.
--------------------------------------------------------
-
+
*/
#include "../tests.h"
vec_rel,
indicators);
- deallog <<"output:" << indicators.l2_norm() << std::endl;
-
+ // we got here, so no exception.
if (myid == 0)
deallog << "OK" << std::endl;
}
-DEAL:0::output:34.4565
DEAL:0::OK
-DEAL:1::output:61.6543
-DEAL:2::output:47.0585
--- /dev/null
+// ---------------------------------------------------------------------
+// $Id$
+//
+// Copyright (C) 2009 - 2013 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.
+//
+// ---------------------------------------------------------------------
+
+
+
+
+// DerivativeApproximation didn't work in parallel at all. This test verifies
+// that it now does.
+
+
+#include "../tests.h"
+#include <deal.II/base/logstream.h>
+#include <deal.II/lac/trilinos_vector.h>
+#include <deal.II/lac/constraint_matrix.h>
+#include <deal.II/grid/tria.h>
+#include <deal.II/distributed/tria.h>
+#include <deal.II/grid/grid_generator.h>
+#include <deal.II/grid/tria_accessor.h>
+#include <deal.II/fe/fe_q.h>
+#include <deal.II/dofs/dof_handler.h>
+#include <deal.II/dofs/dof_tools.h>
+#include <deal.II/base/function.h>
+#include <deal.II/numerics/vector_tools.h>
+#include <deal.II/numerics/derivative_approximation.h>
+
+#include <fstream>
+#include <sstream>
+
+
+template <int dim>
+class Quadratic :
+ public Function<dim>
+{
+public:
+ double value (const Point<dim> &p, const unsigned int) const
+ {
+ return p*p;
+ }
+};
+
+
+template <int dim>
+void test()
+{
+ const unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
+ const unsigned int n_processes = Utilities::MPI::n_mpi_processes (MPI_COMM_WORLD);
+
+ parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
+
+ GridGenerator::hyper_cube(tr);
+ tr.refine_global(2);
+
+ const FE_Q<dim> fe(1);
+ DoFHandler<dim> dofh(tr);
+ dofh.distribute_dofs (fe);
+
+ IndexSet locally_relevant_set;
+ DoFTools::extract_locally_relevant_dofs (dofh,
+ locally_relevant_set);
+
+ // create a vector representing a function that is independent of the number
+ // of processors involved
+ TrilinosWrappers::MPI::Vector vec (dofh.locally_owned_dofs(), MPI_COMM_WORLD);
+ VectorTools::interpolate (dofh, Quadratic<dim>(), vec);
+ vec.compress(VectorOperation::insert);
+
+ // create such a vector with ghost elements and use it to compute
+ // derivative information
+ TrilinosWrappers::MPI::Vector vec_rel ( locally_relevant_set);
+ vec_rel = vec;
+
+ Vector<float> indicators(tr.n_active_cells());
+ DerivativeApproximation::approximate_gradient (dofh,
+ vec_rel,
+ indicators);
+
+ // what we get must be a set of derivative indicators, one for each
+ // cell of the distributed mesh. they need to be the same, no matter
+ // how many processors we use. So, the sum of absolute values must
+ // be the same for any processor number
+ const double sum = Utilities::MPI::sum (indicators.l1_norm(), MPI_COMM_WORLD);
+ if (myid == 0)
+ deallog << sum << std::endl;
+}
+
+
+
+int main(int argc, char *argv[])
+{
+ Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
+
+ MPILogInitAll log;
+
+ test<2> ();
+ test<3> ();
+}
+
--- /dev/null
+
+DEAL:0::23.4892
+DEAL:0::116.543
--- /dev/null
+
+DEAL:0::23.4892
+DEAL:0::116.543
+
+
+
+
--- /dev/null
+
+DEAL:0::23.4892
+DEAL:0::116.543
+
+
+
+
+
+
+
+
+
+
+
+
projects / dealii-svn.git / commitdiff