From 35a87c38d90d4202d83fe3513e58491fb8ed2001 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Sat, 18 May 2019 15:22:10 +0200
Subject: [PATCH] [material] Prefix some header guards with DUMUX

---
 .../fluidmatrixinteractions/1p/thermalconductivityaverage.hh  | 4 ++--
 .../fluidmatrixinteractions/2p/thermalconductivityjohansen.hh | 4 ++--
 .../2p/thermalconductivitysimplefluidlumping.hh               | 4 ++--
 .../fluidmatrixinteractions/2p/thermalconductivitysomerton.hh | 4 ++--
 .../3p/thermalconductivitysomerton3p.hh                       | 4 ++--
 .../fluidmatrixinteractions/diffusivityconstanttortuosity.hh  | 4 ++--
 .../fluidmatrixinteractions/diffusivitymillingtonquirk.hh     | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/dumux/material/fluidmatrixinteractions/1p/thermalconductivityaverage.hh b/dumux/material/fluidmatrixinteractions/1p/thermalconductivityaverage.hh
index d749f29544..e3fb2f519e 100644
--- a/dumux/material/fluidmatrixinteractions/1p/thermalconductivityaverage.hh
+++ b/dumux/material/fluidmatrixinteractions/1p/thermalconductivityaverage.hh
@@ -21,8 +21,8 @@
  * \ingroup Fluidmatrixinteractions
  * \brief Reation for a simple effective thermal conductivity
  */
-#ifndef THERMALCONDUCTIVITY_AVERAGE_HH
-#define THERMALCONDUCTIVITY_AVERAGE_HH
+#ifndef DUMUX_MATERIAL_THERMALCONDUCTIVITY_AVERAGE_HH
+#define DUMUX_MATERIAL_THERMALCONDUCTIVITY_AVERAGE_HH
 
 #include <algorithm>
 
diff --git a/dumux/material/fluidmatrixinteractions/2p/thermalconductivityjohansen.hh b/dumux/material/fluidmatrixinteractions/2p/thermalconductivityjohansen.hh
index 44ed8b858e..aa77b0cf62 100644
--- a/dumux/material/fluidmatrixinteractions/2p/thermalconductivityjohansen.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/thermalconductivityjohansen.hh
@@ -21,8 +21,8 @@
  * \ingroup Fluidmatrixinteractions
  * \brief   Relation for the saturation-dependent effective thermal conductivity
  */
-#ifndef THERMALCONDUCTIVITY_JOHANSEN_HH
-#define THERMALCONDUCTIVITY_JOHANSEN_HH
+#ifndef DUMUX_MATERIAL_THERMALCONDUCTIVITY_JOHANSEN_HH
+#define DUMUX_MATERIAL_THERMALCONDUCTIVITY_JOHANSEN_HH
 
 #include <cmath>
 #include <algorithm>
diff --git a/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysimplefluidlumping.hh b/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysimplefluidlumping.hh
index cc8c2fe791..6af6c99348 100644
--- a/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysimplefluidlumping.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysimplefluidlumping.hh
@@ -21,8 +21,8 @@
  * \ingroup Fluidmatrixinteractions
  * \brief   Relation for the saturation-dependent effective thermal conductivity
  */
-#ifndef THERMALCONDUCTIVITY_SIMPLE_FLUID_LUMPING_HH
-#define THERMALCONDUCTIVITY_SIMPLE_FLUID_LUMPING_HH
+#ifndef DUMUX_MATERIAL_THERMALCONDUCTIVITY_SIMPLE_FLUID_LUMPING_HH
+#define DUMUX_MATERIAL_THERMALCONDUCTIVITY_SIMPLE_FLUID_LUMPING_HH
 
 #include <assert.h>
 #include <algorithm>
diff --git a/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh b/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh
index 6f1033a355..c8e42067e5 100644
--- a/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh
@@ -21,8 +21,8 @@
  * \ingroup Fluidmatrixinteractions
  * \brief   Relation for the saturation-dependent effective thermal conductivity
  */
-#ifndef THERMALCONDUCTIVITY_SOMERTON_HH
-#define THERMALCONDUCTIVITY_SOMERTON_HH
+#ifndef DUMUX_MATERIAL_THERMALCONDUCTIVITY_SOMERTON_HH
+#define DUMUX_MATERIAL_THERMALCONDUCTIVITY_SOMERTON_HH
 
 #include <algorithm>
 #include <cmath>
diff --git a/dumux/material/fluidmatrixinteractions/3p/thermalconductivitysomerton3p.hh b/dumux/material/fluidmatrixinteractions/3p/thermalconductivitysomerton3p.hh
index 9becaa4597..07a25aa533 100644
--- a/dumux/material/fluidmatrixinteractions/3p/thermalconductivitysomerton3p.hh
+++ b/dumux/material/fluidmatrixinteractions/3p/thermalconductivitysomerton3p.hh
@@ -21,8 +21,8 @@
  * \ingroup Fluidmatrixinteractions
  * \brief   Relation for the saturation-dependent effective thermal conductivity
  */
-#ifndef THERMALCONDUCTIVITY_SOMERTON_3P_HH
-#define THERMALCONDUCTIVITY_SOMERTON_3P_HH
+#ifndef DUMUX_MATERIAL_THERMALCONDUCTIVITY_SOMERTON_3P_HH
+#define DUMUX_MATERIAL_THERMALCONDUCTIVITY_SOMERTON_3P_HH
 
 #include <algorithm>
 #include <cmath>
diff --git a/dumux/material/fluidmatrixinteractions/diffusivityconstanttortuosity.hh b/dumux/material/fluidmatrixinteractions/diffusivityconstanttortuosity.hh
index 90690ba4c2..18678f1577 100644
--- a/dumux/material/fluidmatrixinteractions/diffusivityconstanttortuosity.hh
+++ b/dumux/material/fluidmatrixinteractions/diffusivityconstanttortuosity.hh
@@ -21,8 +21,8 @@
  * \ingroup Fluidmatrixinteractions
  * \brief   Relation for the saturation-dependent effective diffusion coefficient
  */
-#ifndef DIFFUSIVITY_CONSTANT_TORTUOSITY_HH
-#define DIFFUSIVITY_CONSTANT_TORTUOSITY_HH
+#ifndef DUMUX_MATERIAL_DIFFUSIVITY_CONSTANT_TORTUOSITY_HH
+#define DUMUX_MATERIAL_DIFFUSIVITY_CONSTANT_TORTUOSITY_HH
 
 #include <dumux/common/parameters.hh>
 
diff --git a/dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh b/dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh
index db34ccd7af..57ba6a9d66 100644
--- a/dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh
+++ b/dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh
@@ -21,8 +21,8 @@
  * \ingroup Fluidmatrixinteractions
  * \brief   Relation for the saturation-dependent effective diffusion coefficient
  */
-#ifndef DIFFUSIVITY_MILLINGTON_QUIRK_HH
-#define DIFFUSIVITY_MILLINGTON_QUIRK_HH
+#ifndef DUMUX_MATERIAL_DIFFUSIVITY_MILLINGTON_QUIRK_HH
+#define DUMUX_MATERIAL_DIFFUSIVITY_MILLINGTON_QUIRK_HH
 
 #include <cmath>
 
-- 
GitLab