Skip to content
Snippets Groups Projects
Commit 4885db68 authored by Lisa Julia Nebel's avatar Lisa Julia Nebel
Browse files

Remove unused variable from globalmapper.hh and rename coarseGlobalDof_ to globalDof_

This array contains the global numbering for the degrees of freedom
on the whole grid hierarchy, not only on the coarsest level.
parent 46499ede
No related branches found
No related tags found
1 merge request!44Read in deformation function on each process and adapt riemannian trustregion solver - parallel assembly works again!
...@@ -28,12 +28,11 @@ namespace Dune { ...@@ -28,12 +28,11 @@ namespace Dune {
Master m = Dune::ParMG::entityMasterRank(basis.gridView(), [&](int, int codim) -> bool { Master m = Dune::ParMG::entityMasterRank(basis.gridView(), [&](int, int codim) -> bool {
return dofmap.codimSet().test(codim); return dofmap.codimSet().test(codim);
}); });
DofMaster dofmaster = Dune::ParMG::dofMaster(basis, m);
coarseGlobalDof_ = globalDof(basis,m, dofmap); globalDof_ = globalDof(basis,m, dofmap);
// total number of degrees of freedom // total number of degrees of freedom
size_ = coarseGlobalDof_.size; size_ = globalDof_.size;
} }
#else #else
GlobalMapper(const Basis& basis) GlobalMapper(const Basis& basis)
...@@ -46,7 +45,7 @@ namespace Dune { ...@@ -46,7 +45,7 @@ namespace Dune {
/** \brief Given a local index, retrieve its index globally unique over all processes. */ /** \brief Given a local index, retrieve its index globally unique over all processes. */
Index index(const int& localIndex) const { Index index(const int& localIndex) const {
#if HAVE_DUNE_PARMG #if HAVE_DUNE_PARMG
return coarseGlobalDof_.globalDof[localIndex]; return globalDof_.globalDof[localIndex];
#else #else
return localIndex; return localIndex;
#endif #endif
...@@ -58,7 +57,7 @@ namespace Dune { ...@@ -58,7 +57,7 @@ namespace Dune {
} }
#if HAVE_DUNE_PARMG #if HAVE_DUNE_PARMG
ParMG::GlobalDof coarseGlobalDof_; ParMG::GlobalDof globalDof_;
#endif #endif
std::size_t size_; std::size_t size_;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment