From 05f01bf8195dc5e4824a8708d4ea8371bb80e37b Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Mon, 2 Sep 2024 12:56:18 +0200
Subject: [PATCH] parametersystem.hh: rename to .hpp

---
 CMakeLists_files.cmake                                      | 2 +-
 flowexperimental/flowexp_blackoil.cpp                       | 2 +-
 opm/models/common/multiphasebaseextensivequantities.hh      | 2 +-
 opm/models/discretization/common/fvbasefdlocallinearizer.hh | 2 +-
 opm/models/discretization/common/fvbaselocalresidual.hh     | 2 +-
 opm/models/io/baseoutputmodule.hh                           | 2 +-
 opm/models/io/basevanguard.hh                               | 2 +-
 opm/models/io/cubegridvanguard.hh                           | 2 +-
 opm/models/io/dgfvanguard.hh                                | 2 +-
 opm/models/io/structuredgridvanguard.hh                     | 2 +-
 opm/models/io/vtkblackoilenergymodule.hh                    | 2 +-
 opm/models/io/vtkblackoilmicpmodule.hh                      | 2 +-
 opm/models/io/vtkblackoilmodule.hh                          | 2 +-
 opm/models/io/vtkblackoilpolymermodule.hh                   | 2 +-
 opm/models/io/vtkblackoilsolventmodule.hh                   | 2 +-
 opm/models/io/vtkcompositionmodule.hh                       | 2 +-
 opm/models/io/vtkdiffusionmodule.hh                         | 2 +-
 opm/models/io/vtkdiscretefracturemodule.hh                  | 2 +-
 opm/models/io/vtkenergymodule.hh                            | 2 +-
 opm/models/io/vtkmultiphasemodule.hh                        | 2 +-
 opm/models/io/vtkphasepresencemodule.hh                     | 2 +-
 opm/models/io/vtkprimaryvarsmodule.hh                       | 2 +-
 opm/models/io/vtkptflashmodule.hh                           | 2 +-
 opm/models/io/vtktemperaturemodule.hh                       | 2 +-
 opm/models/parallel/threadmanager.cpp                       | 2 +-
 opm/models/utils/basicproperties.hh                         | 2 +-
 .../utils/{parametersystem.hh => parametersystem.hpp}       | 6 +++---
 opm/models/utils/simulator.hh                               | 2 +-
 opm/models/utils/start.hh                                   | 2 +-
 opm/simulators/flow/BlackoilModelParameters.cpp             | 2 +-
 opm/simulators/flow/DamarisParameters.cpp                   | 2 +-
 opm/simulators/flow/FlowBaseVanguard.hpp                    | 2 +-
 opm/simulators/flow/FlowGenericVanguard.cpp                 | 2 +-
 opm/simulators/flow/FlowProblemParameters.cpp               | 2 +-
 opm/simulators/flow/FlowUtils.cpp                           | 2 +-
 opm/simulators/flow/Main.hpp                                | 2 +-
 opm/simulators/flow/NonlinearSolver.hpp                     | 2 +-
 opm/simulators/flow/OutputBlackoilModule.hpp                | 2 +-
 opm/simulators/flow/VtkTracerModule.hpp                     | 2 +-
 opm/simulators/flow/python/PyBlackOilSimulator.hpp          | 3 ++-
 opm/simulators/linalg/FlowLinearSolverParameters.cpp        | 2 +-
 opm/simulators/linalg/ISTLSolver.hpp                        | 2 +-
 opm/simulators/linalg/istlpreconditionerwrappers.hh         | 2 +-
 opm/simulators/linalg/istlsolverwrappers.hh                 | 2 +-
 opm/simulators/linalg/parallelbasebackend.hh                | 2 +-
 opm/simulators/timestepping/AdaptiveTimeStepping.hpp        | 2 +-
 opm/simulators/timestepping/EclTimeSteppingParams.cpp       | 2 +-
 opm/simulators/utils/DamarisKeywords.hpp                    | 2 +-
 opm/simulators/wells/GasLiftSingleWell.hpp                  | 2 +-
 tests/test_glift1.cpp                                       | 2 +-
 tests/test_parametersystem.cpp                              | 2 +-
 51 files changed, 54 insertions(+), 53 deletions(-)
 rename opm/models/utils/{parametersystem.hh => parametersystem.hpp} (99%)

diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
index 09148a4dc..2907241f7 100644
--- a/CMakeLists_files.cmake
+++ b/CMakeLists_files.cmake
@@ -711,7 +711,7 @@ list (APPEND PUBLIC_HEADER_FILES
   opm/models/utils/basicparameters.hh
   opm/models/utils/basicproperties.hh
   opm/models/utils/genericguard.hh
-  opm/models/utils/parametersystem.hh
+  opm/models/utils/parametersystem.hpp
   opm/models/utils/pffgridvector.hh
   opm/models/utils/prefetch.hh
   opm/models/utils/propertysystem.hh
diff --git a/flowexperimental/flowexp_blackoil.cpp b/flowexperimental/flowexp_blackoil.cpp
index 8f9025b96..36bbc09b6 100644
--- a/flowexperimental/flowexp_blackoil.cpp
+++ b/flowexperimental/flowexp_blackoil.cpp
@@ -21,7 +21,7 @@
 #include "flowexp.hpp"
 
 #include <opm/models/discretization/common/tpfalinearizer.hh>
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 #include <opm/simulators/flow/Main.hpp>
 #include <opm/simulators/flow/FlowProblem.hpp>
 
diff --git a/opm/models/common/multiphasebaseextensivequantities.hh b/opm/models/common/multiphasebaseextensivequantities.hh
index fde81bb93..b372cd129 100644
--- a/opm/models/common/multiphasebaseextensivequantities.hh
+++ b/opm/models/common/multiphasebaseextensivequantities.hh
@@ -32,7 +32,7 @@
 
 #include <opm/models/common/quantitycallbacks.hh>
 #include <opm/models/discretization/common/fvbaseextensivequantities.hh>
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 
 #include <opm/material/common/Valgrind.hpp>
 
diff --git a/opm/models/discretization/common/fvbasefdlocallinearizer.hh b/opm/models/discretization/common/fvbasefdlocallinearizer.hh
index ab4765079..8cad8e726 100644
--- a/opm/models/discretization/common/fvbasefdlocallinearizer.hh
+++ b/opm/models/discretization/common/fvbasefdlocallinearizer.hh
@@ -29,7 +29,7 @@
 #define EWOMS_FV_BASE_FD_LOCAL_LINEARIZER_HH
 
 #include <opm/models/utils/propertysystem.hh>
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 #include <opm/models/discretization/common/fvbaseproperties.hh>
 
 #include <opm/material/common/MathToolbox.hpp>
diff --git a/opm/models/discretization/common/fvbaselocalresidual.hh b/opm/models/discretization/common/fvbaselocalresidual.hh
index e8c4d0716..ae21de310 100644
--- a/opm/models/discretization/common/fvbaselocalresidual.hh
+++ b/opm/models/discretization/common/fvbaselocalresidual.hh
@@ -30,7 +30,7 @@
 
 #include "fvbaseproperties.hh"
 
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 #include <opm/models/utils/alignedallocator.hh>
 
 #include <opm/material/common/Valgrind.hpp>
diff --git a/opm/models/io/baseoutputmodule.hh b/opm/models/io/baseoutputmodule.hh
index 99d0c1789..0966b302a 100644
--- a/opm/models/io/baseoutputmodule.hh
+++ b/opm/models/io/baseoutputmodule.hh
@@ -38,7 +38,7 @@
 #include <opm/models/io/baseoutputwriter.hh>
 
 #include <opm/models/utils/basicproperties.hh>
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 #include <opm/models/utils/propertysystem.hh>
 
 #include <array>
diff --git a/opm/models/io/basevanguard.hh b/opm/models/io/basevanguard.hh
index 57cc7c959..d232be028 100644
--- a/opm/models/io/basevanguard.hh
+++ b/opm/models/io/basevanguard.hh
@@ -28,7 +28,7 @@
 #define EWOMS_BASE_VANGUARD_HH
 
 #include <opm/models/utils/basicproperties.hh>
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 
 #include <dune/common/version.hh>
 
diff --git a/opm/models/io/cubegridvanguard.hh b/opm/models/io/cubegridvanguard.hh
index 7e4ca8c53..a60c214a8 100644
--- a/opm/models/io/cubegridvanguard.hh
+++ b/opm/models/io/cubegridvanguard.hh
@@ -31,7 +31,7 @@
 #include <opm/models/utils/basicparameters.hh>
 #include <opm/models/utils/basicproperties.hh>
 #include <opm/models/utils/propertysystem.hh>
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 
 #include <dune/grid/utility/structuredgridfactory.hh>
 
diff --git a/opm/models/io/dgfvanguard.hh b/opm/models/io/dgfvanguard.hh
index 2a84e0373..b91726bdd 100644
--- a/opm/models/io/dgfvanguard.hh
+++ b/opm/models/io/dgfvanguard.hh
@@ -33,7 +33,7 @@
 
 #include <opm/models/io/basevanguard.hh>
 #include <opm/models/utils/propertysystem.hh>
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 
 
 #include <type_traits>
diff --git a/opm/models/io/structuredgridvanguard.hh b/opm/models/io/structuredgridvanguard.hh
index 1c7be289c..519493b67 100644
--- a/opm/models/io/structuredgridvanguard.hh
+++ b/opm/models/io/structuredgridvanguard.hh
@@ -31,7 +31,7 @@
 
 #include <opm/models/utils/basicparameters.hh>
 #include <opm/models/utils/basicproperties.hh>
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 #include <opm/models/utils/propertysystem.hh>
 
 #include <dune/grid/yaspgrid.hh>
diff --git a/opm/models/io/vtkblackoilenergymodule.hh b/opm/models/io/vtkblackoilenergymodule.hh
index e782fdbcf..1fcfb516a 100644
--- a/opm/models/io/vtkblackoilenergymodule.hh
+++ b/opm/models/io/vtkblackoilenergymodule.hh
@@ -38,7 +38,7 @@
 #include <opm/models/io/baseoutputmodule.hh>
 #include <opm/models/io/vtkmultiwriter.hh>
 
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 #include <opm/models/utils/propertysystem.hh>
 
 namespace Opm::Parameters {
diff --git a/opm/models/io/vtkblackoilmicpmodule.hh b/opm/models/io/vtkblackoilmicpmodule.hh
index cf626b8ed..95723b440 100644
--- a/opm/models/io/vtkblackoilmicpmodule.hh
+++ b/opm/models/io/vtkblackoilmicpmodule.hh
@@ -38,7 +38,7 @@
 #include <opm/models/io/baseoutputmodule.hh>
 #include <opm/models/io/vtkmultiwriter.hh>
 
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 #include <opm/models/utils/propertysystem.hh>
 
 namespace Opm::Parameters {
diff --git a/opm/models/io/vtkblackoilmodule.hh b/opm/models/io/vtkblackoilmodule.hh
index 4b0de723d..30b8127ad 100644
--- a/opm/models/io/vtkblackoilmodule.hh
+++ b/opm/models/io/vtkblackoilmodule.hh
@@ -38,7 +38,7 @@
 
 #include <opm/models/discretization/common/fvbaseparameters.hh>
 
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 #include <opm/models/utils/propertysystem.hh>
 
 namespace Opm::Parameters {
diff --git a/opm/models/io/vtkblackoilpolymermodule.hh b/opm/models/io/vtkblackoilpolymermodule.hh
index eb7f7f23d..0f012069b 100644
--- a/opm/models/io/vtkblackoilpolymermodule.hh
+++ b/opm/models/io/vtkblackoilpolymermodule.hh
@@ -38,7 +38,7 @@
 #include <opm/models/io/baseoutputmodule.hh>
 #include <opm/models/io/vtkmultiwriter.hh>
 
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 #include <opm/models/utils/propertysystem.hh>
 
 namespace Opm::Properties::TTag {
diff --git a/opm/models/io/vtkblackoilsolventmodule.hh b/opm/models/io/vtkblackoilsolventmodule.hh
index acb47519a..3dda896e9 100644
--- a/opm/models/io/vtkblackoilsolventmodule.hh
+++ b/opm/models/io/vtkblackoilsolventmodule.hh
@@ -38,7 +38,7 @@
 #include <opm/models/io/baseoutputmodule.hh>
 #include <opm/models/io/vtkmultiwriter.hh>
 
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 #include <opm/models/utils/propertysystem.hh>
 
 namespace Opm::Parameters {
diff --git a/opm/models/io/vtkcompositionmodule.hh b/opm/models/io/vtkcompositionmodule.hh
index bc16cf15c..984add073 100644
--- a/opm/models/io/vtkcompositionmodule.hh
+++ b/opm/models/io/vtkcompositionmodule.hh
@@ -34,7 +34,7 @@
 #include <opm/models/io/baseoutputmodule.hh>
 #include <opm/models/io/vtkmultiwriter.hh>
 
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 #include <opm/models/utils/propertysystem.hh>
 
 namespace Opm::Parameters {
diff --git a/opm/models/io/vtkdiffusionmodule.hh b/opm/models/io/vtkdiffusionmodule.hh
index 13bf3912f..f8f12a403 100644
--- a/opm/models/io/vtkdiffusionmodule.hh
+++ b/opm/models/io/vtkdiffusionmodule.hh
@@ -37,7 +37,7 @@
 #include <opm/models/io/vtkmultiwriter.hh>
 
 #include <opm/models/utils/propertysystem.hh>
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 
 namespace Opm::Parameters {
 
diff --git a/opm/models/io/vtkdiscretefracturemodule.hh b/opm/models/io/vtkdiscretefracturemodule.hh
index 49904a5e9..14251282f 100644
--- a/opm/models/io/vtkdiscretefracturemodule.hh
+++ b/opm/models/io/vtkdiscretefracturemodule.hh
@@ -37,7 +37,7 @@
 #include <opm/models/io/vtkmultiwriter.hh>
 
 #include <opm/models/utils/propertysystem.hh>
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 
 #include <cstdio>
 
diff --git a/opm/models/io/vtkenergymodule.hh b/opm/models/io/vtkenergymodule.hh
index 414d545ce..06cc4dad4 100644
--- a/opm/models/io/vtkenergymodule.hh
+++ b/opm/models/io/vtkenergymodule.hh
@@ -34,7 +34,7 @@
 
 #include <opm/models/discretization/common/fvbaseparameters.hh>
 
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 #include <opm/models/utils/propertysystem.hh>
 
 namespace Opm::Parameters {
diff --git a/opm/models/io/vtkmultiphasemodule.hh b/opm/models/io/vtkmultiphasemodule.hh
index b5e86b5e5..bf8e1e7a2 100644
--- a/opm/models/io/vtkmultiphasemodule.hh
+++ b/opm/models/io/vtkmultiphasemodule.hh
@@ -37,7 +37,7 @@
 #include <opm/models/io/baseoutputmodule.hh>
 #include <opm/models/io/vtkmultiwriter.hh>
 
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 #include <opm/models/utils/propertysystem.hh>
 
 #include <cstdio>
diff --git a/opm/models/io/vtkphasepresencemodule.hh b/opm/models/io/vtkphasepresencemodule.hh
index 225218438..c66429c4a 100644
--- a/opm/models/io/vtkphasepresencemodule.hh
+++ b/opm/models/io/vtkphasepresencemodule.hh
@@ -32,7 +32,7 @@
 #include <opm/models/io/baseoutputmodule.hh>
 #include <opm/models/io/vtkmultiwriter.hh>
 
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 #include <opm/models/utils/propertysystem.hh>
 
 namespace Opm::Parameters {
diff --git a/opm/models/io/vtkprimaryvarsmodule.hh b/opm/models/io/vtkprimaryvarsmodule.hh
index 8cbd9aae5..5bbbcdc3b 100644
--- a/opm/models/io/vtkprimaryvarsmodule.hh
+++ b/opm/models/io/vtkprimaryvarsmodule.hh
@@ -32,7 +32,7 @@
 #include <opm/models/io/baseoutputmodule.hh>
 #include <opm/models/io/vtkmultiwriter.hh>
 
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 #include <opm/models/utils/propertysystem.hh>
 
 namespace Opm::Parameters {
diff --git a/opm/models/io/vtkptflashmodule.hh b/opm/models/io/vtkptflashmodule.hh
index cb25f1e0d..a7509f8de 100644
--- a/opm/models/io/vtkptflashmodule.hh
+++ b/opm/models/io/vtkptflashmodule.hh
@@ -34,7 +34,7 @@
 #include <opm/models/io/baseoutputmodule.hh>
 #include <opm/models/io/vtkmultiwriter.hh>
 
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 #include <opm/models/utils/propertysystem.hh>
 
 namespace Opm::Parameters {
diff --git a/opm/models/io/vtktemperaturemodule.hh b/opm/models/io/vtktemperaturemodule.hh
index 96f25c9f0..0cdd62c27 100644
--- a/opm/models/io/vtktemperaturemodule.hh
+++ b/opm/models/io/vtktemperaturemodule.hh
@@ -34,7 +34,7 @@
 #include <opm/models/io/baseoutputmodule.hh>
 #include <opm/models/io/vtkmultiwriter.hh>
 
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 #include <opm/models/utils/propertysystem.hh>
 
 namespace Opm::Parameters {
diff --git a/opm/models/parallel/threadmanager.cpp b/opm/models/parallel/threadmanager.cpp
index f9a77afd2..ea85c4089 100644
--- a/opm/models/parallel/threadmanager.cpp
+++ b/opm/models/parallel/threadmanager.cpp
@@ -28,7 +28,7 @@
 #endif
 
 #include <opm/models/discretization/common/fvbaseparameters.hh>
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 
 namespace Opm {
 
diff --git a/opm/models/utils/basicproperties.hh b/opm/models/utils/basicproperties.hh
index 9d751ba9c..2dc15221f 100644
--- a/opm/models/utils/basicproperties.hh
+++ b/opm/models/utils/basicproperties.hh
@@ -31,7 +31,7 @@
 #include <dune/common/parametertree.hh>
 
 #include <opm/models/utils/basicparameters.hh>
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 #include <opm/models/utils/propertysystem.hh>
 
 #if HAVE_DUNE_FEM
diff --git a/opm/models/utils/parametersystem.hh b/opm/models/utils/parametersystem.hpp
similarity index 99%
rename from opm/models/utils/parametersystem.hh
rename to opm/models/utils/parametersystem.hpp
index 8457eb8cd..7e489b6da 100644
--- a/opm/models/utils/parametersystem.hh
+++ b/opm/models/utils/parametersystem.hpp
@@ -29,8 +29,8 @@
  * Dune::ParameterTree with the default value taken from the parameter
  * definition.
  */
-#ifndef OPM_PARAMETER_SYSTEM_HH
-#define OPM_PARAMETER_SYSTEM_HH
+#ifndef OPM_PARAMETER_SYSTEM_HPP
+#define OPM_PARAMETER_SYSTEM_HPP
 
 #if HAVE_QUAD
 #include <opm/material/common/quad.hpp>
@@ -1074,4 +1074,4 @@ inline void endRegistration()
 
 } // namespace Opm::Parameters
 
-#endif // OPM_PARAMETER_SYSTEM_HH
+#endif // OPM_PARAMETER_SYSTEM_HPP
diff --git a/opm/models/utils/simulator.hh b/opm/models/utils/simulator.hh
index 80341db08..93b31ffc8 100644
--- a/opm/models/utils/simulator.hh
+++ b/opm/models/utils/simulator.hh
@@ -29,7 +29,7 @@
 #define EWOMS_SIMULATOR_HH
 
 #include <opm/models/io/restart.hh>
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 
 #include <opm/models/utils/basicproperties.hh>
 #include <opm/models/utils/propertysystem.hh>
diff --git a/opm/models/utils/start.hh b/opm/models/utils/start.hh
index 76ce1def9..8f20314d9 100644
--- a/opm/models/utils/start.hh
+++ b/opm/models/utils/start.hh
@@ -32,7 +32,7 @@
 // dune/common/densematrix.hh because of some c++ ideosyncrasies
 #include <opm/material/densead/Evaluation.hpp>
 
-#include "parametersystem.hh"
+#include <opm/models/utils/parametersystem.hpp>
 
 #include <opm/models/utils/simulator.hh>
 #include <opm/models/utils/timer.hpp>
diff --git a/opm/simulators/flow/BlackoilModelParameters.cpp b/opm/simulators/flow/BlackoilModelParameters.cpp
index e15343d5f..23eae8231 100644
--- a/opm/simulators/flow/BlackoilModelParameters.cpp
+++ b/opm/simulators/flow/BlackoilModelParameters.cpp
@@ -22,7 +22,7 @@
 
 #include <opm/models/discretization/common/fvbaseparameters.hh>
 
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 
 #include <algorithm>
 #include <stdexcept>
diff --git a/opm/simulators/flow/DamarisParameters.cpp b/opm/simulators/flow/DamarisParameters.cpp
index 22a78d8a0..194217e89 100644
--- a/opm/simulators/flow/DamarisParameters.cpp
+++ b/opm/simulators/flow/DamarisParameters.cpp
@@ -28,7 +28,7 @@
 
 #include <opm/simulators/flow/DamarisParameters.hpp>
 
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 
 namespace Opm {
 
diff --git a/opm/simulators/flow/FlowBaseVanguard.hpp b/opm/simulators/flow/FlowBaseVanguard.hpp
index 361dce241..a0930ba66 100644
--- a/opm/simulators/flow/FlowBaseVanguard.hpp
+++ b/opm/simulators/flow/FlowBaseVanguard.hpp
@@ -39,7 +39,7 @@
 #include <opm/models/discretization/common/fvbaseparameters.hh>
 #include <opm/models/discretization/common/fvbaseproperties.hh>
 #include <opm/models/io/basevanguard.hh>
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 #include <opm/models/utils/propertysystem.hh>
 
 #include <opm/simulators/flow/BlackoilModelParameters.hpp>
diff --git a/opm/simulators/flow/FlowGenericVanguard.cpp b/opm/simulators/flow/FlowGenericVanguard.cpp
index b8acd2026..f80346de1 100644
--- a/opm/simulators/flow/FlowGenericVanguard.cpp
+++ b/opm/simulators/flow/FlowGenericVanguard.cpp
@@ -81,7 +81,7 @@
 
 #include <opm/input/eclipse/Parser/InputErrorAction.hpp>
 
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 
 #include <opm/simulators/flow/BlackoilModelParameters.hpp>
 #include <opm/simulators/utils/readDeck.hpp>
diff --git a/opm/simulators/flow/FlowProblemParameters.cpp b/opm/simulators/flow/FlowProblemParameters.cpp
index 719b829ce..a5a11008b 100644
--- a/opm/simulators/flow/FlowProblemParameters.cpp
+++ b/opm/simulators/flow/FlowProblemParameters.cpp
@@ -26,7 +26,7 @@
 
 #include <opm/models/common/multiphasebaseparameters.hh>
 #include <opm/models/nonlinear/newtonmethodparameters.hh>
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 
 #include <opm/simulators/flow/EclWriter.hpp>
 
diff --git a/opm/simulators/flow/FlowUtils.cpp b/opm/simulators/flow/FlowUtils.cpp
index 38a72a2bf..db63cfee4 100644
--- a/opm/simulators/flow/FlowUtils.cpp
+++ b/opm/simulators/flow/FlowUtils.cpp
@@ -39,7 +39,7 @@
 #include <opm/models/io/vtktemperaturemodule.hh>
 #include <opm/models/nonlinear/newtonmethodparameters.hh>
 #include <opm/models/utils/basicparameters.hh>
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 
 #include <opm/simulators/flow/ConvergenceOutputConfiguration.hpp>
 #include <opm/simulators/timestepping/SimulatorReport.hpp>
diff --git a/opm/simulators/flow/Main.hpp b/opm/simulators/flow/Main.hpp
index ddd16f28a..014886c6b 100644
--- a/opm/simulators/flow/Main.hpp
+++ b/opm/simulators/flow/Main.hpp
@@ -57,7 +57,7 @@
 #include <opm/input/eclipse/EclipseState/EclipseState.hpp>
 
 #include <opm/models/utils/propertysystem.hh>
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 
 #include <opm/simulators/flow/Banners.hpp>
 #include <opm/simulators/flow/FlowMain.hpp>
diff --git a/opm/simulators/flow/NonlinearSolver.hpp b/opm/simulators/flow/NonlinearSolver.hpp
index b59441ac9..a3235cf51 100644
--- a/opm/simulators/flow/NonlinearSolver.hpp
+++ b/opm/simulators/flow/NonlinearSolver.hpp
@@ -30,7 +30,7 @@
 #include <opm/models/nonlinear/newtonmethodparameters.hh>
 #include <opm/models/nonlinear/newtonmethodproperties.hh>
 
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 #include <opm/models/utils/propertysystem.hh>
 #include <opm/models/utils/basicproperties.hh>
 
diff --git a/opm/simulators/flow/OutputBlackoilModule.hpp b/opm/simulators/flow/OutputBlackoilModule.hpp
index a3956e74c..60681842a 100644
--- a/opm/simulators/flow/OutputBlackoilModule.hpp
+++ b/opm/simulators/flow/OutputBlackoilModule.hpp
@@ -44,7 +44,7 @@
 
 #include <opm/models/blackoil/blackoilproperties.hh>
 #include <opm/models/discretization/common/fvbaseproperties.hh>
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 #include <opm/models/utils/propertysystem.hh>
 
 #include <opm/output/data/Cells.hpp>
diff --git a/opm/simulators/flow/VtkTracerModule.hpp b/opm/simulators/flow/VtkTracerModule.hpp
index f7b9060ad..0701fbef9 100644
--- a/opm/simulators/flow/VtkTracerModule.hpp
+++ b/opm/simulators/flow/VtkTracerModule.hpp
@@ -33,7 +33,7 @@
 #include <opm/models/discretization/common/fvbaseparameters.hh>
 #include <opm/models/io/baseoutputmodule.hh>
 #include <opm/models/io/vtkmultiwriter.hh>
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 #include <opm/models/utils/propertysystem.hh>
 
 #include <string>
diff --git a/opm/simulators/flow/python/PyBlackOilSimulator.hpp b/opm/simulators/flow/python/PyBlackOilSimulator.hpp
index 6d17cca59..47db13716 100644
--- a/opm/simulators/flow/python/PyBlackOilSimulator.hpp
+++ b/opm/simulators/flow/python/PyBlackOilSimulator.hpp
@@ -23,7 +23,7 @@
 #include <opm/simulators/flow/Main.hpp>
 #include <opm/simulators/flow/FlowMain.hpp>
 #include <opm/models/utils/propertysystem.hh>
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 #include <opm/simulators/flow/python/Pybind11Exporter.hpp>
 #include <opm/simulators/flow/python/PyFluidState.hpp>
 #include <opm/simulators/flow/python/PyMaterialState.hpp>
@@ -32,6 +32,7 @@
 #include <opm/input/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp>
 
 namespace Opm::Pybind {
+
 class PyBlackOilSimulator
 {
 private:
diff --git a/opm/simulators/linalg/FlowLinearSolverParameters.cpp b/opm/simulators/linalg/FlowLinearSolverParameters.cpp
index 00a1d183c..08c1ee245 100644
--- a/opm/simulators/linalg/FlowLinearSolverParameters.cpp
+++ b/opm/simulators/linalg/FlowLinearSolverParameters.cpp
@@ -25,7 +25,7 @@
 
 #include <opm/simulators/linalg/FlowLinearSolverParameters.hpp>
 #include <opm/simulators/linalg/linalgparameters.hh>
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 
 namespace Opm {
 
diff --git a/opm/simulators/linalg/ISTLSolver.hpp b/opm/simulators/linalg/ISTLSolver.hpp
index 80c9a73ee..85358d72c 100644
--- a/opm/simulators/linalg/ISTLSolver.hpp
+++ b/opm/simulators/linalg/ISTLSolver.hpp
@@ -31,7 +31,7 @@
 
 #include <opm/models/discretization/common/fvbaseproperties.hh>
 #include <opm/models/common/multiphasebaseproperties.hh>
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 #include <opm/models/utils/propertysystem.hh>
 #include <opm/simulators/flow/BlackoilModelParameters.hpp>
 #include <opm/simulators/flow/FlowBaseVanguard.hpp>
diff --git a/opm/simulators/linalg/istlpreconditionerwrappers.hh b/opm/simulators/linalg/istlpreconditionerwrappers.hh
index 3a0a5d456..2c41a38fb 100644
--- a/opm/simulators/linalg/istlpreconditionerwrappers.hh
+++ b/opm/simulators/linalg/istlpreconditionerwrappers.hh
@@ -47,7 +47,7 @@
 #include <dune/common/version.hh>
 
 #include <opm/models/utils/propertysystem.hh>
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 
 #include <opm/simulators/linalg/linalgparameters.hh>
 #include <opm/simulators/linalg/linalgproperties.hh>
diff --git a/opm/simulators/linalg/istlsolverwrappers.hh b/opm/simulators/linalg/istlsolverwrappers.hh
index 8d1146ad8..c9713a2f0 100644
--- a/opm/simulators/linalg/istlsolverwrappers.hh
+++ b/opm/simulators/linalg/istlsolverwrappers.hh
@@ -47,7 +47,7 @@
 #include <dune/istl/solvers.hh>
 
 #include <opm/models/utils/propertysystem.hh>
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 
 #include <opm/simulators/linalg/linalgparameters.hh>
 #include <opm/simulators/linalg/linalgproperties.hh>
diff --git a/opm/simulators/linalg/parallelbasebackend.hh b/opm/simulators/linalg/parallelbasebackend.hh
index b79089a84..606cfc295 100644
--- a/opm/simulators/linalg/parallelbasebackend.hh
+++ b/opm/simulators/linalg/parallelbasebackend.hh
@@ -36,7 +36,7 @@
 
 #include <opm/models/utils/genericguard.hh>
 #include <opm/models/utils/propertysystem.hh>
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 
 #include <opm/simulators/linalg/istlpreconditionerwrappers.hh>
 #include <opm/simulators/linalg/istlsparsematrixadapter.hh>
diff --git a/opm/simulators/timestepping/AdaptiveTimeStepping.hpp b/opm/simulators/timestepping/AdaptiveTimeStepping.hpp
index 306971163..1fa8fe915 100644
--- a/opm/simulators/timestepping/AdaptiveTimeStepping.hpp
+++ b/opm/simulators/timestepping/AdaptiveTimeStepping.hpp
@@ -22,7 +22,7 @@
 #include <opm/input/eclipse/Schedule/Tuning.hpp>
 
 #include <opm/models/utils/basicproperties.hh>
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 #include <opm/models/utils/propertysystem.hh>
 
 #include <opm/simulators/timestepping/AdaptiveSimulatorTimer.hpp>
diff --git a/opm/simulators/timestepping/EclTimeSteppingParams.cpp b/opm/simulators/timestepping/EclTimeSteppingParams.cpp
index d675f783f..7a1e3c8db 100644
--- a/opm/simulators/timestepping/EclTimeSteppingParams.cpp
+++ b/opm/simulators/timestepping/EclTimeSteppingParams.cpp
@@ -25,7 +25,7 @@
 
 #include <opm/simulators/timestepping/EclTimeSteppingParams.hpp>
 
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 
 namespace Opm {
 
diff --git a/opm/simulators/utils/DamarisKeywords.hpp b/opm/simulators/utils/DamarisKeywords.hpp
index 600865cee..ca6c04a95 100644
--- a/opm/simulators/utils/DamarisKeywords.hpp
+++ b/opm/simulators/utils/DamarisKeywords.hpp
@@ -20,7 +20,7 @@
 #ifndef OPM_DAMARISKEYWORDS_HEADER_INCLUDED
 #define OPM_DAMARISKEYWORDS_HEADER_INCLUDED
 
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 
 #include <opm/simulators/flow/DamarisParameters.hpp>
 #include <opm/simulators/utils/ParallelCommunication.hpp>
diff --git a/opm/simulators/wells/GasLiftSingleWell.hpp b/opm/simulators/wells/GasLiftSingleWell.hpp
index 4ce75dcef..cd0d530b5 100644
--- a/opm/simulators/wells/GasLiftSingleWell.hpp
+++ b/opm/simulators/wells/GasLiftSingleWell.hpp
@@ -21,7 +21,7 @@
 #define OPM_GASLIFT_SINGLE_WELL_HEADER_INCLUDED
 
 #include <opm/models/utils/propertysystem.hh>
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 #include <opm/models/discretization/common/fvbaseproperties.hh>
 #include <opm/simulators/wells/GasLiftSingleWellGeneric.hpp>
 #include <opm/simulators/wells/GasLiftGroupInfo.hpp>
diff --git a/tests/test_glift1.cpp b/tests/test_glift1.cpp
index 6e7145135..4c3a02dc8 100644
--- a/tests/test_glift1.cpp
+++ b/tests/test_glift1.cpp
@@ -26,7 +26,7 @@
 #define BOOST_TEST_MODULE Glift1
 
 #include <opm/models/utils/propertysystem.hh>
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 #include <opm/models/utils/start.hh>
 
 #include <opm/input/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp>
diff --git a/tests/test_parametersystem.cpp b/tests/test_parametersystem.cpp
index b4d883742..5d3c3200e 100644
--- a/tests/test_parametersystem.cpp
+++ b/tests/test_parametersystem.cpp
@@ -19,7 +19,7 @@
 
 #include <config.h>
 
-#include <opm/models/utils/parametersystem.hh>
+#include <opm/models/utils/parametersystem.hpp>
 
 #define BOOST_TEST_MODULE ParameterSystemTest
 #include <boost/test/unit_test.hpp>