Commit 51f43b6c authored by Christoph Grueninger's avatar Christoph Grueninger
Browse files

[multidomain] Fix various warnings.

Keep compatible to current master modules (PDELab, multidomain)
(reviewed by fetzer)


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13356 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 4b88e32a
......@@ -26,6 +26,8 @@
#include <iostream>
#include <dune/common/version.hh>
#include <dune/pdelab/multidomain/couplingutilities.hh>
#include <dune/pdelab/localoperator/pattern.hh>
#include <dune/pdelab/localoperator/idefault.hh>
......@@ -270,8 +272,13 @@ class TwoCStokesTwoPTwoCLocalOperator :
cParams.fvGeometry1.update(globalProblem_.sdGridView1(), sdElement1);
cParams.fvGeometry2.update(globalProblem_.sdGridView2(), sdElement2);
#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 4)
const int numVertsOfElem1 = sdElement1.subEntities(dim);
const int numVertsOfElem2 = sdElement2.subEntities(dim);
#else
const int numVertsOfElem1 = sdElement1.template count<dim>();
const int numVertsOfElem2 = sdElement2.template count<dim>();
#endif
//bring the local unknowns x_s into a form that can be passed to elemVolVarsCur.update()
Dune::BlockVector<Dune::FieldVector<Scalar,1>> elementSol1(0.);
......
......@@ -24,10 +24,11 @@
#ifndef DUMUX_MULTIDOMAIN_ASSEMBLER_HH
#define DUMUX_MULTIDOMAIN_ASSEMBLER_HH
#include <dune/pdelab/constraints/common/constraintsparameters.hh>
#include <dune/pdelab/multidomain/constraints.hh>
#include "multidomainproperties.hh"
#include "multidomainpropertydefaults.hh"
#include <dune/pdelab/constraints/constraintsparameters.hh>
#include <dune/pdelab/multidomain/constraints.hh>
namespace Dumux {
......
......@@ -32,7 +32,7 @@ template <class TypeTag>
class MultiDomainNewtonController;
template <class TypeTag>
class MultiDomainConvergenceWriter;
struct MultiDomainConvergenceWriter;
namespace Properties
{
......
Supports Markdown
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