blackoilbrineparams.hh: rename to blackoilbrineparams.hpp

CMakeLists_files.cmake

@@ -516,7 +516,7 @@ list (APPEND TEST_DATA_FILES
 list (APPEND PUBLIC_HEADER_FILES
   opm/models/blackoil/blackoilboundaryratevector.hh
   opm/models/blackoil/blackoilbrinemodules.hh
-  opm/models/blackoil/blackoilbrineparams.hh
+  opm/models/blackoil/blackoilbrineparams.hpp
   opm/models/blackoil/blackoildarcyfluxmodule.hh
   opm/models/blackoil/blackoildiffusionmodule.hh
   opm/models/blackoil/blackoildispersionmodule.hh

opm/models/blackoil/blackoilbrinemodules.hh

@@ -28,9 +28,12 @@
 #ifndef EWOMS_BLACK_OIL_BRINE_MODULE_HH
 #define EWOMS_BLACK_OIL_BRINE_MODULE_HH
 
-#include "blackoilproperties.hh"
+#include <opm/models/blackoil/blackoilbrineparams.hpp>
+#include <opm/models/blackoil/blackoilproperties.hh>
 
-#include <opm/models/blackoil/blackoilbrineparams.hh>
+#include <opm/models/discretization/common/fvbaseproperties.hh>
+
+#include <opm/models/utils/basicproperties.hh>
 
 #if HAVE_ECL_INPUT
 #include <opm/input/eclipse/EclipseState/EclipseState.hpp>
@@ -45,7 +48,6 @@
 #include <dune/common/fvector.hh>
 
 #include <string>
-#include <math.h>
 
 namespace Opm {
 /*!

opm/models/blackoil/blackoilbrineparams.hpp

@@ -25,8 +25,8 @@
  *
  * \brief Contains the parameters required to extend the black-oil model by brine.
  */
-#ifndef EWOMS_BLACK_OIL_BRINE_PARAMS_HH
-#define EWOMS_BLACK_OIL_BRINE_PARAMS_HH
+#ifndef OPM_BLACK_OIL_BRINE_PARAMS_HPP
+#define OPM_BLACK_OIL_BRINE_PARAMS_HPP
 
 #include <opm/material/common/Tabulated1DFunction.hpp>
 
@@ -49,4 +49,4 @@ struct BlackOilBrineParams {
 
 } // namespace Opm
 
-#endif
+#endif //  OPM_BLACK_OIL_BRINE_PARAMS_HPP