Commit 775c1d73 authored by Lukas Riedel's avatar Lukas Riedel

Removed unused parameters from FluxErrorEstimator and WaterContentOperator

parent ce4f41c4
......@@ -153,9 +153,6 @@ namespace Dune {
for (unsigned int i = 0; i<lfsu_n.size(); i++)
gradu_n.axpy(x_n(lfsu_n,i),tgradphi_n[i]);
// offset for parameter queries
const RF eps = 1e-9;
// retrieve conductivity
const RF cond_s = conductivity_f_s(saturation_f_s(u_s));
const RF cond_n = conductivity_f_n(saturation_f_n(u_n));
......@@ -233,9 +230,6 @@ namespace Dune {
// position of quadrature point in local coordinates of elements
const Domain local_s = ig.geometryInInside().global(it.position());
// retrieve unit normal vector
const Dune::FieldVector<DF,dim> n_F = ig.unitOuterNormal(it.position());
// evaluate basis functions
std::vector<Scalar> phi_s(lfsu_s.size());
lfsu_s.finiteElement().localBasis().evaluateFunction(local_s,phi_s);
......@@ -245,33 +239,12 @@ namespace Dune {
for (unsigned int i = 0; i<lfsu_s.size(); i++)
u_s += x_s(lfsu_s,i) * phi_s[i];
// evaluate gradient of basis functions (we assume Galerkin method lfsu = lfsv)
typedef typename LFSU::Traits::FiniteElementType::Traits
::LocalBasisType::Traits::JacobianType JacobianType;
std::vector<JacobianType> gradphi_s(lfsu_s.size());
lfsu_s.finiteElement().localBasis().evaluateJacobian(local_s,gradphi_s);
// transform gradients to real element
Dune::FieldMatrix<DF,dim,dim> jac;
std::vector<Vector> tgradphi_s(lfsu_s.size());
jac = ig.inside().geometry().jacobianInverseTransposed(local_s);
for (unsigned int i = 0; i<lfsu_s.size(); i++)
jac.mv(gradphi_s[i][0],tgradphi_s[i]);
// compute gradient of u
Vector gradu_s(0.);
for (unsigned int i = 0; i<lfsu_s.size(); i++)
gradu_s.axpy(x_s(lfsu_s,i),tgradphi_s[i]);
// boundary condition at position
const RF g = boundary.g(ig.intersection(), it.position(), time);
// compute jump in solution
const RF h_jump = u_s - g;
// apply gravity vector
gradu_s -= param.gravity();
// penalty term
const RF penalty = penalty_factor / h_F * degree * (degree + dim - 1);
......
......@@ -71,7 +71,6 @@ public:
{
// evaluate position in element local and global coordinates
const auto p_local = it.position();
const auto p_global = gt.global(p_local);
// evaluate basis function
std::vector<Scalar> phi(lfsu.size());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment