diff --git a/dune/fufem/assemblers/localassemblers/adolclocalenergy.hh b/dune/fufem/assemblers/localassemblers/adolclocalenergy.hh index 13da8f2a100f8f11974677412ed7e0ecacb7aadd..de61570a08a364dd90b8c491d2c92ce5db034da0 100644 --- a/dune/fufem/assemblers/localassemblers/adolclocalenergy.hh +++ b/dune/fufem/assemblers/localassemblers/adolclocalenergy.hh @@ -107,5 +107,5 @@ static typename Lfe::Traits::LocalBasisType::Traits::RangeFieldType tapeEnergy( return pureEnergy; } -}; +} #endif diff --git a/dune/fufem/assemblers/localassemblers/subgridh1functionalassembler.hh b/dune/fufem/assemblers/localassemblers/subgridh1functionalassembler.hh index f1996f596e8d0938f517e6786ab4c1202a60ff57..cd919cf5b883bb11d666b03ba2c1a3a97df825e4 100644 --- a/dune/fufem/assemblers/localassemblers/subgridh1functionalassembler.hh +++ b/dune/fufem/assemblers/localassemblers/subgridh1functionalassembler.hh @@ -192,9 +192,9 @@ class SubgridH1FunctionalAssembler : private: const Function& f_; - const HostGridFunction* fAsHostGridFunction_; const GridType& grid_; const int order_; + const HostGridFunction* fAsHostGridFunction_; const HostBasisGridFunctionInfo* hostBasisGridFunctionInfo_; }; diff --git a/dune/fufem/assemblers/transferoperatorassembler.hh b/dune/fufem/assemblers/transferoperatorassembler.hh index 26a78d123d0ac707411a410d1ca23189c7dd7a18..051095806793c43d36e3b5198e651bdf0252ef05 100644 --- a/dune/fufem/assemblers/transferoperatorassembler.hh +++ b/dune/fufem/assemblers/transferoperatorassembler.hh @@ -172,11 +172,11 @@ class TransferOperatorAssembler { template <class Matrix> void assembleMatrixHierarchy(std::vector<std::shared_ptr<Matrix> >& M) const { - while(M.size() < grid.maxLevel()) + while(M.size() < uint(grid.maxLevel())) M.push_back(std::make_shared<Matrix>()); std::vector <Matrix*> Mraw(M.size()); - for (int i=0; i<M.size(); ++i) + for (size_t i=0; i<M.size(); ++i) Mraw[i] = M[i].get(); assembleMatrixHierarchy(Mraw); diff --git a/dune/fufem/test/common.hh b/dune/fufem/test/common.hh index 37fb98f3f28faa8ceffb9cfc25c2445f512b1d70..d53ff3648cbe198f81eac8ed2217b557d9a614d8 100644 --- a/dune/fufem/test/common.hh +++ b/dune/fufem/test/common.hh @@ -357,7 +357,7 @@ bool checkWithStructuredGrid(TestSuite& suite, int uniformRefinements) template<class HostGridType, class TestSuite> bool checkWithSubGrid(TestSuite& suite, int uniformRefinements, int localRefinements, std::string name) { - typename std::template auto_ptr<HostGridType> gridPtr(constructCoarseGrid<HostGridType>()); + std::shared_ptr<HostGridType> gridPtr(constructCoarseGrid<HostGridType>()); HostGridType& hostgrid = *gridPtr; hostgrid.globalRefine(uniformRefinements); diff --git a/dune/fufem/utilities/gridconstruction.hh b/dune/fufem/utilities/gridconstruction.hh index a0053a07d6410cbdb1919f99ca05aa8308b87785..d8978ef379b2db6cde427bf960f3868170a57a56 100644 --- a/dune/fufem/utilities/gridconstruction.hh +++ b/dune/fufem/utilities/gridconstruction.hh @@ -113,8 +113,6 @@ public: for(unsigned j=0; j<=nElements[1]; j++) factory.insertVertex(FV({lower[0]+i*size[0], lower[1]+j*size[1]})); - bool symmetric = false; - Dune::GeometryType gt; bool tetra = config.get<bool>("tetrahedral"); if (tetra)