diff --git a/src/assemblers.cc b/src/assemblers.cc index 33739527aa076be35fe60b8a1ff6dba87ef101e2..280b24f4f6ee854a4ce4073b1c75d5fe6cc8fe96 100644 --- a/src/assemblers.cc +++ b/src/assemblers.cc @@ -21,7 +21,7 @@ template <class GridView, int dimension> MyAssembler<GridView, dimension>::MyAssembler(GridView const &_gridView) : vertexBasis(_gridView), gridView(_gridView), - assembler(vertexBasis, vertexBasis) {} + vertexAssembler(vertexBasis, vertexBasis) {} template <class GridView, int dimension> void MyAssembler<GridView, dimension>::assembleFrictionalBoundaryMass( @@ -30,15 +30,15 @@ void MyAssembler<GridView, dimension>::assembleFrictionalBoundaryMass( BoundaryMassAssembler<Grid, BoundaryPatch<GridView>, LocalVertexBasis, LocalVertexBasis, Dune::FieldMatrix<double, 1, 1>> const frictionalBoundaryMassAssembler(frictionalBoundary); - assembler.assembleOperator(frictionalBoundaryMassAssembler, - frictionalBoundaryMass); + vertexAssembler.assembleOperator(frictionalBoundaryMassAssembler, + frictionalBoundaryMass); } template <class GridView, int dimension> void MyAssembler<GridView, dimension>::assembleMass(double density, Matrix &M) { MassAssembler<Grid, LocalVertexBasis, LocalVertexBasis, Dune::ScaledIdentityMatrix<double, dimension>> const localMass; - assembler.assembleOperator(localMass, M); + vertexAssembler.assembleOperator(localMass, M); M *= density; } @@ -47,7 +47,7 @@ void MyAssembler<GridView, dimension>::assembleElasticity(double E, double nu, Matrix &A) { StVenantKirchhoffAssembler<Grid, LocalVertexBasis, LocalVertexBasis> const localStiffness(E, nu); - assembler.assembleOperator(localStiffness, A); + vertexAssembler.assembleOperator(localStiffness, A); } template <class GridView, int dimension> @@ -56,7 +56,7 @@ void MyAssembler<GridView, dimension>::assembleViscosity(double shearViscosity, Matrix &C) { ViscosityAssembler<Grid, LocalVertexBasis, LocalVertexBasis> const localViscosity(shearViscosity, bulkViscosity); - assembler.assembleOperator(localViscosity, C); + vertexAssembler.assembleOperator(localViscosity, C); } template <class GridView, int dimension> @@ -72,7 +72,7 @@ void MyAssembler<GridView, dimension>::assembleBodyForce(double gravity, weightedGravitationalDirection); L2FunctionalAssembler<Grid, LocalVertexBasis, LocalVector> gravityFunctionalAssembler(gravityFunction); - assembler.assembleFunctional(gravityFunctionalAssembler, f); + vertexAssembler.assembleFunctional(gravityFunctionalAssembler, f); } template <class GridView, int dimension> @@ -84,8 +84,8 @@ void MyAssembler<GridView, dimension>::assembleNeumann( ConstantFunction<LocalVector, LocalVector> const fNeumann(localNeumann); NeumannBoundaryAssembler<Grid, LocalVector> neumannBoundaryAssembler( fNeumann); - assembler.assembleBoundaryFunctional(neumannBoundaryAssembler, f, - neumannBoundary); + vertexAssembler.assembleBoundaryFunctional(neumannBoundaryAssembler, f, + neumannBoundary); } template <class GridView, int dimension> @@ -99,8 +99,8 @@ auto MyAssembler<GridView, dimension>::assembleFrictionNonlinearity( constantOneFunction(1); NeumannBoundaryAssembler<Grid, typename ScalarVector::block_type> frictionalBoundaryAssembler(constantOneFunction); - assembler.assembleBoundaryFunctional(frictionalBoundaryAssembler, weights, - frictionalBoundary); + vertexAssembler.assembleBoundaryFunctional(frictionalBoundaryAssembler, + weights, frictionalBoundary); } for (size_t i = 0; i < weights.size(); ++i) assert(weights[i] >= 0.0); diff --git a/src/assemblers.hh b/src/assemblers.hh index 04e04287c777799a8747eb5c48cf812a25f4ca89..36f1d357359ad1ae04ff75a83122ec27c3ed758f 100644 --- a/src/assemblers.hh +++ b/src/assemblers.hh @@ -28,7 +28,7 @@ template <class GridView, int dimension> class MyAssembler { using LocalVertexBasis = typename VertexBasis::LocalFiniteElement; GridView const &gridView; - Assembler<VertexBasis, VertexBasis> assembler; + Assembler<VertexBasis, VertexBasis> vertexAssembler; public: MyAssembler(GridView const &gridView);