From 64043db64cc6d6490845925e9aa0101557e779e3 Mon Sep 17 00:00:00 2001
From: Thomas Fetzer <thomas.fetzer@iws.uni-stuttgart.de>
Date: Fri, 25 Sep 2015 13:29:04 +0000
Subject: [PATCH] [headercheck]
fixes make headercheck for various files
reviewed by bernd
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@15542 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/decoupled/2p/celldata2padaptive.hh | 2 ++
dumux/decoupled/2p2c/celldata2p2cadaptive.hh | 1 +
dumux/implicit/2pminc/2pminclocalresidual.hh | 4 +---
dumux/implicit/2pminc/2pmincpropertydefaults.hh | 2 +-
.../adaptive/gridadaptinitializationindicator.hh | 4 ++++
.../chemistry/electrochemistry/electrochemistry.hh | 10 ++++++++++
.../chemistry/electrochemistry/electrochemistryni.hh | 11 ++++++++++-
.../fluidmatrixinteractions/2p/philtophoblaw.hh | 2 ++
8 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/dumux/decoupled/2p/celldata2padaptive.hh b/dumux/decoupled/2p/celldata2padaptive.hh
index 7a061f2297..890fc23f4e 100644
--- a/dumux/decoupled/2p/celldata2padaptive.hh
+++ b/dumux/decoupled/2p/celldata2padaptive.hh
@@ -19,6 +19,8 @@
#ifndef DUMUX_ELEMENTDATA2P_ADAPTIVE_HH
#define DUMUX_ELEMENTDATA2P_ADAPTIVE_HH
+#include <dune/grid/utility/persistentcontainer.hh>
+
#include "celldata2p.hh"
/**
diff --git a/dumux/decoupled/2p2c/celldata2p2cadaptive.hh b/dumux/decoupled/2p2c/celldata2p2cadaptive.hh
index a1232ee81e..339a016d0c 100644
--- a/dumux/decoupled/2p2c/celldata2p2cadaptive.hh
+++ b/dumux/decoupled/2p2c/celldata2p2cadaptive.hh
@@ -20,6 +20,7 @@
#define DUMUX_ELEMENTDATA2P2C_ADAPTIVE_HH
#include <dune/common/float_cmp.hh>
+#include <dune/grid/utility/persistentcontainer.hh>
#include <dumux/decoupled/2p2c/celldata2p2c.hh>
#include <dumux/decoupled/2p2c/celldata2p2cmultiphysics.hh>
diff --git a/dumux/implicit/2pminc/2pminclocalresidual.hh b/dumux/implicit/2pminc/2pminclocalresidual.hh
index 2ead0f1dbe..7603f9d807 100644
--- a/dumux/implicit/2pminc/2pminclocalresidual.hh
+++ b/dumux/implicit/2pminc/2pminclocalresidual.hh
@@ -24,10 +24,8 @@
#ifndef DUMUX_TWOPMINC_LOCAL_RESIDUAL_BASE_HH
#define DUMUX_TWOPMINC_LOCAL_RESIDUAL_BASE_HH
-//#include <dumux/implicit/2p/2pmodel.hh>
+#include <dumux/implicit/2p/2plocalresidual.hh>
#include "2pmincproperties.hh"
-#include "2pmincmodel.hh"
-#include "2pmincvolumevariables.hh"
namespace Dumux
{
diff --git a/dumux/implicit/2pminc/2pmincpropertydefaults.hh b/dumux/implicit/2pminc/2pmincpropertydefaults.hh
index 7cdb334e2c..9e3c0beae0 100644
--- a/dumux/implicit/2pminc/2pmincpropertydefaults.hh
+++ b/dumux/implicit/2pminc/2pmincpropertydefaults.hh
@@ -28,10 +28,10 @@
#include <dumux/implicit/2p/2ppropertydefaults.hh>
+#include "2pmincproperties.hh"
#include "2pmincmodel.hh"
#include "2pminclocalresidual.hh"
#include "2pmincvolumevariables.hh"
-#include "2pmincproperties.hh"
#include "2pmincfluxvariables.hh"
#include "2pmincindices.hh"
diff --git a/dumux/implicit/adaptive/gridadaptinitializationindicator.hh b/dumux/implicit/adaptive/gridadaptinitializationindicator.hh
index cd9c317a1f..7bc68f4f1a 100644
--- a/dumux/implicit/adaptive/gridadaptinitializationindicator.hh
+++ b/dumux/implicit/adaptive/gridadaptinitializationindicator.hh
@@ -34,6 +34,10 @@ namespace Dumux
namespace Properties
{
NEW_PROP_TAG(BoundaryTypes);
+NEW_PROP_TAG(ElementBoundaryTypes);
+NEW_PROP_TAG(ElementVolumeVariables);
+NEW_PROP_TAG(FVElementGeometry);
+NEW_PROP_TAG(ImplicitIsBox);
NEW_PROP_TAG(PrimaryVariables);
NEW_PROP_TAG(NumEq);
}
diff --git a/dumux/material/chemistry/electrochemistry/electrochemistry.hh b/dumux/material/chemistry/electrochemistry/electrochemistry.hh
index 840d5032d4..566ef266e2 100644
--- a/dumux/material/chemistry/electrochemistry/electrochemistry.hh
+++ b/dumux/material/chemistry/electrochemistry/electrochemistry.hh
@@ -26,6 +26,7 @@
#include <cmath>
+#include <dumux/common/basicproperties.hh>
#include <dumux/common/exceptions.hh>
#include <dumux/material/constants.hh>
#include <dumux/material/components/component.hh>
@@ -34,6 +35,15 @@
namespace Dumux
{
+namespace Properties
+{
+NEW_PROP_TAG(FluidSystem);
+NEW_PROP_TAG(FVElementGeometry);
+NEW_PROP_TAG(Indices);
+NEW_PROP_TAG(PrimaryVariables);
+NEW_PROP_TAG(VolumeVariables);
+}
+
/*!
* \brief
* The type of electrochemistry models implemented here (Ochs [2008] or Acosta et al. [2006])
diff --git a/dumux/material/chemistry/electrochemistry/electrochemistryni.hh b/dumux/material/chemistry/electrochemistry/electrochemistryni.hh
index ce2395948c..f0a5da97f6 100644
--- a/dumux/material/chemistry/electrochemistry/electrochemistryni.hh
+++ b/dumux/material/chemistry/electrochemistry/electrochemistryni.hh
@@ -22,15 +22,24 @@
* \brief Electrochemical model for a fuel cell application.
*/
-
#ifndef ELECTRO_CHEMNI_HH
#define ELECTRO_CHEMNI_HH
+#include <dumux/common/basicproperties.hh>
#include <dumux/material/constants.hh>
#include <dumux/material/chemistry/electrochemistry/electrochemistry.hh>
namespace Dumux
{
+
+namespace Properties
+{
+NEW_PROP_TAG(FluidSystem);
+NEW_PROP_TAG(Indices);
+NEW_PROP_TAG(VolumeVariables);
+NEW_PROP_TAG(PrimaryVariables);
+}
+
/*!
* \brief
* Class calculating source terms and current densities for fuel cells
diff --git a/dumux/material/fluidmatrixinteractions/2p/philtophoblaw.hh b/dumux/material/fluidmatrixinteractions/2p/philtophoblaw.hh
index c81efb33fb..cb6537419c 100644
--- a/dumux/material/fluidmatrixinteractions/2p/philtophoblaw.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/philtophoblaw.hh
@@ -28,6 +28,8 @@
#ifndef DUMUX_PHIL_TO_PHOB_LAW_HH
#define DUMUX_PHIL_TO_PHOB_LAW_HH
+#include <dune/common/exceptions.hh>
+
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslawparams.hh>
--
GitLab