From 6ceeb3098eb0aeb8da135a0f9419ac9a8ab5a777 Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Tue, 3 Sep 2024 14:38:53 +0200
Subject: [PATCH] blackoilsolventparams.hh: rename to blackoilsolventparams.hpp

---
 CMakeLists_files.cmake                                |  2 +-
 opm/models/blackoil/blackoilsolventmodules.hh         | 11 ++++++-----
 ...koilsolventparams.hh => blackoilsolventparams.hpp} |  6 +++---
 3 files changed, 10 insertions(+), 9 deletions(-)
 rename opm/models/blackoil/{blackoilsolventparams.hh => blackoilsolventparams.hpp} (96%)

diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
index e3499ee75..c686a9cf1 100644
--- a/CMakeLists_files.cmake
+++ b/CMakeLists_files.cmake
@@ -548,7 +548,7 @@ list (APPEND PUBLIC_HEADER_FILES
   opm/models/blackoil/blackoilproperties.hh
   opm/models/blackoil/blackoilratevector.hh
   opm/models/blackoil/blackoilsolventmodules.hh
-  opm/models/blackoil/blackoilsolventparams.hh
+  opm/models/blackoil/blackoilsolventparams.hpp
   opm/models/blackoil/blackoiltwophaseindices.hh
   opm/models/common/darcyfluxmodule.hh
   opm/models/common/diffusionmodule.hh
diff --git a/opm/models/blackoil/blackoilsolventmodules.hh b/opm/models/blackoil/blackoilsolventmodules.hh
index b0052e506..676c58851 100644
--- a/opm/models/blackoil/blackoilsolventmodules.hh
+++ b/opm/models/blackoil/blackoilsolventmodules.hh
@@ -28,16 +28,17 @@
 #ifndef EWOMS_BLACK_OIL_SOLVENT_MODULE_HH
 #define EWOMS_BLACK_OIL_SOLVENT_MODULE_HH
 
-#include "blackoilproperties.hh"
-
 #include <opm/common/Exceptions.hpp>
 
-#include <opm/models/blackoil/blackoilsolventparams.hh>
-#include <opm/models/io/vtkblackoilsolventmodule.hh>
+#include <opm/material/fluidsystems/blackoilpvt/SolventPvt.hpp>
+
+#include <opm/models/blackoil/blackoilproperties.hh>
+#include <opm/models/blackoil/blackoilsolventparams.hpp>
+
 #include <opm/models/common/multiphasebaseparameters.hh>
 #include <opm/models/common/quantitycallbacks.hh>
 
-#include <opm/material/fluidsystems/blackoilpvt/SolventPvt.hpp>
+#include <opm/models/io/vtkblackoilsolventmodule.hh>
 
 #if HAVE_ECL_INPUT
 #include <opm/input/eclipse/EclipseState/EclipseState.hpp>
diff --git a/opm/models/blackoil/blackoilsolventparams.hh b/opm/models/blackoil/blackoilsolventparams.hpp
similarity index 96%
rename from opm/models/blackoil/blackoilsolventparams.hh
rename to opm/models/blackoil/blackoilsolventparams.hpp
index c96c91d38..60f80c296 100644
--- a/opm/models/blackoil/blackoilsolventparams.hh
+++ b/opm/models/blackoil/blackoilsolventparams.hpp
@@ -25,8 +25,8 @@
  *
  * \brief Contains the parameters required to extend the black-oil model by solvents.
  */
-#ifndef EWOMS_BLACK_OIL_SOLVENT_PARAMS_HH
-#define EWOMS_BLACK_OIL_SOLVENT_PARAMS_HH
+#ifndef OPM_BLACK_OIL_SOLVENT_PARAMS_HPP
+#define OPM_BLACK_OIL_SOLVENT_PARAMS_HPP
 
 #include <opm/material/fluidsystems/blackoilpvt/SolventPvt.hpp>
 #include <opm/material/fluidsystems/blackoilpvt/Co2GasPvt.hpp>
@@ -104,4 +104,4 @@ struct BlackOilSolventParams {
 
 } // namespace Opm
 
-#endif
+#endif // OPM_BLACK_OIL_SOLVENT_PARAMS_HPP