guard macros: _HH -> _HPP

2025-02-25 18:55:30 -06:00 · 2013-11-13 18:45:52 +01:00
parent f451a0629b
commit 0b1c225b1a
102 changed files with 207 additions and 207 deletions
--- a/opm/material/Constants.hpp
+++ b/opm/material/Constants.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::Constants
 */
-#ifndef OPM_CONSTANTS_HH
-#define OPM_CONSTANTS_HH
+#ifndef OPM_CONSTANTS_HPP
+#define OPM_CONSTANTS_HPP

 #include <cmath>

--- a/opm/material/DynamicTabulated2dFunction.hpp
+++ b/opm/material/DynamicTabulated2dFunction.hpp
@@ -21,8 +21,8 @@
 *
 * \copydoc Opm::DynamicTabulated2DFunction
 */
-#ifndef OPM_DYNAMIC_TABULATED_2D_FUNCTION_HH
-#define OPM_DYNAMIC_TABULATED_2D_FUNCTION_HH
+#ifndef OPM_DYNAMIC_TABULATED_2D_FUNCTION_HPP
+#define OPM_DYNAMIC_TABULATED_2D_FUNCTION_HPP

 #include <opm/core/utility/Exceptions.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
--- a/opm/material/IdealGas.hpp
+++ b/opm/material/IdealGas.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::IdealGas
 */
-#ifndef OPM_IDEAL_GAS_HH
-#define OPM_IDEAL_GAS_HH
+#ifndef OPM_IDEAL_GAS_HPP
+#define OPM_IDEAL_GAS_HPP

 #include <opm/material/Constants.hpp>

--- a/opm/material/StaticTabulated2dFunction.hpp
+++ b/opm/material/StaticTabulated2dFunction.hpp
@@ -21,8 +21,8 @@
 *
 * \copydoc Opm::StaticTabulated2DFunction
 */
-#ifndef OPM_STATIC_TABULATED_2D_FUNCTION_HH
-#define OPM_STATIC_TABULATED_2D_FUNCTION_HH
+#ifndef OPM_STATIC_TABULATED_2D_FUNCTION_HPP
+#define OPM_STATIC_TABULATED_2D_FUNCTION_HPP

 #include <opm/core/utility/Exceptions.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
--- a/opm/material/Tabulated2dFunction.hpp
+++ b/opm/material/Tabulated2dFunction.hpp
@@ -21,8 +21,8 @@
 *
 * \copydoc Opm::Tabulated2DFunction
 */
-#ifndef OPM_TABULATED_2D_FUNCTION_HH
-#define OPM_TABULATED_2D_FUNCTION_HH
+#ifndef OPM_TABULATED_2D_FUNCTION_HPP
+#define OPM_TABULATED_2D_FUNCTION_HPP

 #include <opm/core/utility/Exceptions.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
--- a/opm/material/Valgrind.hpp
+++ b/opm/material/Valgrind.hpp
@@ -20,8 +20,8 @@
 * \file
 * \brief Some templates to wrap the valgrind macros
 */
-#ifndef OPM_VALGRIND_HH
-#define OPM_VALGRIND_HH
+#ifndef OPM_VALGRIND_HPP
+#define OPM_VALGRIND_HPP

 #include <opm/core/utility/Unused.hpp>

--- a/opm/material/binarycoefficients/Air_Mesitylene.hpp
+++ b/opm/material/binarycoefficients/Air_Mesitylene.hpp
@@ -21,8 +21,8 @@
 * \file
 * \copydoc Opm::BinaryCoeff::Air_Mesitylene
 */
-#ifndef OPM_BINARY_COEFF_AIR_MESITYLENE_HH
-#define OPM_BINARY_COEFF_AIR_MESITYLENE_HH
+#ifndef OPM_BINARY_COEFF_AIR_MESITYLENE_HPP
+#define OPM_BINARY_COEFF_AIR_MESITYLENE_HPP

 #include <opm/material/components/Air.hpp>
 #include <opm/material/components/Mesitylene.hpp>
--- a/opm/material/binarycoefficients/Air_Xylene.hpp
+++ b/opm/material/binarycoefficients/Air_Xylene.hpp
@@ -21,8 +21,8 @@
 * \file
 * \copydoc Opm::BinaryCoeff::Air_Xylene
 */
-#ifndef OPM_BINARY_COEFF_AIR_XYLENE_HH
-#define OPM_BINARY_COEFF_AIR_XYLENE_HH
+#ifndef OPM_BINARY_COEFF_AIR_XYLENE_HPP
+#define OPM_BINARY_COEFF_AIR_XYLENE_HPP

 #include <opm/material/components/Air.hpp>
 #include <opm/material/components/Xylene.hpp>
--- a/opm/material/binarycoefficients/Brine_CO2.hpp
+++ b/opm/material/binarycoefficients/Brine_CO2.hpp
@@ -21,8 +21,8 @@
 *
 * \copydoc Opm::BinaryCoeff::Brine_CO2
 */
-#ifndef OPM_BINARY_COEFF_BRINE_CO2_HH
-#define OPM_BINARY_COEFF_BRINE_CO2_HH
+#ifndef OPM_BINARY_COEFF_BRINE_CO2_HPP
+#define OPM_BINARY_COEFF_BRINE_CO2_HPP

 #include <opm/material/components/Brine.hpp>
 #include <opm/material/components/H2O.hpp>
--- a/opm/material/binarycoefficients/FullerMethod.hpp
+++ b/opm/material/binarycoefficients/FullerMethod.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::BinaryCoeff::fullerMethod
 */
-#ifndef OPM_FULLERMETHOD_HH
-#define OPM_FULLERMETHOD_HH
+#ifndef OPM_FULLERMETHOD_HPP
+#define OPM_FULLERMETHOD_HPP

 #include <opm/core/utility/Average.hpp>

--- a/opm/material/binarycoefficients/H2O_Air.hpp
+++ b/opm/material/binarycoefficients/H2O_Air.hpp
@@ -21,8 +21,8 @@
 * \file
 * \copydoc Opm::BinaryCoeff::H2O_Air
 */
-#ifndef OPM_BINARY_COEFF_H2O_AIR_HH
-#define OPM_BINARY_COEFF_H2O_AIR_HH
+#ifndef OPM_BINARY_COEFF_H2O_AIR_HPP
+#define OPM_BINARY_COEFF_H2O_AIR_HPP

 #include <cmath>

--- a/opm/material/binarycoefficients/H2O_CO2.hpp
+++ b/opm/material/binarycoefficients/H2O_CO2.hpp
@@ -21,8 +21,8 @@
 *
 * \copydoc Opm::BinaryCoeff::H2O_CO2
 */
-#ifndef OPM_BINARY_COEFF_H2O_CO2_HH
-#define OPM_BINARY_COEFF_H2O_CO2_HH
+#ifndef OPM_BINARY_COEFF_H2O_CO2_HPP
+#define OPM_BINARY_COEFF_H2O_CO2_HPP

 #include <opm/material/binarycoefficients/HenryIapws.hpp>
 #include <opm/material/binarycoefficients/FullerMethod.hpp>
--- a/opm/material/binarycoefficients/H2O_Mesitylene.hpp
+++ b/opm/material/binarycoefficients/H2O_Mesitylene.hpp
@@ -21,8 +21,8 @@
 * \file
 * \copydoc Opm::BinaryCoeff::H2O_Mesitylene
 */
-#ifndef OPM_BINARY_COEFF_H2O_MESITYLENE_HH
-#define OPM_BINARY_COEFF_H2O_MESITYLENE_HH
+#ifndef OPM_BINARY_COEFF_H2O_MESITYLENE_HPP
+#define OPM_BINARY_COEFF_H2O_MESITYLENE_HPP

 #include <opm/material/components/H2O.hpp>
 #include <opm/material/components/Mesitylene.hpp>
--- a/opm/material/binarycoefficients/H2O_N2.hpp
+++ b/opm/material/binarycoefficients/H2O_N2.hpp
@@ -21,8 +21,8 @@
 * \file
 * \copydoc Opm::BinaryCoeff::H2O_N2
 */
-#ifndef OPM_BINARY_COEFF_H2O_N2_HH
-#define OPM_BINARY_COEFF_H2O_N2_HH
+#ifndef OPM_BINARY_COEFF_H2O_N2_HPP
+#define OPM_BINARY_COEFF_H2O_N2_HPP

 #include "HenryIapws.hpp"
 #include "FullerMethod.hpp"
--- a/opm/material/binarycoefficients/H2O_Xylene.hpp
+++ b/opm/material/binarycoefficients/H2O_Xylene.hpp
@@ -21,8 +21,8 @@
 * \file
 * \copydoc Opm::BinaryCoeff::H2O_Xylene
 */
-#ifndef OPM_BINARY_COEFF_H2O_XYLENE_HH
-#define OPM_BINARY_COEFF_H2O_XYLENE_HH
+#ifndef OPM_BINARY_COEFF_H2O_XYLENE_HPP
+#define OPM_BINARY_COEFF_H2O_XYLENE_HPP

 #include <opm/material/components/H2O.hpp>
 #include <opm/material/components/Xylene.hpp>
--- a/opm/material/binarycoefficients/HenryIapws.hpp
+++ b/opm/material/binarycoefficients/HenryIapws.hpp
@@ -21,8 +21,8 @@
 *
 * \brief The IAPWS formulation of Henry coefficients in water.
 */
-#ifndef OPM_HENRY_IAPWS_HH
-#define OPM_HENRY_IAPWS_HH
+#ifndef OPM_HENRY_IAPWS_HPP
+#define OPM_HENRY_IAPWS_HPP

 #include <opm/material/components/H2O.hpp>

@@ -81,4 +81,4 @@ inline Scalar henryIAPWS(Scalar E,
 }
 } // namespace Opm

-#endif // OPM_HENRY_IAPWS_HH
+#endif // OPM_HENRY_IAPWS_HPP
--- a/opm/material/components/Air.hpp
+++ b/opm/material/components/Air.hpp
@@ -21,8 +21,8 @@
 * \file
 * \copydoc Opm::Air
 */
-#ifndef OPM_AIR_HH
-#define OPM_AIR_HH
+#ifndef OPM_AIR_HPP
+#define OPM_AIR_HPP

 #include <opm/material/components/Component.hpp>
 #include <opm/material/IdealGas.hpp>
--- a/opm/material/components/Brine.hpp
+++ b/opm/material/components/Brine.hpp
@@ -21,8 +21,8 @@
 *
 * \copydoc Opm::Brine
 */
-#ifndef OPM_BRINE_HH
-#define OPM_BRINE_HH
+#ifndef OPM_BRINE_HPP
+#define OPM_BRINE_HPP

 #include <opm/material/components/Component.hpp>

--- a/opm/material/components/CO2.hpp
+++ b/opm/material/components/CO2.hpp
@@ -21,8 +21,8 @@
 *
 * \copydoc Opm::CO2
 */
-#ifndef OPM_CO2_HH
-#define OPM_CO2_HH
+#ifndef OPM_CO2_HPP
+#define OPM_CO2_HPP

 #include <opm/core/utility/Exceptions.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
--- a/opm/material/components/Component.hpp
+++ b/opm/material/components/Component.hpp
@@ -22,8 +22,8 @@
 * \file
 * \copydoc Opm::Component
 */
-#ifndef OPM_COMPONENT_HH
-#define OPM_COMPONENT_HH
+#ifndef OPM_COMPONENT_HPP
+#define OPM_COMPONENT_HPP

 #include <opm/core/utility/ErrorMacros.hpp>
 #include <opm/core/utility/Exceptions.hpp>
--- a/opm/material/components/Dnapl.hpp
+++ b/opm/material/components/Dnapl.hpp
@@ -22,8 +22,8 @@
 * \file
 * \copydoc Opm::DNAPL
 */
-#ifndef OPM_DNAPL_HH
-#define OPM_DNAPL_HH
+#ifndef OPM_DNAPL_HPP
+#define OPM_DNAPL_HPP

 #include <opm/material/IdealGas.hpp>
 #include "Component.hpp"
--- a/opm/material/components/H2O.hpp
+++ b/opm/material/components/H2O.hpp
@@ -21,8 +21,8 @@
 * \file
 * \copydoc Opm::H2O
 */
-#ifndef OPM_H2O_HH
-#define OPM_H2O_HH
+#ifndef OPM_H2O_HPP
+#define OPM_H2O_HPP

 #include <cmath>
 #include <cassert>
--- a/opm/material/components/Lnapl.hpp
+++ b/opm/material/components/Lnapl.hpp
@@ -22,8 +22,8 @@
 * \file
 * \copydoc Opm::LNAPL
 */
-#ifndef OPM_LNAPL_HH
-#define OPM_LNAPL_HH
+#ifndef OPM_LNAPL_HPP
+#define OPM_LNAPL_HPP

 #include "Component.hpp"

--- a/opm/material/components/Mesitylene.hpp
+++ b/opm/material/components/Mesitylene.hpp
@@ -22,8 +22,8 @@
 * \file
 * \copydoc Opm::Mesitylene
 */
-#ifndef OPM_MESITYLENE_HH
-#define OPM_MESITYLENE_HH
+#ifndef OPM_MESITYLENE_HPP
+#define OPM_MESITYLENE_HPP

 #include <opm/material/IdealGas.hpp>
 #include <opm/material/components/Component.hpp>
--- a/opm/material/components/N2.hpp
+++ b/opm/material/components/N2.hpp
@@ -22,8 +22,8 @@
 * \file
 * \copydoc Opm::N2
 */
-#ifndef OPM_N2_HH
-#define OPM_N2_HH
+#ifndef OPM_N2_HPP
+#define OPM_N2_HPP

 #include <opm/material/IdealGas.hpp>

--- a/opm/material/components/NullComponent.hpp
+++ b/opm/material/components/NullComponent.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::NullComponent
 */
-#ifndef OPM_NULL_COMPONENT_HH
-#define OPM_NULL_COMPONENT_HH
+#ifndef OPM_NULL_COMPONENT_HPP
+#define OPM_NULL_COMPONENT_HPP

 #include "Component.hpp"

--- a/opm/material/components/SimpleCO2.hpp
+++ b/opm/material/components/SimpleCO2.hpp
@@ -23,8 +23,8 @@
 *
 * \copydoc Opm::SimpleCO2
 */
-#ifndef OPM_SIMPLE_CO2_HH
-#define OPM_SIMPLE_CO2_HH
+#ifndef OPM_SIMPLE_CO2_HPP
+#define OPM_SIMPLE_CO2_HPP

 #include <opm/material/IdealGas.hpp>
 #include <opm/material/components/Component.hpp>
--- a/opm/material/components/SimpleH2O.hpp
+++ b/opm/material/components/SimpleH2O.hpp
@@ -21,8 +21,8 @@
 * \file
 * \copydoc Opm::SimpleH2O
 */
-#ifndef OPM_SIMPLE_H2O_HH
-#define OPM_SIMPLE_H2O_HH
+#ifndef OPM_SIMPLE_H2O_HPP
+#define OPM_SIMPLE_H2O_HPP

 #include <opm/material/IdealGas.hpp>

--- a/opm/material/components/TabulatedComponent.hpp
+++ b/opm/material/components/TabulatedComponent.hpp
@@ -23,8 +23,8 @@
 *
 * \copydoc Opm::TabulatedComponent
 */
-#ifndef OPM_TABULATED_COMPONENT_HH
-#define OPM_TABULATED_COMPONENT_HH
+#ifndef OPM_TABULATED_COMPONENT_HPP
+#define OPM_TABULATED_COMPONENT_HPP

 #include <cmath>
 #include <limits>
--- a/opm/material/components/Unit.hpp
+++ b/opm/material/components/Unit.hpp
@@ -21,8 +21,8 @@
 * \file
 * \copydoc Opm::Unit
 */
-#ifndef OPM_UNIT_HH
-#define OPM_UNIT_HH
+#ifndef OPM_UNIT_HPP
+#define OPM_UNIT_HPP

 #include "Component.hpp"

--- a/opm/material/components/Xylene.hpp
+++ b/opm/material/components/Xylene.hpp
@@ -22,8 +22,8 @@
 * \file
 * \copydoc Opm::Xylene
 */
-#ifndef OPM_XYLENE_HH
-#define OPM_XYLENE_HH
+#ifndef OPM_XYLENE_HPP
+#define OPM_XYLENE_HPP

 #include <cmath>
 #include <opm/material/IdealGas.hpp>
--- a/opm/material/components/iapws/Common.hpp
+++ b/opm/material/components/iapws/Common.hpp
@@ -22,8 +22,8 @@
 * \file
 * \copydoc Opm::IAPWS::Common
 */
-#ifndef OPM_IAPWS_COMMON_HH
-#define OPM_IAPWS_COMMON_HH
+#ifndef OPM_IAPWS_COMMON_HPP
+#define OPM_IAPWS_COMMON_HPP

 #include <opm/material/Constants.hpp>

--- a/opm/material/components/iapws/Region1.hpp
+++ b/opm/material/components/iapws/Region1.hpp
@@ -22,8 +22,8 @@
 * \file
 * \copydoc Opm::IAPWS::Region1
 */
-#ifndef OPM_IAPWS_REGION1_HH
-#define OPM_IAPWS_REGION1_HH
+#ifndef OPM_IAPWS_REGION1_HPP
+#define OPM_IAPWS_REGION1_HPP

 #include <cmath>

--- a/opm/material/components/iapws/Region2.hpp
+++ b/opm/material/components/iapws/Region2.hpp
@@ -22,8 +22,8 @@
 * \file
 * \copydoc Opm::IAPWS::Region2
 */
-#ifndef OPM_IAPWS_REGION2_HH
-#define OPM_IAPWS_REGION2_HH
+#ifndef OPM_IAPWS_REGION2_HPP
+#define OPM_IAPWS_REGION2_HPP

 #include <cmath>

--- a/opm/material/components/iapws/Region4.hpp
+++ b/opm/material/components/iapws/Region4.hpp
@@ -21,8 +21,8 @@
 * \file
 * \copydoc Opm::IAPWS::Region4
 */
-#ifndef OPM_IAPWS_REGION4_HH
-#define OPM_IAPWS_REGION4_HH
+#ifndef OPM_IAPWS_REGION4_HPP
+#define OPM_IAPWS_REGION4_HPP

 #include <cmath>

--- a/opm/material/constraintsolvers/CompositionFromFugacities.hpp
+++ b/opm/material/constraintsolvers/CompositionFromFugacities.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::CompositionFromFugacities
 */
-#ifndef OPM_COMPOSITION_FROM_FUGACITIES_HH
-#define OPM_COMPOSITION_FROM_FUGACITIES_HH
+#ifndef OPM_COMPOSITION_FROM_FUGACITIES_HPP
+#define OPM_COMPOSITION_FROM_FUGACITIES_HPP

 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>
--- a/opm/material/constraintsolvers/ComputeFromReferencePhase.hpp
+++ b/opm/material/constraintsolvers/ComputeFromReferencePhase.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::ComputeFromReferencePhase
 */
-#ifndef OPM_COMPUTE_FROM_REFERENCE_PHASE_HH
-#define OPM_COMPUTE_FROM_REFERENCE_PHASE_HH
+#ifndef OPM_COMPUTE_FROM_REFERENCE_PHASE_HPP
+#define OPM_COMPUTE_FROM_REFERENCE_PHASE_HPP

 #include <opm/material/constraintsolvers/CompositionFromFugacities.hpp>

--- a/opm/material/constraintsolvers/ImmiscibleFlash.hpp
+++ b/opm/material/constraintsolvers/ImmiscibleFlash.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::ImmiscibleFlash
 */
-#ifndef OPM_IMMISCIBLE_FLASH_HH
-#define OPM_IMMISCIBLE_FLASH_HH
+#ifndef OPM_IMMISCIBLE_FLASH_HPP
+#define OPM_IMMISCIBLE_FLASH_HPP

 #include <opm/core/utility/ErrorMacros.hpp>
 #include <opm/core/utility/Exceptions.hpp>
--- a/opm/material/constraintsolvers/MiscibleMultiPhaseComposition.hpp
+++ b/opm/material/constraintsolvers/MiscibleMultiPhaseComposition.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::MiscibleMultiPhaseComposition
 */
-#ifndef OPM_MISCIBLE_MULTIPHASE_COMPOSITION_HH
-#define OPM_MISCIBLE_MULTIPHASE_COMPOSITION_HH
+#ifndef OPM_MISCIBLE_MULTIPHASE_COMPOSITION_HPP
+#define OPM_MISCIBLE_MULTIPHASE_COMPOSITION_HPP

 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>
--- a/opm/material/constraintsolvers/NcpFlash.hpp
+++ b/opm/material/constraintsolvers/NcpFlash.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::NcpFlash
 */
-#ifndef OPM_NCP_FLASH_HH
-#define OPM_NCP_FLASH_HH
+#ifndef OPM_NCP_FLASH_HPP
+#define OPM_NCP_FLASH_HPP

 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>
--- a/opm/material/eos/PengRobinson.hpp
+++ b/opm/material/eos/PengRobinson.hpp
@@ -21,8 +21,8 @@
 *
 * \copydoc Opm::PengRobinson
 */
-#ifndef OPM_PENG_ROBINSON_HH
-#define OPM_PENG_ROBINSON_HH
+#ifndef OPM_PENG_ROBINSON_HPP
+#define OPM_PENG_ROBINSON_HPP

 #include <opm/material/fluidstates/TemperatureOverlayFluidState.hpp>
 #include <opm/material/IdealGas.hpp>
--- a/opm/material/eos/PengRobinsonMixture.hpp
+++ b/opm/material/eos/PengRobinsonMixture.hpp
@@ -21,8 +21,8 @@
 * \file
 * \copydoc Opm::PengRobinsonMixture
 */
-#ifndef OPM_PENG_ROBINSON_MIXTURE_HH
-#define OPM_PENG_ROBINSON_MIXTURE_HH
+#ifndef OPM_PENG_ROBINSON_MIXTURE_HPP
+#define OPM_PENG_ROBINSON_MIXTURE_HPP

 #include "PengRobinson.hpp"

--- a/opm/material/eos/PengRobinsonParams.hpp
+++ b/opm/material/eos/PengRobinsonParams.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::PengRobinsonParams
 */
-#ifndef OPM_PENG_ROBINSON_PARAMS_HH
-#define OPM_PENG_ROBINSON_PARAMS_HH
+#ifndef OPM_PENG_ROBINSON_PARAMS_HPP
+#define OPM_PENG_ROBINSON_PARAMS_HPP

 #include <opm/material/Valgrind.hpp>

--- a/opm/material/eos/PengRobinsonparamsMixture.hpp
+++ b/opm/material/eos/PengRobinsonparamsMixture.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::PengRobinsonParamsMixture
 */
-#ifndef OPM_PENG_ROBINSON_PARAMS_MIXTURE_HH
-#define OPM_PENG_ROBINSON_PARAMS_MIXTURE_HH
+#ifndef OPM_PENG_ROBINSON_PARAMS_MIXTURE_HPP
+#define OPM_PENG_ROBINSON_PARAMS_MIXTURE_HPP

 #include <algorithm>
 #include <opm/material/Constants.hpp>
--- a/opm/material/fluidmatrixinteractions/3p/3pParkerVanGenuchten.hpp
+++ b/opm/material/fluidmatrixinteractions/3p/3pParkerVanGenuchten.hpp
@@ -22,8 +22,8 @@
 * \file
 * \copydoc Opm::ThreePParkerVanGenuchten
 */
-#ifndef OPM_3P_PARKER_VAN_GENUCHTEN_HH
-#define OPM_3P_PARKER_VAN_GENUCHTEN_HH
+#ifndef OPM_3P_PARKER_VAN_GENUCHTEN_HPP
+#define OPM_3P_PARKER_VAN_GENUCHTEN_HPP

 #include "3pParkerVanGenuchtenParams.hpp"

--- a/opm/material/fluidmatrixinteractions/3p/3pParkerVanGenuchtenParams.hpp
+++ b/opm/material/fluidmatrixinteractions/3p/3pParkerVanGenuchtenParams.hpp
@@ -22,8 +22,8 @@
 * \file
 * \copydoc Opm::ParkerVanGen3PParams
 */
-#ifndef OPM_3P_PARKER_VAN_GENUCHTEN_PARAMS_HH
-#define OPM_3P_PARKER_VAN_GENUCHTEN_PARAMS_HH
+#ifndef OPM_3P_PARKER_VAN_GENUCHTEN_PARAMS_HPP
+#define OPM_3P_PARKER_VAN_GENUCHTEN_PARAMS_HPP

 #include <dune/common/fvector.hh>

--- a/opm/material/fluidmatrixinteractions/BrooksCorey.hpp
+++ b/opm/material/fluidmatrixinteractions/BrooksCorey.hpp
@@ -21,8 +21,8 @@
 * \file
 * \copydoc Opm::BrooksCorey
 */
-#ifndef OPM_BROOKS_COREY_HH
-#define OPM_BROOKS_COREY_HH
+#ifndef OPM_BROOKS_COREY_HPP
+#define OPM_BROOKS_COREY_HPP

 #include "BrooksCoreyParams.hpp"

@@ -445,4 +445,4 @@ public:
 };
 } // namespace Opm

-#endif // BROOKS_COREY_HH
+#endif // BROOKS_COREY_HPP
--- a/opm/material/fluidmatrixinteractions/BrooksCoreyParams.hpp
+++ b/opm/material/fluidmatrixinteractions/BrooksCoreyParams.hpp
@@ -21,8 +21,8 @@
 * \file
 * \copydoc Opm::BrooksCoreyParams
 */
-#ifndef OPM_BROOKS_COREY_PARAMS_HH
-#define OPM_BROOKS_COREY_PARAMS_HH
+#ifndef OPM_BROOKS_COREY_PARAMS_HPP
+#define OPM_BROOKS_COREY_PARAMS_HPP

 #include <opm/material/Valgrind.hpp>

--- a/opm/material/fluidmatrixinteractions/EclDefaultMaterial.hpp
+++ b/opm/material/fluidmatrixinteractions/EclDefaultMaterial.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::EclDefaultMaterial
 */
-#ifndef OPM_ECL_DEFAULT_MATERIAL_HH
-#define OPM_ECL_DEFAULT_MATERIAL_HH
+#ifndef OPM_ECL_DEFAULT_MATERIAL_HPP
+#define OPM_ECL_DEFAULT_MATERIAL_HPP

 #include "EclDefaultMaterialParams.hpp"

--- a/opm/material/fluidmatrixinteractions/EclDefaultMaterialParams.hpp
+++ b/opm/material/fluidmatrixinteractions/EclDefaultMaterialParams.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::EclDefaultMaterialParams
 */
-#ifndef OPM_ECL_DEFAULT_MATERIAL_PARAMS_HH
-#define OPM_ECL_DEFAULT_MATERIAL_PARAMS_HH
+#ifndef OPM_ECL_DEFAULT_MATERIAL_PARAMS_HPP
+#define OPM_ECL_DEFAULT_MATERIAL_PARAMS_HPP

 #include <type_traits>

--- a/opm/material/fluidmatrixinteractions/EffToAbsLaw.hpp
+++ b/opm/material/fluidmatrixinteractions/EffToAbsLaw.hpp
@@ -21,8 +21,8 @@
 * \file
 * \copydoc Opm::EffToAbsLaw
 */
-#ifndef OPM_EFF_TO_ABS_LAW_HH
-#define OPM_EFF_TO_ABS_LAW_HH
+#ifndef OPM_EFF_TO_ABS_LAW_HPP
+#define OPM_EFF_TO_ABS_LAW_HPP

 #include "EffToAbsLawParams.hpp"

--- a/opm/material/fluidmatrixinteractions/EffToAbsLawParams.hpp
+++ b/opm/material/fluidmatrixinteractions/EffToAbsLawParams.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::EffToAbsLawParams
 */
-#ifndef OPM_EFF_TO_ABS_LAW_PARAMS_HH
-#define OPM_EFF_TO_ABS_LAW_PARAMS_HH
+#ifndef OPM_EFF_TO_ABS_LAW_PARAMS_HPP
+#define OPM_EFF_TO_ABS_LAW_PARAMS_HPP

 namespace Opm {
 /*!
--- a/opm/material/fluidmatrixinteractions/LinearMaterial.hpp
+++ b/opm/material/fluidmatrixinteractions/LinearMaterial.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::LinearMaterial
 */
-#ifndef OPM_LINEAR_MATERIAL_HH
-#define OPM_LINEAR_MATERIAL_HH
+#ifndef OPM_LINEAR_MATERIAL_HPP
+#define OPM_LINEAR_MATERIAL_HPP

 #include "LinearMaterialParams.hpp"

--- a/opm/material/fluidmatrixinteractions/LinearMaterialParams.hpp
+++ b/opm/material/fluidmatrixinteractions/LinearMaterialParams.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::LinearMaterialParams
 */
-#ifndef OPM_LINEAR_MATERIAL_PARAMS_HH
-#define OPM_LINEAR_MATERIAL_PARAMS_HH
+#ifndef OPM_LINEAR_MATERIAL_PARAMS_HPP
+#define OPM_LINEAR_MATERIAL_PARAMS_HPP

 namespace Opm {

--- a/opm/material/fluidmatrixinteractions/MaterialTraits.hpp
+++ b/opm/material/fluidmatrixinteractions/MaterialTraits.hpp
@@ -24,8 +24,8 @@
 * and the fluid-matrix interaction laws. This includes stuff like the
 * index of the wetting and non-wetting phase, etc.
 */
-#ifndef OPM_MATERIAL_TRAITS_HH
-#define OPM_MATERIAL_TRAITS_HH
+#ifndef OPM_MATERIAL_TRAITS_HPP
+#define OPM_MATERIAL_TRAITS_HPP

 namespace Opm {
 /*!
--- a/opm/material/fluidmatrixinteractions/NullMaterial.hpp
+++ b/opm/material/fluidmatrixinteractions/NullMaterial.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::NullMaterial
 */
-#ifndef OPM_NULL_MATERIAL_HH
-#define OPM_NULL_MATERIAL_HH
+#ifndef OPM_NULL_MATERIAL_HPP
+#define OPM_NULL_MATERIAL_HPP

 #include "NullMaterialParams.hpp"

--- a/opm/material/fluidmatrixinteractions/NullMaterialParams.hpp
+++ b/opm/material/fluidmatrixinteractions/NullMaterialParams.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::NullMaterialParams
 */
-#ifndef OPM_NULL_MATERIAL_PARAMS_HH
-#define OPM_NULL_MATERIAL_PARAMS_HH
+#ifndef OPM_NULL_MATERIAL_PARAMS_HPP
+#define OPM_NULL_MATERIAL_PARAMS_HPP

 namespace Opm {
 /*!
--- a/opm/material/fluidmatrixinteractions/ParkerLenhard.hpp
+++ b/opm/material/fluidmatrixinteractions/ParkerLenhard.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::ParkerLenhard
 */
-#ifndef OPM_PARKER_LENHARD_HH
-#define OPM_PARKER_LENHARD_HH
+#ifndef OPM_PARKER_LENHARD_HPP
+#define OPM_PARKER_LENHARD_HPP

 #include "ParkerLenhardParams.hpp"

@@ -730,4 +730,4 @@ private:

 } // namespace Opm

-#endif // PARKER_LENHARD_HH
+#endif // PARKER_LENHARD_HPP
--- a/opm/material/fluidmatrixinteractions/ParkerLenhardParams.hpp
+++ b/opm/material/fluidmatrixinteractions/ParkerLenhardParams.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::ParkerLenhardParams
 */
-#ifndef OPM_PARKER_LENHARD_PARAMS_HH
-#define OPM_PARKER_LENHARD_PARAMS_HH
+#ifndef OPM_PARKER_LENHARD_PARAMS_HPP
+#define OPM_PARKER_LENHARD_PARAMS_HPP

 #include <opm/material/fluidmatrixinteractions/RegularizedVanGenuchten.hpp>

--- a/opm/material/fluidmatrixinteractions/RegularizedBrooksCorey.hpp
+++ b/opm/material/fluidmatrixinteractions/RegularizedBrooksCorey.hpp
@@ -21,8 +21,8 @@
 * \file
 * \copydoc Opm::RegularizedBrooksCorey
 */
-#ifndef REGULARIZED_BROOKS_COREY_HH
-#define REGULARIZED_BROOKS_COREY_HH
+#ifndef REGULARIZED_BROOKS_COREY_HPP
+#define REGULARIZED_BROOKS_COREY_HPP

 #include "BrooksCorey.hpp"
 #include "RegularizedBrooksCoreyParams.hpp"
--- a/opm/material/fluidmatrixinteractions/RegularizedBrooksCoreyParams.hpp
+++ b/opm/material/fluidmatrixinteractions/RegularizedBrooksCoreyParams.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::RegularizedBrooksCoreyParams
 */
-#ifndef OPM_REGULARIZED_BROOKS_COREY_PARAMS_HH
-#define OPM_REGULARIZED_BROOKS_COREY_PARAMS_HH
+#ifndef OPM_REGULARIZED_BROOKS_COREY_PARAMS_HPP
+#define OPM_REGULARIZED_BROOKS_COREY_PARAMS_HPP

 #include "BrooksCoreyParams.hpp"

--- a/opm/material/fluidmatrixinteractions/RegularizedVanGenuchten.hpp
+++ b/opm/material/fluidmatrixinteractions/RegularizedVanGenuchten.hpp
@@ -22,8 +22,8 @@
 * \file
 * \copydoc Opm::RegularizedVanGenuchten
 */
-#ifndef OPM_REGULARIZED_VAN_GENUCHTEN_HH
-#define OPM_REGULARIZED_VAN_GENUCHTEN_HH
+#ifndef OPM_REGULARIZED_VAN_GENUCHTEN_HPP
+#define OPM_REGULARIZED_VAN_GENUCHTEN_HPP

 #include "VanGenuchten.hpp"
 #include "RegularizedVanGenuchtenParams.hpp"
--- a/opm/material/fluidmatrixinteractions/RegularizedVanGenuchtenParams.hpp
+++ b/opm/material/fluidmatrixinteractions/RegularizedVanGenuchtenParams.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::RegularizedVanGenuchtenParams
 */
-#ifndef OPM_REGULARIZED_VAN_GENUCHTEN_PARAMS_HH
-#define OPM_REGULARIZED_VAN_GENUCHTEN_PARAMS_HH
+#ifndef OPM_REGULARIZED_VAN_GENUCHTEN_PARAMS_HPP
+#define OPM_REGULARIZED_VAN_GENUCHTEN_PARAMS_HPP

 #include "VanGenuchtenParams.hpp"

--- a/opm/material/fluidmatrixinteractions/VanGenuchten.hpp
+++ b/opm/material/fluidmatrixinteractions/VanGenuchten.hpp
@@ -22,8 +22,8 @@
 * \file
 * \copydoc Opm::VanGenuchten
 */
-#ifndef OPM_VAN_GENUCHTEN_HH
-#define OPM_VAN_GENUCHTEN_HH
+#ifndef OPM_VAN_GENUCHTEN_HPP
+#define OPM_VAN_GENUCHTEN_HPP

 #include "VanGenuchtenParams.hpp"

--- a/opm/material/fluidmatrixinteractions/VanGenuchtenParams.hpp
+++ b/opm/material/fluidmatrixinteractions/VanGenuchtenParams.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::VanGenuchtenParams
 */
-#ifndef VAN_GENUCHTEN_PARAMS_HH
-#define VAN_GENUCHTEN_PARAMS_HH
+#ifndef VAN_GENUCHTEN_PARAMS_HPP
+#define VAN_GENUCHTEN_PARAMS_HPP

 namespace Opm {
 /*!
--- a/opm/material/fluidstates/CompositionalFluidState.hpp
+++ b/opm/material/fluidstates/CompositionalFluidState.hpp
@@ -23,8 +23,8 @@
 *        multi-phase, multi-component fluid system assuming
 *        thermodynamic equilibrium.
 */
-#ifndef OPM_COMPOSITIONAL_FLUID_STATE_HH
-#define OPM_COMPOSITIONAL_FLUID_STATE_HH
+#ifndef OPM_COMPOSITIONAL_FLUID_STATE_HPP
+#define OPM_COMPOSITIONAL_FLUID_STATE_HPP

 #include "ModularFluidState.hpp"

--- a/opm/material/fluidstates/FluidStateCompositionModules.hpp
+++ b/opm/material/fluidstates/FluidStateCompositionModules.hpp
@@ -21,8 +21,8 @@
 *
 * \brief Modules for the ModularFluidState which represent composition.
 */
-#ifndef OPM_FLUID_STATE_COMPOSITION_MODULES_HH
-#define OPM_FLUID_STATE_COMPOSITION_MODULES_HH
+#ifndef OPM_FLUID_STATE_COMPOSITION_MODULES_HPP
+#define OPM_FLUID_STATE_COMPOSITION_MODULES_HPP

 #include <opm/material/Valgrind.hpp>

--- a/opm/material/fluidstates/FluidStateDensityModules.hpp
+++ b/opm/material/fluidstates/FluidStateDensityModules.hpp
@@ -21,8 +21,8 @@
 *
 * \brief Modules for the ModularFluidState which represent density.
 */
-#ifndef OPM_FLUID_STATE_DENSITY_MODULES_HH
-#define OPM_FLUID_STATE_DENSITY_MODULES_HH
+#ifndef OPM_FLUID_STATE_DENSITY_MODULES_HPP
+#define OPM_FLUID_STATE_DENSITY_MODULES_HPP

 #include <opm/material/Valgrind.hpp>

--- a/opm/material/fluidstates/FluidStateEnthalpyModules.hpp
+++ b/opm/material/fluidstates/FluidStateEnthalpyModules.hpp
@@ -21,8 +21,8 @@
 *
 * \brief Modules for the ModularFluidState which represent enthalpy.
 */
-#ifndef OPM_FLUID_STATE_ENTHALPY_MODULES_HH
-#define OPM_FLUID_STATE_ENTHALPY_MODULES_HH
+#ifndef OPM_FLUID_STATE_ENTHALPY_MODULES_HPP
+#define OPM_FLUID_STATE_ENTHALPY_MODULES_HPP

 #include <opm/material/Valgrind.hpp>

--- a/opm/material/fluidstates/FluidStateFugacityModules.hpp
+++ b/opm/material/fluidstates/FluidStateFugacityModules.hpp
@@ -21,8 +21,8 @@
 *
 * \brief Modules for the ModularFluidState which represent fugacity/chemical potential.
 */
-#ifndef OPM_FLUID_STATE_FUGACITY_MODULES_HH
-#define OPM_FLUID_STATE_FUGACITY_MODULES_HH
+#ifndef OPM_FLUID_STATE_FUGACITY_MODULES_HPP
+#define OPM_FLUID_STATE_FUGACITY_MODULES_HPP

 #include <opm/material/Valgrind.hpp>

--- a/opm/material/fluidstates/FluidStatePressureModules.hpp
+++ b/opm/material/fluidstates/FluidStatePressureModules.hpp
@@ -21,8 +21,8 @@
 *
 * \brief Modules for the ModularFluidState which represent pressure.
 */
-#ifndef OPM_FLUID_STATE_PRESSURE_MODULES_HH
-#define OPM_FLUID_STATE_PRESSURE_MODULES_HH
+#ifndef OPM_FLUID_STATE_PRESSURE_MODULES_HPP
+#define OPM_FLUID_STATE_PRESSURE_MODULES_HPP

 #include <opm/material/Valgrind.hpp>

--- a/opm/material/fluidstates/FluidStateSaturationModules.hpp
+++ b/opm/material/fluidstates/FluidStateSaturationModules.hpp
@@ -21,8 +21,8 @@
 *
 * \brief Modules for the ModularFluidState which represent saturation.
 */
-#ifndef OPM_FLUID_STATE_SATURATION_MODULES_HH
-#define OPM_FLUID_STATE_SATURATION_MODULES_HH
+#ifndef OPM_FLUID_STATE_SATURATION_MODULES_HPP
+#define OPM_FLUID_STATE_SATURATION_MODULES_HPP

 #include <opm/material/Valgrind.hpp>

--- a/opm/material/fluidstates/FluidStateTemperatureModules.hpp
+++ b/opm/material/fluidstates/FluidStateTemperatureModules.hpp
@@ -21,8 +21,8 @@
 *
 * \brief Modules for the ModularFluidState which represent temperature.
 */
-#ifndef OPM_FLUID_STATE_TEMPERATURE_MODULES_HH
-#define OPM_FLUID_STATE_TEMPERATURE_MODULES_HH
+#ifndef OPM_FLUID_STATE_TEMPERATURE_MODULES_HPP
+#define OPM_FLUID_STATE_TEMPERATURE_MODULES_HPP

 #include <opm/material/Valgrind.hpp>

--- a/opm/material/fluidstates/FluidStateViscosityModules.hpp
+++ b/opm/material/fluidstates/FluidStateViscosityModules.hpp
@@ -21,8 +21,8 @@
 *
 * \brief Modules for the ModularFluidState which represent viscosity.
 */
-#ifndef OPM_FLUID_STATE_VISCOSITY_MODULES_HH
-#define OPM_FLUID_STATE_VISCOSITY_MODULES_HH
+#ifndef OPM_FLUID_STATE_VISCOSITY_MODULES_HPP
+#define OPM_FLUID_STATE_VISCOSITY_MODULES_HPP

 #include <opm/material/Valgrind.hpp>

--- a/opm/material/fluidstates/ImmiscibleFluidState.hpp
+++ b/opm/material/fluidstates/ImmiscibleFluidState.hpp
@@ -23,8 +23,8 @@
 *        multi-phase, multi-component fluid system assuming
 *        thermodynamic equilibrium.
 */
-#ifndef OPM_IMMISCIBLE_FLUID_STATE_HH
-#define OPM_IMMISCIBLE_FLUID_STATE_HH
+#ifndef OPM_IMMISCIBLE_FLUID_STATE_HPP
+#define OPM_IMMISCIBLE_FLUID_STATE_HPP

 #include "ModularFluidState.hpp"

--- a/opm/material/fluidstates/ModularFluidState.hpp
+++ b/opm/material/fluidstates/ModularFluidState.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::ModularFluidState
 */
-#ifndef OPM_MODULAR_FLUID_STATE_HH
-#define OPM_MODULAR_FLUID_STATE_HH
+#ifndef OPM_MODULAR_FLUID_STATE_HPP
+#define OPM_MODULAR_FLUID_STATE_HPP

 #include "FluidStatePressureModules.hpp"
 #include "FluidStateTemperatureModules.hpp"
--- a/opm/material/fluidstates/NonEquilibriumFluidState.hpp
+++ b/opm/material/fluidstates/NonEquilibriumFluidState.hpp
@@ -23,8 +23,8 @@
 *        multi-phase, multi-component fluid system _not_ assuming
 *        thermodynamic equilibrium.
 */
-#ifndef OPM_NON_EQUILIBRIUM_FLUID_STATE_HH
-#define OPM_NON_EQUILIBRIUM_FLUID_STATE_HH
+#ifndef OPM_NON_EQUILIBRIUM_FLUID_STATE_HPP
+#define OPM_NON_EQUILIBRIUM_FLUID_STATE_HPP

 #include "ModularFluidState.hpp"

--- a/opm/material/fluidstates/PressureOverlayFluidState.hpp
+++ b/opm/material/fluidstates/PressureOverlayFluidState.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::PressureOverlayFluidState
 */
-#ifndef OPM_PRESSURE_OVERLAY_FLUID_STATE_HH
-#define OPM_PRESSURE_OVERLAY_FLUID_STATE_HH
+#ifndef OPM_PRESSURE_OVERLAY_FLUID_STATE_HPP
+#define OPM_PRESSURE_OVERLAY_FLUID_STATE_HPP

 #include <opm/material/Valgrind.hpp>

--- a/opm/material/fluidstates/SaturationOverlayFluidState.hpp
+++ b/opm/material/fluidstates/SaturationOverlayFluidState.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::SaturationOverlayFluidState
 */
-#ifndef OPM_SATURATION_OVERLAY_FLUID_STATE_HH
-#define OPM_SATURATION_OVERLAY_FLUID_STATE_HH
+#ifndef OPM_SATURATION_OVERLAY_FLUID_STATE_HPP
+#define OPM_SATURATION_OVERLAY_FLUID_STATE_HPP

 #include <opm/material/Valgrind.hpp>

--- a/opm/material/fluidstates/TemperatureOverlayFluidState.hpp
+++ b/opm/material/fluidstates/TemperatureOverlayFluidState.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::TemperatureOverlayFluidState
 */
-#ifndef OPM_TEMPERATURE_OVERLAY_FLUID_STATE_HH
-#define OPM_TEMPERATURE_OVERLAY_FLUID_STATE_HH
+#ifndef OPM_TEMPERATURE_OVERLAY_FLUID_STATE_HPP
+#define OPM_TEMPERATURE_OVERLAY_FLUID_STATE_HPP

 #include <opm/material/Valgrind.hpp>

--- a/opm/material/fluidsystems/1pFluidSystem.hpp
+++ b/opm/material/fluidsystems/1pFluidSystem.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::FluidSystems::OneP
 */
-#ifndef OPM_1P_FLUIDSYSTEM_HH
-#define OPM_1P_FLUIDSYSTEM_HH
+#ifndef OPM_1P_FLUIDSYSTEM_HPP
+#define OPM_1P_FLUIDSYSTEM_HPP

 #include "BaseFluidSystem.hpp"
 #include "NullParameterCache.hpp"
--- a/opm/material/fluidsystems/2pImmiscibleFluidSystem.hpp
+++ b/opm/material/fluidsystems/2pImmiscibleFluidSystem.hpp
@@ -21,8 +21,8 @@
 * \file
 * \copydoc Opm::FluidSystems::TwoPImmiscible
 */
-#ifndef OPM_2P_IMMISCIBLE_FLUID_SYSTEM_HH
-#define OPM_2P_IMMISCIBLE_FLUID_SYSTEM_HH
+#ifndef OPM_2P_IMMISCIBLE_FLUID_SYSTEM_HPP
+#define OPM_2P_IMMISCIBLE_FLUID_SYSTEM_HPP

 #include <limits>
 #include <cassert>
--- a/opm/material/fluidsystems/BaseFluidSystem.hpp
+++ b/opm/material/fluidsystems/BaseFluidSystem.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::BaseFluidSystem
 */
-#ifndef OPM_BASE_FLUID_SYSTEM_HH
-#define OPM_BASE_FLUID_SYSTEM_HH
+#ifndef OPM_BASE_FLUID_SYSTEM_HPP
+#define OPM_BASE_FLUID_SYSTEM_HPP

 #include "NullParameterCache.hpp"

--- a/opm/material/fluidsystems/BlackOilFluidSystem.hpp
+++ b/opm/material/fluidsystems/BlackOilFluidSystem.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::FluidSystems::BlackOil
 */
-#ifndef OPM_BLACK_OIL_FLUID_SYSTEM_HH
-#define OPM_BLACK_OIL_FLUID_SYSTEM_HH
+#ifndef OPM_BLACK_OIL_FLUID_SYSTEM_HPP
+#define OPM_BLACK_OIL_FLUID_SYSTEM_HPP

 #include <opm/core/utility/Exceptions.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
--- a/opm/material/fluidsystems/BrineCO2FluidSystem.hpp
+++ b/opm/material/fluidsystems/BrineCO2FluidSystem.hpp
@@ -21,8 +21,8 @@
 *
 * \copydoc Opm::FluidSystems::BrineCO2
 */
-#ifndef OPM_BRINE_CO2_SYSTEM_HH
-#define OPM_BRINE_CO2_SYSTEM_HH
+#ifndef OPM_BRINE_CO2_SYSTEM_HPP
+#define OPM_BRINE_CO2_SYSTEM_HPP

 #include "BaseFluidSystem.hpp"
 #include "NullParameterCache.hpp"
--- a/opm/material/fluidsystems/GasPhase.hpp
+++ b/opm/material/fluidsystems/GasPhase.hpp
@@ -21,8 +21,8 @@
 * \file
 * \copydoc Opm::GasPhase
 */
-#ifndef OPM_GAS_PHASE_HH
-#define OPM_GAS_PHASE_HH
+#ifndef OPM_GAS_PHASE_HPP
+#define OPM_GAS_PHASE_HPP

 namespace Opm {

--- a/opm/material/fluidsystems/H2OAirFluidSystem.hpp
+++ b/opm/material/fluidsystems/H2OAirFluidSystem.hpp
@@ -21,8 +21,8 @@
 * \file
 * \copydoc Opm::FluidSystems::H2OAir
 */
-#ifndef OPM_H2O_AIR_SYSTEM_HH
-#define OPM_H2O_AIR_SYSTEM_HH
+#ifndef OPM_H2O_AIR_SYSTEM_HPP
+#define OPM_H2O_AIR_SYSTEM_HPP

 #include "BaseFluidSystem.hpp"
 #include "NullParameterCache.hpp"
--- a/opm/material/fluidsystems/H2OAirMesityleneFluidSystem.hpp
+++ b/opm/material/fluidsystems/H2OAirMesityleneFluidSystem.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::FluidSystems::H2OAirMesitylene
 */
-#ifndef OPM_H2O_AIR_MESITYLENE_FLUID_SYSTEM_HH
-#define OPM_H2O_AIR_MESITYLENE_FLUID_SYSTEM_HH
+#ifndef OPM_H2O_AIR_MESITYLENE_FLUID_SYSTEM_HPP
+#define OPM_H2O_AIR_MESITYLENE_FLUID_SYSTEM_HPP

 #include "BaseFluidSystem.hpp"
 #include "NullParameterCache.hpp"
--- a/opm/material/fluidsystems/H2OAirXyleneFluidSystem.hpp
+++ b/opm/material/fluidsystems/H2OAirXyleneFluidSystem.hpp
@@ -21,8 +21,8 @@
 * \file
 * \copydoc Opm::FluidSystems::H2OAirXylene
 */
-#ifndef OPM_H2O_AIR_XYLENE_FLUID_SYSTEM_HH
-#define OPM_H2O_AIR_XYLENE_FLUID_SYSTEM_HH
+#ifndef OPM_H2O_AIR_XYLENE_FLUID_SYSTEM_HPP
+#define OPM_H2O_AIR_XYLENE_FLUID_SYSTEM_HPP

 #include <opm/material/IdealGas.hpp>
 #include <opm/material/components/Air.hpp>
--- a/opm/material/fluidsystems/H2ON2FluidSystem.hpp
+++ b/opm/material/fluidsystems/H2ON2FluidSystem.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::FluidSystems::H2ON2
 */
-#ifndef OPM_H2O_N2_FLUID_SYSTEM_HH
-#define OPM_H2O_N2_FLUID_SYSTEM_HH
+#ifndef OPM_H2O_N2_FLUID_SYSTEM_HPP
+#define OPM_H2O_N2_FLUID_SYSTEM_HPP

 #include "BaseFluidSystem.hpp"
 #include "NullParameterCache.hpp"
--- a/opm/material/fluidsystems/H2ON2LiquidPhaseFluidSystem.hpp
+++ b/opm/material/fluidsystems/H2ON2LiquidPhaseFluidSystem.hpp
@@ -21,8 +21,8 @@
 * \file
 * \copydoc Opm::FluidSystems::H2ON2LiquidPhase
 */
-#ifndef OPM_H2O_N2_LIQUIDPHASE_FLUID_SYSTEM_HH
-#define OPM_H2O_N2_LIQUIDPHASE_FLUID_SYSTEM_HH
+#ifndef OPM_H2O_N2_LIQUIDPHASE_FLUID_SYSTEM_HPP
+#define OPM_H2O_N2_LIQUIDPHASE_FLUID_SYSTEM_HPP

 #include "BaseFluidSystem.hpp"
 #include "NullParameterCache.hpp"
--- a/opm/material/fluidsystems/LiquidPhase.hpp
+++ b/opm/material/fluidsystems/LiquidPhase.hpp
@@ -21,8 +21,8 @@
 * \file
 * \copydoc Opm::LiquidPhase
 */
-#ifndef OPM_LIQUID_PHASE_HH
-#define OPM_LIQUID_PHASE_HH
+#ifndef OPM_LIQUID_PHASE_HPP
+#define OPM_LIQUID_PHASE_HPP

 namespace Opm {

--- a/opm/material/fluidsystems/NullParameterCache.hpp
+++ b/opm/material/fluidsystems/NullParameterCache.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::NullParameterCache
 */
-#ifndef OPM_NULL_PARAMETER_CACHE_HH
-#define OPM_NULL_PARAMETER_CACHE_HH
+#ifndef OPM_NULL_PARAMETER_CACHE_HPP
+#define OPM_NULL_PARAMETER_CACHE_HPP

 #include "ParameterCacheBase.hpp"

--- a/opm/material/fluidsystems/ParameterCacheBase.hpp
+++ b/opm/material/fluidsystems/ParameterCacheBase.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::ParameterCacheBase
 */
-#ifndef OPM_PARAMETER_CACHE_BASE_HH
-#define OPM_PARAMETER_CACHE_BASE_HH
+#ifndef OPM_PARAMETER_CACHE_BASE_HPP
+#define OPM_PARAMETER_CACHE_BASE_HPP

 namespace Opm {

--- a/opm/material/fluidsystems/Spe5FluidSystem.hpp
+++ b/opm/material/fluidsystems/Spe5FluidSystem.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::FluidSystems::Spe5
 */
-#ifndef OPM_SPE5_FLUID_SYSTEM_HH
-#define OPM_SPE5_FLUID_SYSTEM_HH
+#ifndef OPM_SPE5_FLUID_SYSTEM_HPP
+#define OPM_SPE5_FLUID_SYSTEM_HPP

 #include "BaseFluidSystem.hpp"
 #include "Spe5ParameterCache.hpp"
--- a/opm/material/fluidsystems/Spe5ParameterCache.hpp
+++ b/opm/material/fluidsystems/Spe5ParameterCache.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::Spe5ParameterCache
 */
-#ifndef OPM_SPE5_PARAMETER_CACHE_HH
-#define OPM_SPE5_PARAMETER_CACHE_HH
+#ifndef OPM_SPE5_PARAMETER_CACHE_HPP
+#define OPM_SPE5_PARAMETER_CACHE_HPP

 #include <cassert>

--- a/opm/material/heatconduction/DummyHeatConductionLaw.hpp
+++ b/opm/material/heatconduction/DummyHeatConductionLaw.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::DummyHeatConductionLaw
 */
-#ifndef OPM_DUMMY_HEATCONDUCTION_LAW_HH
-#define OPM_DUMMY_HEATCONDUCTION_LAW_HH
+#ifndef OPM_DUMMY_HEATCONDUCTION_LAW_HPP
+#define OPM_DUMMY_HEATCONDUCTION_LAW_HPP

 #include <opm/core/utility/Exceptions.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
--- a/opm/material/heatconduction/FluidConduction.hpp
+++ b/opm/material/heatconduction/FluidConduction.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::FluidHeatConduction
 */
-#ifndef OPM_FLUID_HEAT_CONDUCTION_HH
-#define OPM_FLUID_HEAT_CONDUCTION_HH
+#ifndef OPM_FLUID_HEAT_CONDUCTION_HPP
+#define OPM_FLUID_HEAT_CONDUCTION_HPP

 #include "FluidConductionParams.hpp"

--- a/opm/material/heatconduction/FluidConductionParams.hpp
+++ b/opm/material/heatconduction/FluidConductionParams.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::FluidHeatConductionParams
 */
-#ifndef OPM_FLUID_HEAT_CONDUCTION_PARAMS_HH
-#define OPM_FLUID_HEAT_CONDUCTION_PARAMS_HH
+#ifndef OPM_FLUID_HEAT_CONDUCTION_PARAMS_HPP
+#define OPM_FLUID_HEAT_CONDUCTION_PARAMS_HPP

 namespace Opm {
 /*!
--- a/opm/material/heatconduction/Somerton.hpp
+++ b/opm/material/heatconduction/Somerton.hpp
@@ -20,8 +20,8 @@
 * \file
 * \copydoc Opm::Somerton
 */
-#ifndef OPM_SOMERTON_HH
-#define OPM_SOMERTON_HH
+#ifndef OPM_SOMERTON_HPP
+#define OPM_SOMERTON_HPP

 #include "SomertonParams.hpp"

--- a/Show More
+++ b/Show More